summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-10-16 12:11:06 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-10-16 12:11:06 -0400
commitf818e77232c6a2f5920bb012a5ec4541915c6479 (patch)
treebf8f7d89363b993b3dbb9488ed8bd4991909af8d
parent13bbe121295e6444049e3c984164ad054c397017 (diff)
downloadkernel-f818e77232c6a2f5920bb012a5ec4541915c6479.tar.gz
kernel-f818e77232c6a2f5920bb012a5ec4541915c6479.tar.xz
kernel-f818e77232c6a2f5920bb012a5ec4541915c6479.zip
Drop vmbugon-warnon patch
Upstream was pretty ambivalent about this one, and we don't really seem to be hitting these in practice.
-rw-r--r--kernel.spec4
-rw-r--r--vmbugon-warnon.patch20
2 files changed, 0 insertions, 24 deletions
diff --git a/kernel.spec b/kernel.spec
index 65110ce5f..cc8111593 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -627,8 +627,6 @@ Patch09: upstream-reverts.patch
# Standalone patches
-Patch110: vmbugon-warnon.patch
-
#atch200: debug-bad-pte-dmi.patch
Patch201: debug-bad-pte-modules.patch
@@ -1287,8 +1285,6 @@ ApplyOptionalPatch compile-fixes.patch
# revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch upstream-reverts.patch -R
-ApplyPatch vmbugon-warnon.patch
-
#plyPatch debug-bad-pte-dmi.patch
ApplyPatch debug-bad-pte-modules.patch
diff --git a/vmbugon-warnon.patch b/vmbugon-warnon.patch
deleted file mode 100644
index fd8efc769..000000000
--- a/vmbugon-warnon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
-index 580bd58..3d908e9 100644
---- a/include/linux/mmdebug.h
-+++ b/include/linux/mmdebug.h
-@@ -2,13 +2,13 @@
- #define LINUX_MM_DEBUG_H 1
-
- #ifdef CONFIG_DEBUG_VM
--#define VM_BUG_ON(cond) BUG_ON(cond)
-+#define VM_BUG_ON(cond) WARN_ON(cond)
- #else
- #define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond)
- #endif
-
- #ifdef CONFIG_DEBUG_VIRTUAL
--#define VIRTUAL_BUG_ON(cond) BUG_ON(cond)
-+#define VIRTUAL_BUG_ON(cond) WARN_ON(cond)
- #else
- #define VIRTUAL_BUG_ON(cond) do { } while (0)
- #endif