Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 14 insertions, 4 deletions

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 5caf2b64d43a..01e0111bf787 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -293,6 +293,17 @@ do_debug(struct pt_regs *regs)
 }
 
 
+/* Set exception C handler - for temporary use when probing exceptions */
+
+void * __init trap_set_handler(int cause, void *handler)
+{
+        unsigned long *entry = &exc_table[EXC_TABLE_DEFAULT / 4 + cause];
+        void *previous = (void *)*entry;
+        *entry = (unsigned long)handler;
+        return previous;
+}
+
+
 /*
  * Initialize dispatch tables.
  *
@@ -397,7 +408,8 @@ static inline void spill_registers(void)
                 "wsr    a13, sar\n\t"
                 "wsr    a14, ps\n\t"
                 :: "a" (&a0), "a" (&ps)
-                : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15", "memory");
+                : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15",
+                  "memory");
 }
 
 void show_trace(struct task_struct *task, unsigned long *sp)
@@ -452,7 +464,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)
 
         if (!sp)
                 sp = stack_pointer(task);
-        stack = sp;
+        stack = sp;
 
         printk("\nStack: ");
 
@@ -523,5 +535,3 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         do_exit(err);
 }
-
-