diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
| commit | 7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch) | |
| tree | f5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | ff180079f148953e56d8bac03c582df5e3343e45 (diff) | |
| download | kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip | |
Linux v3.17-9283-g2d65a9f48fcd
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 b37f14144..b386ee1b9 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 ff7fd80bef99..88aebd38b92f 100644 +index 49e9537f3673..a800af056510 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -19,6 +19,7 @@ @@ -31,7 +31,7 @@ index ff7fd80bef99..88aebd38b92f 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -108,6 +109,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -135,6 +136,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 ff7fd80bef99..88aebd38b92f 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -658,6 +685,8 @@ out: +@@ -704,6 +731,8 @@ out: void __init lockup_detector_init(void) { |