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

[Dave Jones]

commit 88fa1f0332d188795ed73d7ac2b1564e11a0b4cd
Author: Dave Jones <davej at redhat.com>
Date:   Mon Jun 4 11:56:08 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 01f915b..f6c5ec0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1316,9 +1316,12 @@ ApplyPatch 3.4.1-stable-queue.patch.xz
 
 # Architecture patches
 # x86(-64)
-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
+
 
 #
 # ARM
@@ -1443,9 +1446,6 @@ ApplyPatch hfsplus-Fix-bless-ioctl-when-used-with-hardlinks.patch
 #rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.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
@@ -2336,6 +2336,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon Jun 04 2012 Dave Jones <davej at redhat.com>
+- Disable 32bit NX emulation.
+
 * Sun Jun 02 2012 Justin M. Forbes <jforbes at redhat.com> 3.4.0-1
 - Linux 3.4
 - Stable queue updates