This patch is from Nishanth Aravamudan <[EMAIL PROTECTED]>.
Replace schedule_timeout() with ssleep to simplify the code and to
express the delay in seconds instead of HZ.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
--- 2.6.11-rc1-kj-v/arch/ppc64/kernel/traps.c 2005-01-15 16:55:41.000000000
-0800
+++ 2.6.11-rc1-kj/arch/ppc64/kernel/traps.c 2005-01-15 17:30:39.000000000
-0800
@@ -29,6 +29,7 @@
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/delay.h>
#include <asm/kdebug.h>
#include <asm/pgtable.h>
@@ -137,8 +138,7 @@ int die(const char *str, struct pt_regs
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(SIGSEGV);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
