summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-12-18 10:29:25 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-12-18 10:31:48 -0500
commit4d2c9a2950531fe3d52fc0def849d90fd1bf6278 (patch)
tree77fc4219caa2a0b9c0b1a8a3e3f53cef0a853f53
parent97366df753bb8eb7c287f277f1876176c824b13e (diff)
downloadkernel-4d2c9a2950531fe3d52fc0def849d90fd1bf6278.tar.gz
kernel-4d2c9a2950531fe3d52fc0def849d90fd1bf6278.tar.xz
kernel-4d2c9a2950531fe3d52fc0def849d90fd1bf6278.zip
Fix nowatchdog-on-virt.patch to actually work in KVM guests
-rw-r--r--kernel.spec3
-rw-r--r--nowatchdog-on-virt.patch2
2 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 0a05fd8e8..b716a4cdd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2189,6 +2189,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Dec 18 2013 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix nowatchdog-on-virt.patch to actually work in KVM guests
+
* Tue Dec 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git1.1
- Linux v3.13-rc4-21-g0eda402
- Reenable debugging options.
diff --git a/nowatchdog-on-virt.patch b/nowatchdog-on-virt.patch
index f9570bbaf..c78029a31 100644
--- a/nowatchdog-on-virt.patch
+++ b/nowatchdog-on-virt.patch
@@ -49,7 +49,7 @@ index 1241d8c..b2dc4e4 100644
+ .callback = disable_watchdog,
+ .ident = "Bochs",
+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "Bochs Bochs"),
++ DMI_MATCH(DMI_SYS_VENDOR, "Bochs"),
+ },
+ },
+ {}