This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / kernel / sysrq.c

diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index ea24ebf..80b8470 100644 (file)
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -6,7 +6,6 @@
 #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 "sysrq.h"
@@ -14,20 +13,21 @@
 
 void show_trace(unsigned long * stack)
 {
-       /* XXX: Copy the CONFIG_FRAME_POINTER stack-walking backtrace from
-        * arch/i386/kernel/traps.c. */
+        int i;
         unsigned long addr;
 
         if (!stack)
                 stack = (unsigned long*) &stack;
 
-        printk("Call Trace: \n");
+        printk("Call Trace: ");
+        i = 1;
         while (((long) stack & (THREAD_SIZE-1)) != 0) {
                 addr = *stack++;
                if (__kernel_text_address(addr)) {
-                       printk(" [<%08lx>]", addr);
-                       print_symbol(" %s", addr);
-                       printk("\n");
+                       if (i && ((i % 6) == 0))
+                               printk("\n   ");
+                       printk("[<%08lx>] ", addr);
+                       i++;
                 }
         }
         printk("\n");
@@ -48,3 +48,14 @@ void show_stack(struct task_struct *task, unsigned long *sp)
 {
        show_trace(sp);
 }
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */