rpms/kernel/FC-4 kernel-2.6.spec, 1.1359, 1.1360 linux-2.6.11-execshield-vdso.patch, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6.11-execshield-vdso.patch 
Log Message:
disable vdso for now.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1359
retrieving revision 1.1360
diff -u -r1.1359 -r1.1360
--- kernel-2.6.spec	25 May 2005 20:24:53 -0000	1.1359
+++ kernel-2.6.spec	25 May 2005 21:34:39 -0000	1.1360
@@ -1268,6 +1268,10 @@
   the release. I'll look at updating them again for an update.
 - Update to 2.6.12rc5
   Fix potential local DoS. 1-2 other small fixes.
+- Disable the vdso for now (Except for Xen kernels).
+  This is causing "can't boot" problems for quite a few folks.
+  We'll fix this and reenable it in an update. If it was working
+  fine for you before this kernel, you can boot with vdso=1
 
 * Wed May 25 2005 David Woodhouse <dwmw2 at redhat.com>
 - Turn off CONFIG_ISA on PPC again. It makes some Macs unhappy (#149200)

linux-2.6.11-execshield-vdso.patch:
 linux-2.6.11/arch/i386/kernel/sysenter.c  |   75 +++++++++++++++++++-----------
 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.8/arch/i386/kernel/cpu/common.c |    6 ++
 7 files changed, 116 insertions(+), 38 deletions(-)

Index: linux-2.6.11-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6.11-execshield-vdso.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6.11-execshield-vdso.patch	9 May 2005 22:19:09 -0000	1.5
+++ linux-2.6.11-execshield-vdso.patch	25 May 2005 21:34:39 -0000	1.6
@@ -263,3 +263,17 @@
  	compute_creds(bprm);
  	current->flags &= ~PF_FORKNOEXEC;
  	create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT),
+--- linux-2.6.11/arch/i386/kernel/sysenter.c~	2005-05-25 16:49:59.000000000 -0400
++++ linux-2.6.11/arch/i386/kernel/sysenter.c	2005-05-25 16:51:28.000000000 -0400
+@@ -69,7 +69,11 @@ __initcall(sysenter_setup);
+ 
+ extern void SYSENTER_RETURN_OFFSET;
+ 
++#ifdef CONFIG_XEN
+ unsigned int vdso_enabled = 1;
++#else
++unsigned int vdso_enabled = 0;
++#endif
+ 
+ /*
+  * This is called from binfmt_elf, we create the special vma for the