Drop vmbugon-warnon patch

Upstream was pretty ambivalent about this one, and we don't really seem to
be hitting these in practice.
This commit is contained in:
Josh Boyer 2013-10-16 12:11:06 -04:00
parent 13bbe12129
commit f818e77232
2 changed files with 0 additions and 24 deletions

View File

@ -627,8 +627,6 @@ Patch09: upstream-reverts.patch
# Standalone patches # Standalone patches
Patch110: vmbugon-warnon.patch
#atch200: debug-bad-pte-dmi.patch #atch200: debug-bad-pte-dmi.patch
Patch201: debug-bad-pte-modules.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 # revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch upstream-reverts.patch -R ApplyOptionalPatch upstream-reverts.patch -R
ApplyPatch vmbugon-warnon.patch
#plyPatch debug-bad-pte-dmi.patch #plyPatch debug-bad-pte-dmi.patch
ApplyPatch debug-bad-pte-modules.patch ApplyPatch debug-bad-pte-modules.patch

View File

@ -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