diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-24 10:14:12 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-06-24 10:14:12 -0400 |
| commit | 350873ee73f411b3fef593afc04479794578fe77 (patch) | |
| tree | 7f356ce9117abe404e4d4bd53485c889bab95b60 /nowatchdog-on-virt.patch | |
| parent | 2c67cd6a21b43635575a3adc3a0df64daa3c38d2 (diff) | |
| download | kernel-350873ee73f411b3fef593afc04479794578fe77.tar.gz kernel-350873ee73f411b3fef593afc04479794578fe77.tar.xz kernel-350873ee73f411b3fef593afc04479794578fe77.zip | |
Linux v3.16-rc2-35-g8b8f5d971584
- Reenable debugging options.
Diffstat (limited to 'nowatchdog-on-virt.patch')
| -rw-r--r-- | nowatchdog-on-virt.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/nowatchdog-on-virt.patch b/nowatchdog-on-virt.patch index c78029a3..d8cf8795 100644 --- a/nowatchdog-on-virt.patch +++ b/nowatchdog-on-virt.patch @@ -1,7 +1,10 @@ Bugzilla: 971139 Upstream-status: Fedora mustard for now -Disable watchdog on virtual machines. +From 17109685bfce322c73a816e097b137458fbd55ae Mon Sep 17 00:00:00 2001 +From: Dave Jones <davej@redhat.com> +Date: Tue, 24 Jun 2014 08:43:34 -0400 +Subject: [PATCH] Disable watchdog on virtual machines. For various reasons, VMs seem to trigger the soft lockup detector a lot, in cases where it's just not possible for a lockup to occur. @@ -13,9 +16,12 @@ the VM for a very long time (Could be the host was under heavy load). Just disable the detector on VMs. Signed-off-by: Dave Jones <davej@redhat.com> +--- + kernel/watchdog.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 1241d8c..b2dc4e4 100644 +index c3319bd1b040..0e3687675aaa 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -24,6 +24,7 @@ @@ -26,9 +32,9 @@ index 1241d8c..b2dc4e4 100644 #include <asm/irq_regs.h> #include <linux/kvm_para.h> -@@ -96,6 +97,32 @@ static int __init nosoftlockup_setup(char *str) - __setup("nosoftlockup", nosoftlockup_setup); - /* */ +@@ -112,6 +113,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) + __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup); + #endif +static int disable_watchdog(const struct dmi_system_id *d) +{ @@ -59,7 +65,7 @@ index 1241d8c..b2dc4e4 100644 /* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally -@@ -551,6 +578,8 @@ int proc_dowatchdog(struct ctl_table *table, int write, +@@ -641,6 +668,8 @@ out: void __init lockup_detector_init(void) { @@ -67,4 +73,7 @@ index 1241d8c..b2dc4e4 100644 + set_sample_period(); - #ifdef CONFIG_NO_HZ_FULL + if (watchdog_user_enabled) +-- +1.9.3 + |