diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-07-12 16:58:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:01:01 -0400 |
commit | 5c888d531823f8ce2853fb717ebefbcca9acdcd0 (patch) | |
tree | 75aceeec04caa634274f0e03c17d7c6e9ca56bd6 /arch/xtensa/kernel | |
parent | 813e6783647489a8481d256944b7fd75ff79e035 (diff) |
[PATCH] xtensa: use ssleep() instead of schedule_timeout()
Replace schedule_timeout() with ssleep() to guarantee the task delays as
expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/traps.c | 4 |
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 @@ | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/stringify.h> | 30 | #include <linux/stringify.h> |
31 | #include <linux/kallsyms.h> | 31 | #include <linux/kallsyms.h> |
32 | #include <linux/delay.h> | ||
32 | 33 | ||
33 | #include <asm/ptrace.h> | 34 | #include <asm/ptrace.h> |
34 | #include <asm/timex.h> | 35 | #include <asm/timex.h> |
@@ -488,8 +489,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
488 | 489 | ||
489 | if (panic_on_oops) { | 490 | if (panic_on_oops) { |
490 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); | 491 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); |
491 | set_current_state(TASK_UNINTERRUPTIBLE); | 492 | ssleep(5); |
492 | schedule_timeout(5 * HZ); | ||
493 | panic("Fatal exception"); | 493 | panic("Fatal exception"); |
494 | } | 494 | } |
495 | do_exit(err); | 495 | do_exit(err); |