diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-30 14:37:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-30 14:37:43 +1000 |
| commit | bdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch) | |
| tree | dc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /drivers/char/watchdog/softdog.c | |
| parent | 836cf0465c422ee6d654060edd7c620d9cf0c09c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
| download | blackbird-op-linux-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz blackbird-op-linux-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip | |
Merge ../linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/softdog.c')
| -rw-r--r-- | drivers/char/watchdog/softdog.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index 117903498a01..4d7ed931f5c6 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c @@ -56,12 +56,7 @@ static int soft_margin = TIMER_MARGIN; /* in seconds */ module_param(soft_margin, int, 0); MODULE_PARM_DESC(soft_margin, "Watchdog soft_margin in seconds. (0<soft_margin<65536, default=" __MODULE_STRING(TIMER_MARGIN) ")"); -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif - +static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); @@ -97,7 +92,7 @@ static void watchdog_fire(unsigned long data) else { printk(KERN_CRIT PFX "Initiating system reboot.\n"); - machine_restart(NULL); + emergency_restart(); printk(KERN_CRIT PFX "Reboot didn't ?????\n"); } } |
