Merge branch 'linus' into x86/pebs

Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 6 deletions

diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index b71816e47a30..94b527ef1d1e 100644
--- 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);