diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2015-11-06 10:01:56 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2015-11-06 10:01:56 -0800 |
| commit | cddb783d0db171c0939023825d8233b74184da7a (patch) | |
| tree | 315a6bab03d5855bc221a7248e0ab1608b27588b /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | 68a6702006835f4bcd62193d98ffe390fada903b (diff) | |
| download | kernel-cddb783d0db171c0939023825d8233b74184da7a.tar.gz kernel-cddb783d0db171c0939023825d8233b74184da7a.tar.xz kernel-cddb783d0db171c0939023825d8233b74184da7a.zip | |
Linux v4.3-7965-gd1e41ff
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
| -rw-r--r-- | watchdog-Disable-watchdog-on-virtual-machines.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index 01cbba943..11bce5bb7 100644 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ b/watchdog-Disable-watchdog-on-virtual-machines.patch @@ -1,3 +1,4 @@ +From f1293c68aff98cd913a59b151aac938ec4ce4857 Mon Sep 17 00:00:00 2001 From: Dave Jones <davej@redhat.com> Date: Tue, 24 Jun 2014 08:43:34 -0400 Subject: [PATCH] watchdog: Disable watchdog on virtual machines. @@ -20,7 +21,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 a6ffa43f2993..b378b762844a 100644 +index 18f34cf..6aadffe 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -20,6 +20,7 @@ @@ -31,8 +32,8 @@ index a6ffa43f2993..b378b762844a 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -155,6 +156,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) - __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup); +@@ -185,6 +186,32 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str) + __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup); #endif +static int disable_watchdog(const struct dmi_system_id *d) @@ -64,7 +65,7 @@ index a6ffa43f2993..b378b762844a 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -928,6 +955,8 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write, +@@ -1030,6 +1057,8 @@ out: void __init lockup_detector_init(void) { @@ -73,3 +74,6 @@ index a6ffa43f2993..b378b762844a 100644 set_sample_period(); #ifdef CONFIG_NO_HZ_FULL +-- +2.5.0 + |