rpms/kernel/F-12 kernel.spec,1.1826,1.1827

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Drop the modules-ro-nx patch: it's causing ftrace to be unable
  to NOP out module function call tracking. (#524042)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -p -r1.1826 -r1.1827
--- kernel.spec	23 Sep 2009 21:26:57 -0000	1.1826
+++ kernel.spec	24 Sep 2009 16:22:11 -0000	1.1827
@@ -1329,7 +1329,8 @@ ApplyPatch linux-2.6-iwlwifi-remove-depr
 # Mark kernel data as NX
 ApplyPatch linux-2.6.31-nx-data.patch
 # Apply NX/RO to modules
-ApplyPatch linux-2.6.31-modules-ro-nx.patch
+# breaks ftrace NOP replacement
+#ApplyPatch linux-2.6.31-modules-ro-nx.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -2072,6 +2073,10 @@ fi
 # and build.
 
 %changelog
+* Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-40
+- Drop the modules-ro-nx patch: it's causing ftrace to be unable
+  to NOP out module function call tracking. (#524042)
+
 * Wed Sep 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-39
 - touch initramfs-$foo not dracut-$foo.