rpms/kernel/F-8 kernel.spec, 1.509, 1.510 linux-2.6-execshield.patch, 1.76, 1.77

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13232

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
Fix bogus printk in execshield noticed by Brendan Lynch.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- kernel.spec	4 Aug 2008 17:36:05 -0000	1.509
+++ kernel.spec	5 Aug 2008 03:13:22 -0000	1.510
@@ -1838,6 +1838,9 @@
 
 
 %changelog
+* Mon Aug 04 2008 Dave Jones <davej at redhat.com>
+- Fix bogus printk in execshield noticed by Brendan Lynch.
+
 * Mon Aug 04 2008 John W. Linville <linville at redhat.com> 2.6.25.14-69
 - fix for long-standing rt2500usb issues (#411481)
 

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-execshield.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- linux-2.6-execshield.patch	21 May 2008 23:55:13 -0000	1.76
+++ linux-2.6-execshield.patch	5 Aug 2008 03:13:22 -0000	1.77
@@ -337,9 +337,10 @@
  
  	return 0;
  }
-@@ -527,6 +525,10 @@ void __init paging_init(void)
+@@ -527,6 +525,11 @@ void __init paging_init(void)
  	if (nx_enabled)
  		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
++	else
  #endif
 +	if (exec_shield)
 +		printk(KERN_INFO "Using x86 segment limits to approximate "