Commit a60a2010 authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: replace schedule_timeout in die

This patch is from Nishanth Aravamudan <nacc@us.ibm.com>.

Replace schedule_timeout() with ssleep to simplify the code and to express the
delay in seconds instead of HZ.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e368f020
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h>
#include <asm/kdebug.h> #include <asm/kdebug.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -137,8 +138,7 @@ int die(const char *str, struct pt_regs *regs, long err) ...@@ -137,8 +138,7 @@ int die(const char *str, struct pt_regs *regs, long err)
if (panic_on_oops) { if (panic_on_oops) {
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
set_current_state(TASK_UNINTERRUPTIBLE); ssleep(5);
schedule_timeout(5 * HZ);
panic("Fatal exception"); panic("Fatal exception");
} }
do_exit(SIGSEGV); do_exit(SIGSEGV);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment