diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-18 15:27:09 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-18 15:27:09 -0400 |
| commit | 3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5 (patch) | |
| tree | cc399ed775e926cd18dabf92a4b9947d15afb854 /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | 65af5163146680da6d0c7b3f290e521c22aac544 (diff) | |
| download | kernel-3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5.tar.gz kernel-3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5.tar.xz kernel-3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5.zip | |
Linux v4.1-rc4
- Disable debugging options.
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
| -rw-r--r-- | watchdog-Disable-watchdog-on-virtual-machines.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index b43454c31..70b3c3211 100644 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ b/watchdog-Disable-watchdog-on-virtual-machines.patch @@ -20,7 +20,7 @@ Signed-off-by: Dave Jones <davej@redhat.com> 1 file changed, 29 insertions(+) diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 2316f50b07a4..da39c565a03e 100644 +index 506edcc500c4..8b622b336b64 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -19,6 +19,7 @@ @@ -31,7 +31,7 @@ index 2316f50b07a4..da39c565a03e 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -146,6 +147,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -148,6 +149,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup); #endif @@ -64,7 +64,7 @@ index 2316f50b07a4..da39c565a03e 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -873,6 +900,8 @@ out: +@@ -883,6 +910,8 @@ out: void __init lockup_detector_init(void) { |