Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / m68knommu / kernel / traps.c

diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 46f8f9d..3739c8f 100644 (file)
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -22,7 +22,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/a.out.h>
 #include <linux/user.h>
 #include <linux/string.h>
 #include <linux/linkage.h>
@@ -112,7 +111,7 @@ static void print_this_address(unsigned long addr, int i)
        if (i % 5)
                printk(KERN_CONT " [%08lx] ", addr);
        else
-               printk(KERN_CONT "\n" KERN_EMERG " [%08lx] ", addr);
+               printk(KERN_EMERG " [%08lx] ", addr);
        i++;
 #endif
 }
@@ -138,8 +137,8 @@ static void __show_stack(struct task_struct *task, unsigned long *stack)
                if (stack + 1 + i > endstack)
                        break;
                if (i % 8 == 0)
-                       printk("\n" KERN_EMERG "       ");
-               printk(" %08lx", *(stack + i));
+                       printk(KERN_EMERG "       ");
+               printk(KERN_CONT " %08lx", *(stack + i));
        }
        printk("\n");
        i = 0;
@@ -201,7 +200,6 @@ asmlinkage void trap_c(struct frame *fp)
        if (fp->ptregs.sr & PS_S) {
                if ((fp->ptregs.vector >> 2) == VEC_TRACE) {
                        /* traced a trapping instruction */
-                       current->ptrace |= PT_DTRACE;
                } else
                        bad_super_trap(fp);
                return;