rpms/kernel/devel kernel.spec, 1.1514, 1.1515 linux-2.6-execshield.patch, 1.105, 1.106

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19099

Modified Files:
	kernel.spec linux-2.6-execshield.patch 
Log Message:
* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
- execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1514
retrieving revision 1.1515
diff -u -r1.1514 -r1.1515
--- kernel.spec	13 Apr 2009 02:33:46 -0000	1.1514
+++ kernel.spec	13 Apr 2009 04:02:16 -0000	1.1515
@@ -1824,6 +1824,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)
+
 * Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.30-rc1-git5
 - revert-fix-modules_install-via-nfs.patch: reverted upstream

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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- linux-2.6-execshield.patch	6 Apr 2009 17:35:34 -0000	1.105
+++ linux-2.6-execshield.patch	13 Apr 2009 04:02:17 -0000	1.106
@@ -462,7 +462,7 @@
  	}
  }
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 821e970..cc106da 100644
+index 821e970..ea5a4c3 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -6,6 +6,7 @@
@@ -473,12 +473,15 @@
  #include <asm/tlbflush.h>
  #include <asm/mmu_context.h>
  #include <asm/apic.h>
-@@ -129,6 +130,9 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
+@@ -129,6 +130,12 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
  	union smp_flush_state *f;
  
  	cpu = smp_processor_id();
++
++#ifdef CONFIG_X86_32
 +	if (current->active_mm)
 +		load_user_cs_desc(cpu, current->active_mm);
++#endif
 +
  	/*
  	 * orig_rax contains the negated interrupt vector.