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

[pandora-kernel.git] / kernel / stacktrace.c

diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index b71816e..94b527e 100644 (file)
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
@@ -6,19 +6,21 @@
  *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
  */
 #include <linux/sched.h>
+#include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/stacktrace.h>
 
 void print_stack_trace(struct stack_trace *trace, int spaces)
 {
-       int i, j;
+       int i;
 
-       for (i = 0; i < trace->nr_entries; i++) {
-               unsigned long ip = trace->entries[i];
+       if (WARN_ON(!trace->entries))
+               return;
 
-               for (j = 0; j < spaces + 1; j++)
-                       printk(" ");
-               print_ip_sym(ip);
+       for (i = 0; i < trace->nr_entries; i++) {
+               printk("%*c", 1 + spaces, ' ');
+               print_ip_sym(trace->entries[i]);
        }
 }
+EXPORT_SYMBOL_GPL(print_stack_trace);