2 files changed, 15 insertions, 19 deletions

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 5339af459a38..5afd94a01b98 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -399,26 +399,22 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
         printk("DEBUG_PAGEALLOC");
 #endif
         printk("\n");
-
         if (notify_die(DIE_OOPS, str, regs, err,
-                        current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
-
-                show_registers(regs);
-                /* Executive summary in case the oops scrolled away */
-                sp = (unsigned long) (&regs->sp);
-                savesegment(ss, ss);
-                if (user_mode(regs)) {
-                        sp = regs->sp;
-                        ss = regs->ss & 0xffff;
-                }
-                printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);
-                print_symbol("%s", regs->ip);
-                printk(" SS:ESP %04x:%08lx\n", ss, sp);
+                        current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
+                return 1;
 
-                return 0;
+        show_registers(regs);
+        /* Executive summary in case the oops scrolled away */
+        sp = (unsigned long) (&regs->sp);
+        savesegment(ss, ss);
+        if (user_mode(regs)) {
+                sp = regs->sp;
+                ss = regs->ss & 0xffff;
         }
-
-        return 1;
+        printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);
+        print_symbol("%s", regs->ip);
+        printk(" SS:ESP %04x:%08lx\n", ss, sp);
+        return 0;
 }
 
 /*
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 03d63b0f5b4b..019a06fcfbdc 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -557,9 +557,9 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
         do_exit(signr);
 }
 
-int __kprobes __die(const char * str, struct pt_regs * regs, long err)
+int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 {
-        printk(KERN_EMERG "%s: %04lx [%u] ", str, err & 0xffff,++die_counter);
+        printk(KERN_EMERG "%s: %04lx [%u] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
         printk("PREEMPT ");
 #endif