diff options
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | vmbugon-warnon.patch | 20 |
2 files changed, 27 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 6e7030605..2b39e4a43 100644 --- a/kernel.spec +++ b/kernel.spec @@ -651,6 +651,8 @@ Patch09: linux-2.6-upstream-reverts.patch Patch100: taint-vbox.patch +Patch110: vmbugon-warnon.patch + Patch390: linux-2.6-defaults-acpi-video.patch Patch391: linux-2.6-acpi-video-dos.patch Patch394: linux-2.6-acpi-debug-infinite-loop.patch @@ -1293,6 +1295,8 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyPatch taint-vbox.patch +ApplyPatch vmbugon-warnon.patch + # Architecture patches # x86(-64) @@ -2284,6 +2288,9 @@ fi # ||----w | # || || %changelog +* Tue Jul 31 2012 Dave Jones <davej@redhat.com> +- Change VM_BUG_ON's to be WARN_ONs instead. + * Tue Jul 31 2012 Josh Boyer <jwboyer@redhat.com> - Move modules needed by Shorewall back to main kernel package (rhbz 844436) diff --git a/vmbugon-warnon.patch b/vmbugon-warnon.patch new file mode 100644 index 000000000..fd8efc769 --- /dev/null +++ b/vmbugon-warnon.patch @@ -0,0 +1,20 @@ +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 |