rpms/kernel/devel linux-2.6.11-execshield-vdso.patch,1.13,1.14

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	linux-2.6.11-execshield-vdso.patch 
Log Message:
remove dupe hunk.


linux-2.6.11-execshield-vdso.patch:
 arch/i386/kernel/sysenter.c |   71 +++++++++++++++++++++++++++-----------------
 fs/binfmt_elf.c             |   15 +++------
 fs/proc/task_mmu.c          |   15 ++++++---
 include/asm-i386/elf.h      |    7 ++++
 include/asm-i386/page.h     |    5 +++
 include/linux/mm.h          |    5 +++
 mm/mmap.c                   |   39 ++++++++++++++++++++++++
 7 files changed, 115 insertions(+), 42 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6.11-execshield-vdso.patch	6 Sep 2005 02:09:13 -0000	1.13
+++ linux-2.6.11-execshield-vdso.patch	10 Sep 2005 07:12:10 -0000	1.14
@@ -1,20 +1,3 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-812/arch/i386/kernel/cpu/common.c linux-813/arch/i386/kernel/cpu/common.c
---- linux-812/arch/i386/kernel/cpu/common.c
-+++ linux-813/arch/i386/kernel/cpu/common.c
-@@ -397,6 +397,13 @@ void __devinit identify_cpu(struct cpuin
- 	if (disable_pse)
- 		clear_bit(X86_FEATURE_PSE, c->x86_capability);
- 
-+	if (exec_shield != 0) {
-+#ifdef CONFIG_HIGHMEM64G   /* NX implies PAE */
-+		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;
 diff -urNp --exclude-from=/home/davej/.exclude linux-812/arch/i386/kernel/sysenter.c linux-813/arch/i386/kernel/sysenter.c
 --- linux-812/arch/i386/kernel/sysenter.c
 +++ linux-813/arch/i386/kernel/sysenter.c