diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-10 09:14:00 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-10 09:14:00 -0400 |
| commit | 35ac9a875942baf213b210ef2954da4fa0f3b463 (patch) | |
| tree | e2ed984e81584a9a89cac4ba17a8e7ee65f690aa /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | c01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff) | |
| download | kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip | |
Linux v3.17-6136-gc798360cd143
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 23a17c054..6d8bdf616 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 a8d6914030fe..d0a8c308170d 100644 +index 7b223b212683..4757d7410087 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -24,6 +24,7 @@ @@ -31,7 +31,7 @@ index a8d6914030fe..d0a8c308170d 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -112,6 +113,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -113,6 +114,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 a8d6914030fe..d0a8c308170d 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -644,6 +671,8 @@ out: +@@ -660,6 +687,8 @@ out: void __init lockup_detector_init(void) { |