diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 09:36:10 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 09:36:10 -0400 |
| commit | ff180079f148953e56d8bac03c582df5e3343e45 (patch) | |
| tree | 58013f4f631b6cac80196eb72ac97e46e6d43dfa /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | 74b479311911cf8ebd00269d32fb4f68f96905be (diff) | |
| download | kernel-ff180079f148953e56d8bac03c582df5e3343e45.tar.gz kernel-ff180079f148953e56d8bac03c582df5e3343e45.tar.xz kernel-ff180079f148953e56d8bac03c582df5e3343e45.zip | |
Linux v3.17-8307-gf1d0d14120a8
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
| -rw-r--r-- | watchdog-Disable-watchdog-on-virtual-machines.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index 6d8bdf616..b37f14144 100644 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ b/watchdog-Disable-watchdog-on-virtual-machines.patch @@ -20,10 +20,10 @@ Signed-off-by: Dave Jones <davej@redhat.com> 1 file changed, 29 insertions(+) diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 7b223b212683..4757d7410087 100644 +index ff7fd80bef99..88aebd38b92f 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c -@@ -24,6 +24,7 @@ +@@ -19,6 +19,7 @@ #include <linux/sysctl.h> #include <linux/smpboot.h> #include <linux/sched/rt.h> @@ -31,7 +31,7 @@ index 7b223b212683..4757d7410087 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -113,6 +114,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -108,6 +109,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 7b223b212683..4757d7410087 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -660,6 +687,8 @@ out: +@@ -658,6 +685,8 @@ out: void __init lockup_detector_init(void) { |