rpms/kernel/devel kernel-2.6.spec, 1.3232, 1.3233 linux-2.6-execshield.patch, 1.57, 1.58

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5641

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
Log Message:
* Thu Jun 21 2007 Dave Jones <davej at redhat.com>
- Remove some unnecessary parts of execshield.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3232
retrieving revision 1.3233
diff -u -r1.3232 -r1.3233
--- kernel-2.6.spec	21 Jun 2007 23:09:24 -0000	1.3232
+++ kernel-2.6.spec	22 Jun 2007 01:54:24 -0000	1.3233
@@ -2085,6 +2085,9 @@
 
 %changelog
 * Thu Jun 21 2007 Dave Jones <davej at redhat.com>
+- Remove some unnecessary parts of execshield.
+
+* Thu Jun 21 2007 Dave Jones <davej at redhat.com>
 - Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu.
 
 * Thu Jun 21 2007 Dave Jones <davej at redhat.com>

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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- linux-2.6-execshield.patch	12 Jun 2007 03:10:40 -0000	1.57
+++ linux-2.6-execshield.patch	22 Jun 2007 01:54:24 -0000	1.58
@@ -120,16 +120,6 @@
  #include <linux/module.h>
  
  #include <asm/cpufeature.h>
-@@ -265,7 +265,8 @@ int __init sysenter_setup(void)
- extern void SYSENTER_RETURN;
- 
- /* Setup a VMA at program startup for the vsyscall page */
--int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
-+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack,
-+		unsigned long start_code, unsigned long interp_map_address)
- {
- 	struct mm_struct *mm = current->mm;
- 	unsigned long addr;
 @@ -284,7 +284,7 @@ int arch_setup_additional_pages(struct l
  	if (compat)
  		addr = VDSO_HIGH_BASE;
@@ -625,20 +615,6 @@
  {
  	unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
  
-Index: linux-2.6/arch/powerpc/kernel/vdso.c
-===================================================================
---- linux-2.6.orig/arch/powerpc/kernel/vdso.c
-+++ linux-2.6/arch/powerpc/kernel/vdso.c
-@@ -218,7 +218,8 @@ static struct vm_operations_struct vdso_
-  * vDSO and insert it into the mm struct tree
-  */
- int arch_setup_additional_pages(struct linux_binprm *bprm,
--				int executable_stack)
-+				int executable_stack, unsigned long start_code,
-+				unsigned long interp_map_address)
- {
- 	struct mm_struct *mm = current->mm;
- 	struct vm_area_struct *vma;
 Index: linux-2.6/arch/x86_64/ia32/ia32_binfmt.c
 ===================================================================
 --- linux-2.6.orig/arch/x86_64/ia32/ia32_binfmt.c
@@ -661,28 +637,6 @@
  } while (0)
  
  /* Override some function names */
-@@ -311,7 +307,7 @@ static void elf32_init(struct pt_regs *)
- 
- #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
- #define arch_setup_additional_pages syscall32_setup_pages
--extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
-+extern int syscall32_setup_pages(struct linux_binprm *, int exstack, unsigned long start_code, unsigned long interp_map_address);
- 
- #include "../../../fs/binfmt_elf.c" 
- 
---- linux-2.6.21.noarch/arch/x86_64/ia32/syscall32.c~	2007-05-27 22:35:41.000000000 -0400
-+++ linux-2.6.21.noarch/arch/x86_64/ia32/syscall32.c	2007-05-27 22:36:00.000000000 -0400
-@@ -25,7 +25,9 @@ static int use_sysenter = -1;
- struct linux_binprm;
- 
- /* Setup a VMA at program startup for the vsyscall page */
--int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
-+int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
-+		unsigned long start_code,
-+		unsigned long interp_map_address)
- {
- 	struct mm_struct *mm = current->mm;
- 	int ret;
 Index: linux-2.6/arch/x86_64/kernel/process.c
 ===================================================================
 --- linux-2.6.orig/arch/x86_64/kernel/process.c
@@ -1162,8 +1116,8 @@
  
  #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES
 -	retval = arch_setup_additional_pages(bprm, executable_stack);
-+	retval = arch_setup_additional_pages(bprm, executable_stack,
-+			start_code, interp_map_addr);
++	retval = arch_setup_additional_pages(bprm, executable_stack);
++
  	if (retval < 0) {
  		send_sig(SIGKILL, current, 0);
 -		goto out;
@@ -1346,16 +1300,6 @@
  /*
 --- linux-2.6.21.noarch/include/asm-i386/elf.h~	2007-05-27 18:54:47.000000000 -0400
 +++ linux-2.6.21.noarch/include/asm-i386/elf.h	2007-05-27 18:55:11.000000000 -0400
-@@ -148,7 +148,8 @@ struct linux_binprm;
- 
- #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
- extern int arch_setup_additional_pages(struct linux_binprm *bprm,
--                                       int executable_stack);
-+					int executable_stack, unsigned long start_code,
-+					unsigned long interp_map_address);
- 
- extern unsigned int vdso_enabled;
- 
 @@ -215,4 +216,7 @@ do {									      \
  
  #endif
@@ -1425,20 +1369,6 @@
  /*
   * This file contains the functions and defines necessary to allocate
   * page tables.
-Index: linux-2.6/include/asm-powerpc/elf.h
-===================================================================
---- linux-2.6.orig/include/asm-powerpc/elf.h
-+++ linux-2.6/include/asm-powerpc/elf.h
-@@ -272,7 +272,8 @@ extern int ucache_bsize;
- #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
- struct linux_binprm;
- extern int arch_setup_additional_pages(struct linux_binprm *bprm,
--				       int executable_stack);
-+				       int executable_stack, unsigned long start_code,
-+					   unsigned long interp_map_address);
- #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);
- 
- /*
 --- linux-2.6.21.noarch/include/asm-powerpc/pgalloc.h~	2007-05-27 18:56:56.000000000 -0400
 +++ linux-2.6.21.noarch/include/asm-powerpc/pgalloc.h	2007-05-27 18:57:04.000000000 -0400
 @@ -2,6 +2,11 @@