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.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch
index 45a241a0e..01cbba943 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -20,18 +20,18 @@ Signed-off-by: Dave Jones <davej@redhat.com>
1 file changed, 29 insertions(+)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 581a68a04c64..18b609d3360a 100644
+index a6ffa43f2993..b378b762844a 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
-@@ -19,6 +19,7 @@
- #include <linux/sysctl.h>
+@@ -20,6 +20,7 @@
#include <linux/smpboot.h>
#include <linux/sched/rt.h>
+ #include <linux/tick.h>
+#include <linux/dmi.h>
#include <asm/irq_regs.h>
#include <linux/kvm_para.h>
-@@ -148,6 +149,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
+@@ -155,6 +156,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 581a68a04c64..18b609d3360a 100644
/*
* Hard-lockup warnings should be triggered after just a few seconds. Soft-
* lockups can have false positives under extreme conditions. So we generally
-@@ -883,6 +910,8 @@ out:
+@@ -928,6 +955,8 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write,
void __init lockup_detector_init(void)
{
@@ -72,4 +72,4 @@ index 581a68a04c64..18b609d3360a 100644
+
set_sample_period();
- if (watchdog_enabled)
+ #ifdef CONFIG_NO_HZ_FULL