Created
May 10, 2012 08:25
-
-
Save malfaux/2651870 to your computer and use it in GitHub Desktop.
softdog autostart patch generated against debian linux kernel 3.2.0-1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- linux-source-3.2-mods/drivers/watchdog/softdog.c 2012-05-10 04:29:31.928352117 -0400 | |
+++ linux-source-3.2/drivers/watchdog/softdog.c 2012-04-13 12:11:03.000000000 -0400 | |
@@ -65,12 +65,6 @@ | |
"Watchdog cannot be stopped once started (default=" | |
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | |
-#define WATCHDOG_AUTOSTART 0 | |
-static int autostart = WATCHDOG_AUTOSTART; | |
-module_param(autostart, | |
- "Start the timer automagically on init (default=" | |
- __MODULE_STRING(WATCHDOG_AUTOSTART) ")"); | |
- | |
#ifdef ONLY_TESTING | |
static int soft_noboot = 1; | |
#else | |
@@ -282,7 +276,8 @@ | |
}; | |
static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.07 " | |
- "initialized. autostart=%d soft_noboot=%d soft_margin=%d sec (nowayout= %d)\n"; | |
+ "initialized. soft_noboot=%d soft_margin=%d sec soft_panic=%d " | |
+ "(nowayout= %d)\n"; | |
static int __init watchdog_init(void) | |
{ | |
@@ -313,10 +308,7 @@ | |
return ret; | |
} | |
- printk(banner, autostart, soft_noboot, soft_margin, soft_panic, nowayout); | |
- | |
- if (autostart) | |
- softdog_keepalive(); | |
+ printk(banner, soft_noboot, soft_margin, soft_panic, nowayout); | |
return 0; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment