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

[pandora-kernel.git] / arch / um / kernel / sysrq.c

diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index f9e02b3..0960de5 100644 (file)
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -1,39 +1,37 @@
-/* 
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/sched.h"
-#include "linux/kernel.h"
-#include "linux/module.h"
-#include "linux/kallsyms.h"
-#include "asm/page.h"
-#include "asm/processor.h"
+#include <linux/kallsyms.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
 #include "sysrq.h"
-#include "user_util.h"
 
 /* Catch non-i386 SUBARCH's. */
 #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT)
 void show_trace(struct task_struct *task, unsigned long * stack)
 {
-        unsigned long addr;
+       unsigned long addr;
 
-        if (!stack) {
+       if (!stack) {
                stack = (unsigned long*) &stack;
                WARN_ON(1);
        }
 
-        printk("Call Trace: \n");
-        while (((long) stack & (THREAD_SIZE-1)) != 0) {
-                addr = *stack;
+       printk(KERN_INFO "Call Trace: \n");
+       while (((long) stack & (THREAD_SIZE-1)) != 0) {
+               addr = *stack;
                if (__kernel_text_address(addr)) {
-                       printk("%08lx:  [<%08lx>]", (unsigned long) stack, addr);
-                       print_symbol(" %s", addr);
-                       printk("\n");
-                }
-                stack++;
-        }
-        printk("\n");
+                       printk(KERN_INFO "%08lx:  [<%08lx>]",
+                              (unsigned long) stack, addr);
+                       print_symbol(KERN_CONT " %s", addr);
+                       printk(KERN_CONT "\n");
+               }
+               stack++;
+       }
+       printk(KERN_INFO "\n");
 }
 #endif
 
@@ -68,14 +66,13 @@ void show_stack(struct task_struct *task, unsigned long *esp)
        }
 
        stack = esp;
-       for(i = 0; i < kstack_depth_to_print; i++) {
+       for (i = 0; i < kstack_depth_to_print; i++) {
                if (kstack_end(stack))
                        break;
                if (i && ((i % 8) == 0))
-                       printk("\n       ");
-               printk("%08lx ", *stack++);
+                       printk(KERN_INFO "       ");
+               printk(KERN_CONT "%08lx ", *stack++);
        }
 
-       printk("Call Trace: \n");
        show_trace(task, esp);
 }