Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 44ff74e..bed5f47 100644 (file)
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -16,7 +16,6 @@
 /*
  * Sets up all exception vectors
  */
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/kernel.h>
@@ -128,11 +127,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                if (stack + 1 > endstack)
                        break;
                if (i % 8 == 0)
-                       printk(KERN_EMERG "\n       ");
-               printk(KERN_EMERG " %08lx", *stack++);
+                       printk("\n" KERN_EMERG "       ");
+               printk(" %08lx", *stack++);
        }
+       printk("\n");
 
-       printk(KERN_EMERG "\nCall Trace:");
+       printk(KERN_EMERG "Call Trace:");
        i = 0;
        while (stack + 1 <= endstack) {
                addr = *stack++;
@@ -147,18 +147,18 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                if (((addr >= (unsigned long) &_start) &&
                     (addr <= (unsigned long) &_etext))) {
                        if (i % 4 == 0)
-                               printk(KERN_EMERG "\n       ");
-                       printk(KERN_EMERG " [<%08lx>]", addr);
+                               printk("\n" KERN_EMERG "       ");
+                       printk(" [<%08lx>]", addr);
                        i++;
                }
        }
-       printk(KERN_EMERG "\n");
+       printk("\n");
 }
 
 void bad_super_trap(struct frame *fp)
 {
        console_verbose();
-       if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
+       if (fp->ptregs.vector < 4 * ARRAY_SIZE(vec_names))
                printk (KERN_WARNING "*** %s ***   FORMAT=%X\n",
                        vec_names[(fp->ptregs.vector) >> 2],
                        fp->ptregs.format);