rpms/kernel/devel kernel.spec, 1.846, 1.847 linux-2.6-execshield.patch, 1.95, 1.96

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12856

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/devel/kernel.spec,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- kernel.spec	5 Aug 2008 03:06:38 -0000	1.846
+++ kernel.spec	5 Aug 2008 03:08:49 -0000	1.847
@@ -1730,6 +1730,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 Dave Jones <davej at redhat.com>
 - Merge Linux-2.6 up to commit 2e1e9212ed8c532c6b324de77d3cafef5d2bc846
 
 * Mon Aug 04 2008 Matthew Garrett <mjg at redhat.com>

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- linux-2.6-execshield.patch	29 Jul 2008 04:16:47 -0000	1.95
+++ linux-2.6-execshield.patch	5 Aug 2008 03:08:49 -0000	1.96
@@ -273,9 +273,10 @@
  
  	return 0;
  }
-@@ -782,6 +782,9 @@ unsigned long __init_refok init_memory_m
+@@ -782,6 +782,10 @@ unsigned long __init_refok init_memory_m
  	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 "