[kernel] Remove 32bit NX emulation. It's time has passed. (and it seems to be broken anyway)

[Dave Jones]

commit 48d35dba7a308ba6c6d97d99f7a3bd62b2d8cead
Author: Dave Jones <davej at redhat.com>
Date:   Mon Jun 4 12:32:49 2012 -0400

    Remove 32bit NX emulation. It's time has passed. (and it seems to be broken anyway)

 kernel.spec                                        |   15 +-
 linux-2.6-32bit-mmap-exec-randomization.patch      |  248 --------
 linux-2.6-i386-nx-emulation.patch                  |  626 --------------------
 ...move-cpuinitdata-for-disable_nx-on-x86_32.patch |   47 --
 shlib_base_randomize.patch                         |   69 ---
 5 files changed, 3 insertions(+), 1002 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index d2e4833..3687ab2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -650,9 +650,6 @@ Patch09: linux-2.6-upstream-reverts.patch
 # Standalone patches
 
 Patch100: taint-vbox.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
 
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
@@ -737,9 +734,6 @@ Patch21098: hfsplus-Fix-bless-ioctl-when-used-with-hardlinks.patch
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-#rhbz 804957 CVE-2012-1568
-Patch21306: shlib_base_randomize.patch
-
 Patch21400: unhandled-irqs-switch-to-polling.patch
 
 Patch22000: weird-root-dentry-name-debug.patch
@@ -1300,9 +1294,6 @@ ApplyPatch taint-vbox.patch
 
 # 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
 
 #
 # ARM
@@ -1427,9 +1418,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
@@ -2290,6 +2278,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jun 04 2012 Dave Jones <davej at redhat.com>
+- Remove 32bit NX emulation.
+
 * Mon Jun 04 2012 Josh Boyer <jwboyer at redhat.com>
 - Remove modules.{devname,softdep} to prevent RPM verify errors (rhbz 650807)