rpms/kernel/F-9 kernel.spec, 1.731, 1.732 linux-2.6-execshield.patch, 1.88, 1.89

[Dave Jones (davej)]

Author: davej

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

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-9/kernel.spec,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- kernel.spec	5 Aug 2008 01:36:28 -0000	1.731
+++ kernel.spec	5 Aug 2008 03:10:58 -0000	1.732
@@ -1798,6 +1798,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Aug 04 2008 Dave Jones <davej at redhat.com>
+- Fix bogus printk in execshield noticed by Brendan Lynch.
+
 * Mon Aug 04 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.1-4
 - Update libata pata_it821x driver.
 - Re-enable *PIC debug code.

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-execshield.patch,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- linux-2.6-execshield.patch	4 Aug 2008 22:20:04 -0000	1.88
+++ linux-2.6-execshield.patch	5 Aug 2008 03:10:58 -0000	1.89
@@ -279,9 +279,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 "