Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 804246e743b1..225d64d73f04 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include <linux/kallsyms.h>
+#include <linux/delay.h>
 
 #include <asm/ptrace.h>
 #include <asm/timex.h>
@@ -488,8 +489,7 @@ void die(const char * str, struct pt_regs * regs, long err)
 
         if (panic_on_oops) {
                 printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(5 * HZ);
+                ssleep(5);
                 panic("Fatal exception");
         }
         do_exit(err);