summaryrefslogtreecommitdiffstats
path: root/watchdog-Disable-watchdog-on-virtual-machines.patch
diff options
context:
space:
mode:
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
-rw-r--r--watchdog-Disable-watchdog-on-virtual-machines.patch8
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 d15fd84fa..e20011f8e 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 3174bf8e3538..d0a8abec3df9 100644
+index 2316f50b07a4..da39c565a03e 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -19,6 +19,7 @@
@@ -31,7 +31,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
#include <asm/irq_regs.h>
#include <linux/kvm_para.h>
-@@ -135,6 +136,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
+@@ -146,6 +147,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 3174bf8e3538..d0a8abec3df9 100644
/*
* Hard-lockup warnings should be triggered after just a few seconds. Soft-
* lockups can have false positives under extreme conditions. So we generally
-@@ -704,6 +731,8 @@ out:
+@@ -873,6 +900,8 @@ out:
void __init lockup_detector_init(void)
{
@@ -72,7 +72,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
+
set_sample_period();
- if (watchdog_user_enabled)
+ if (watchdog_enabled)
--
2.1.0