rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change VM_BUG_ON's to be WARN_ONs instead.

This commit is contained in:
Dave Jones 2012-07-31 09:47:02 -04:00
parent 66cb0c0021
commit 880031fe2d
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -644,6 +644,8 @@ Patch09: linux-2.6-upstream-reverts.patch
Patch100: taint-vbox.patch
Patch101: taint-rss.patch
Patch110: vmbugon-warnon.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
Patch162: nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
@ -1311,6 +1313,8 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
ApplyPatch taint-vbox.patch
ApplyPatch taint-rss.patch
ApplyPatch vmbugon-warnon.patch
# Architecture patches
# x86(-64)
#ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
@ -2336,6 +2340,9 @@ fi
# '-' | |
# '-'
%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)

20
vmbugon-warnon.patch Normal file
View File

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