diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /kernel/panic.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 51ee692b5..48168d864 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -28,12 +28,14 @@ int panic_timeout = 0; struct notifier_block *panic_notifier_list = NULL; -void __init panic_setup(char *str, int *ints) +static int __init panic_setup(char *str) { - if (ints[0] == 1) - panic_timeout = ints[1]; + panic_timeout = simple_strtoul(str, NULL, 0); + return 1; } +__setup("panic=", panic_setup); + NORET_TYPE void panic(const char * fmt, ...) { static char buf[1024]; @@ -43,7 +45,7 @@ NORET_TYPE void panic(const char * fmt, ...) vsprintf(buf, fmt, args); va_end(args); printk(KERN_EMERG "Kernel panic: %s\n",buf); - if (current == task[0]) + if (current == init_tasks[0]) printk(KERN_EMERG "In swapper task - not syncing\n"); else if (in_interrupt()) printk(KERN_EMERG "In interrupt handler - not syncing\n"); |