rpms/kernel/devel linux-2.6.11-execshield-vdso.patch,1.7,1.8

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9821

Modified Files:
	linux-2.6.11-execshield-vdso.patch 
Log Message:
simplify



linux-2.6.11-execshield-vdso.patch:
 linux-2.6.11/arch/i386/kernel/sysenter.c   |   71 +++++++++++++++++------------
 linux-2.6.11/fs/binfmt_elf.c               |   17 ++----
 linux-2.6.11/include/asm-i386/elf.h        |    7 ++
 linux-2.6.11/include/asm-i386/page.h       |    5 ++
 linux-2.6.11/include/linux/mm.h            |    5 ++
 linux-2.6.11/mm/mmap.c                     |   39 +++++++++++++++
 linux-2.6.12/arch/i386/kernel/cpu/common.c |    6 ++
 linux/fs/proc/task_mmu.c                   |   15 ++++--
 8 files changed, 122 insertions(+), 43 deletions(-)

Index: linux-2.6.11-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-execshield-vdso.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6.11-execshield-vdso.patch	1 Jul 2005 21:56:28 -0000	1.7
+++ linux-2.6.11-execshield-vdso.patch	6 Aug 2005 07:10:37 -0000	1.8
@@ -1,18 +1,3 @@
---- linux-2.6.8/arch/i386/kernel/cpu/common.c~	2004-10-12 17:21:42.945526432 -0400
-+++ linux-2.6.8/arch/i386/kernel/cpu/common.c	2004-10-12 17:24:30.941987088 -0400
-@@ -384,6 +377,12 @@ void __init identify_cpu(struct cpuinfo_
- 	if (disable_pse)
- 		clear_bit(X86_FEATURE_PSE, c->x86_capability);
- 
-+	/* hack: disable SEP for non-NX cpus; SEP breaks Execshield. */
-+	#ifdef CONFIG_HIGHMEM64G
-+	if (!test_bit(X86_FEATURE_NX, c->x86_capability)) 
-+	#endif
-+		clear_bit(X86_FEATURE_SEP, c->x86_capability);
-+
- 	/* If the model name is still unset, do table lookup. */
- 	if ( !c->x86_model_id[0] ) {
- 		char *p;
 --- linux-2.6.11/arch/i386/kernel/sysenter.c
 +++ linux-2.6.11/arch/i386/kernel/sysenter.c
 @@ -48,13 +48,6 @@ static int __init sysenter_setup(void)
@@ -265,14 +250,9 @@
  	create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT),
 --- linux-2.6.12/arch/i386/kernel/cpu/common.c~	2005-06-21 14:36:07.000000000 -0400
 +++ linux-2.6.12/arch/i386/kernel/cpu/common.c	2005-06-21 14:39:50.000000000 -0400
-@@ -398,10 +398,12 @@ void __init identify_cpu(struct cpuinfo_
+@@ -398,5 +398,11 @@ void __init identify_cpu(struct cpuinfo_
  		clear_bit(X86_FEATURE_PSE, c->x86_capability);
  
- 	/* hack: disable SEP for non-NX cpus; SEP breaks Execshield. */
--	#ifdef CONFIG_HIGHMEM64G
--	if (!test_bit(X86_FEATURE_NX, c->x86_capability)) 
--	#endif
--		clear_bit(X86_FEATURE_SEP, c->x86_capability);
 +	if (exec_shield != 0) {
 +#ifdef CONFIG_HIGHMEM64G	/* NX implies PAE */
 +		if (!test_bit(X86_FEATURE_NX, c->x86_capability))