Merge branch 'work.poll2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / arch / alpha / kernel / traps.c

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 4bd99a7b1c41f43e17be62cc09e1d45fd917d059..f43bd05dede26ccb4beaa1a564253b0d0106a381 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -160,11 +160,16 @@ void show_stack(struct task_struct *task, unsigned long *sp)
        for(i=0; i < kstack_depth_to_print; i++) {
                if (((long) stack & (THREAD_SIZE-1)) == 0)
                        break;
-               if (i && ((i % 4) == 0))
-                       printk("\n       ");
-               printk("%016lx ", *stack++);
+               if ((i % 4) == 0) {
+                       if (i)
+                               pr_cont("\n");
+                       printk("       ");
+               } else {
+                       pr_cont(" ");
+               }
+               pr_cont("%016lx", *stack++);
        }
-       printk("\n");
+       pr_cont("\n");
        dik_show_trace(sp);
 }