rpms/kernel/F-12 kernel.spec, 1.1855, 1.1856 linux-2.6.31-modules-ro-nx.patch, 1.1, NONE linux-2.6.31-nx-data.patch, 1.1, NONE

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10118

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6.31-modules-ro-nx.patch linux-2.6.31-nx-data.patch 
Log Message:
Drop the NX kernel data patch for now. Causes no-boot on some systems.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1855
retrieving revision 1.1856
diff -u -p -r1.1855 -r1.1856
--- kernel.spec	10 Oct 2009 01:11:47 -0000	1.1855
+++ kernel.spec	11 Oct 2009 01:35:11 -0000	1.1856
@@ -667,9 +667,6 @@ Patch671: linux-2.6-ahci-export-capabili
 
 Patch687: linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-Patch700: linux-2.6.31-nx-data.patch
-Patch701: linux-2.6.31-modules-ro-nx.patch
-
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-pci-cacheline-sizing.patch
@@ -1309,12 +1306,6 @@ ApplyPatch linux-2.6-ahci-export-capabil
 # iwlagn quiet
 ApplyPatch linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch
 
-# Mark kernel data as NX
-ApplyPatch linux-2.6.31-nx-data.patch
-# Apply NX/RO to modules
-# breaks ftrace NOP replacement
-#ApplyPatch linux-2.6.31-modules-ro-nx.patch
-
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 
@@ -2048,6 +2039,9 @@ fi
 # and build.
 
 %changelog
+* Sat Oct 10 2009 Dave Jones <davej at redhat.com>
+- Drop the NX kernel data patch for now. Causes no-boot on some systems.
+
 * Fri Oct 09 2009 Dave Jones <davej at redhat.com>
 - Backport two critical ftrace fixes.
   ftrace: check for failure for all conversions


--- linux-2.6.31-modules-ro-nx.patch DELETED ---


--- linux-2.6.31-nx-data.patch DELETED ---