summaryrefslogtreecommitdiffstats
path: root/watchdog-Disable-watchdog-on-virtual-machines.patch
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-01-14 09:37:36 -0800
committerLaura Abbott <labbott@fedoraproject.org>2016-01-14 11:34:59 -0800
commita2bb5001cb5e7472864102c74895c5e084cb0ac2 (patch)
tree475e541607169f250a3f863ae5ed0e8c6192819a /watchdog-Disable-watchdog-on-virtual-machines.patch
parentcdfa7cd82ceb55c48ae6c0170d8a6d438e100715 (diff)
downloadkernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.tar.gz
kernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.tar.xz
kernel-a2bb5001cb5e7472864102c74895c5e084cb0ac2.zip
Linux v4.4
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
-rw-r--r--watchdog-Disable-watchdog-on-virtual-machines.patch12
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
+