[kernel/f15] disable 32bit nx, it seems to be broken

[Dave Jones]

commit 8cd38153da9cff9751ce7da1be426d6127641321
Author: Dave Jones <davej at redhat.com>
Date:   Mon Jun 4 11:55:32 2012 -0400

    disable 32bit nx, it seems to be broken

 kernel.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ac9ac06..f201249 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1143,9 +1143,12 @@ ApplyPatch taint-vbox.patch
 #
 # NX Emulation
 #
-ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
-ApplyPatch linux-2.6-i386-nx-emulation.patch
-ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
+#ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
+#ApplyPatch linux-2.6-i386-nx-emulation.patch
+#ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
+#rhbz 804957 CVE-2012-1568
+#ApplyPatch shlib_base_randomize.patch
+
 
 #
 # bugfixes to drivers and filesystems
@@ -1281,9 +1284,6 @@ ApplyPatch bcma-brcmsmac-compat.patch
 #rhbz 789644
 ApplyPatch mcelog-rcu-splat.patch
 
-#rhbz 804957 CVE-2012-1568
-ApplyPatch shlib_base_randomize.patch
-
 ApplyPatch unhandled-irqs-switch-to-polling.patch
 
 ApplyPatch weird-root-dentry-name-debug.patch
@@ -1967,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 04 2012 Dave Jones <davej at redhat.com>
+- Disable 32bit NX emulation.
+
 * Wed May 30 2012 Josh Boyer <jwboyer at redhat.com>
 - CVE-2012-2390 huge pages: memory leak on mmap failure (rhbz 824352 824345)