diff options
| author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-07-12 13:58:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:01:01 -0700 |
| commit | 5c888d531823f8ce2853fb717ebefbcca9acdcd0 (patch) | |
| tree | 75aceeec04caa634274f0e03c17d7c6e9ca56bd6 /arch | |
| parent | 813e6783647489a8481d256944b7fd75ff79e035 (diff) | |
| download | blackbird-op-linux-5c888d531823f8ce2853fb717ebefbcca9acdcd0.tar.gz blackbird-op-linux-5c888d531823f8ce2853fb717ebefbcca9acdcd0.zip | |
[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')
| -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 @@ #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); |
