rpms/kernel/devel linux-2.6-execshield.patch,1.114,1.115

[Dave Jones]

Author: davej

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

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
work around upstream 'cleanups'

linux-2.6-execshield.patch:
 b/arch/x86/include/asm/desc.h              |   25 +++++
 b/arch/x86/include/asm/mmu.h               |    7 +
 b/arch/x86/include/asm/paravirt.h          |    6 +
 b/arch/x86/include/asm/paravirt_types.h    |    3 
 b/arch/x86/include/asm/processor.h         |    3 
 b/arch/x86/kernel/cpu/common.c             |   14 +++
 b/arch/x86/kernel/paravirt.c               |    3 
 b/arch/x86/kernel/process_32.c             |   48 ++++++++++
 b/arch/x86/kernel/traps.c                  |  129 ++++++++++++++++++++++++++---
 b/arch/x86/mm/mmap.c                       |    5 -
 b/arch/x86/mm/tlb.c                        |    7 +
 b/arch/x86/vdso/vdso32-setup.c             |    2 
 b/arch/x86/xen/enlighten.c                 |   21 ++++
 b/fs/binfmt_elf.c                          |   21 ++++
 b/include/linux/mm.h                       |    8 +
 b/include/linux/mm_types.h                 |    3 
 b/include/linux/resource.h                 |    5 -
 b/include/linux/sched.h                    |    7 +
 b/kernel/sysctl.c                          |   28 ++++++
 b/mm/mmap.c                                |  121 +++++++++++++++++++++++++--
 b/mm/mprotect.c                            |   10 ++
 linux-2.6.32.noarch/arch/x86/mm/setup_nx.c |    6 +
 linux-2.6.32.noarch/mm/mremap.c            |    4 
 23 files changed, 459 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- linux-2.6-execshield.patch	11 Jan 2010 22:15:38 -0000	1.114
+++ linux-2.6-execshield.patch	11 Jan 2010 23:05:10 -0000	1.115
@@ -549,7 +549,7 @@ index b9b3bb5..1e55926 100644
 +	 * Turn off the CS limit completely if exec-shield disabled or
 +	 * NX active:
 +	 */
-+	if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || nx_enabled)
++	if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || (__supported_pte_mask & _PAGE_NX))
 +		arch_add_exec_range(current->mm, -1);
 +#endif
 +