Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[~andy/linux] / arch / arm / kernel / process.c

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 1a347f481e5e7a5c022b7795c6b9542cb77d529e..75316f0dd02ae3b0be19e10a982f6a5c7e606ff3 100644 (file)
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -10,7 +10,7 @@
  */
 #include <stdarg.h>
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -319,7 +319,7 @@ void show_regs(struct pt_regs * regs)
        printk("\n");
        printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
        __show_regs(regs);
-       __backtrace();
+       dump_stack();
 }
 
 ATOMIC_NOTIFIER_HEAD(thread_notify_head);