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

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	linux-2.6-execshield.patch 
Log Message:
don't duplicate arch_align_stack() on x86_64

linux-2.6-execshield.patch:
 arch/i386/kernel/asm-offsets.c       |    1 
 arch/i386/kernel/cpu/common.c        |    7 +
 arch/i386/kernel/entry.S             |    8 +-
 arch/i386/kernel/process.c           |   59 +++++++++++++++
 arch/i386/kernel/signal.c            |    4 -
 arch/i386/kernel/smp.c               |    3 
 arch/i386/kernel/sysenter.c          |   56 ++++++++++++++-
 arch/i386/kernel/traps.c             |   93 ++++++++++++++++++++++++-
 arch/i386/kernel/vsyscall-sysenter.S |    6 -
 arch/i386/kernel/vsyscall.lds.S      |    4 -
 arch/i386/mm/init.c                  |    6 +
 arch/i386/mm/mmap.c                  |    6 +
 arch/ia64/ia32/binfmt_elf32.c        |    2 
 arch/x86_64/ia32/ia32_binfmt.c       |    4 -
 arch/x86_64/kernel/process.c         |    6 -
 arch/x86_64/kernel/setup64.c         |   23 ------
 arch/x86_64/mm/Makefile              |    2 
 arch/x86_64/mm/fault.c               |    2 
 arch/x86_64/mm/mmap.c                |   87 +++++++++++++++++++++++
 drivers/char/random.c                |    7 +
 fs/binfmt_elf.c                      |  130 ++++++++++++++++++++++++++++-------
 fs/proc/array.c                      |    8 +-
 fs/proc/base.c                       |    4 -
 fs/proc/task_mmu.c                   |   25 +++++-
 include/asm-i386/desc.h              |   14 +++
 include/asm-i386/elf.h               |   42 +++++++----
 include/asm-i386/mmu.h               |    6 +
 include/asm-i386/pgalloc.h           |    1 
 include/asm-i386/processor.h         |    7 +
 include/asm-i386/thread_info.h       |    1 
 include/asm-ia64/pgalloc.h           |    4 +
 include/asm-powerpc/pgalloc.h        |    5 +
 include/asm-ppc/pgalloc.h            |    5 +
 include/asm-s390/pgalloc.h           |    4 +
 include/asm-sparc/pgalloc.h          |    4 +
 include/asm-sparc64/pgalloc.h        |    4 +
 include/asm-x86_64/pgalloc.h         |    7 +
 include/asm-x86_64/pgtable.h         |    2 
 include/asm-x86_64/processor.h       |    4 +
 include/linux/mm.h                   |   11 ++
 include/linux/resource.h             |    5 +
 include/linux/sched.h                |    9 ++
 include/linux/sysctl.h               |    3 
 kernel/signal.c                      |   38 ++++++++++
 kernel/sysctl.c                      |   39 ++++++++++
 mm/fremap.c                          |   16 ++--
 mm/mmap.c                            |  105 ++++++++++++++++++++++++++--
 mm/mprotect.c                        |    5 +
 mm/mremap.c                          |    4 -
 49 files changed, 774 insertions(+), 124 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-execshield.patch	9 Jan 2006 19:24:08 -0000	1.7
+++ linux-2.6-execshield.patch	11 Jan 2006 01:03:33 -0000	1.8
@@ -661,7 +661,7 @@
 ===================================================================
 --- /dev/null
 +++ linux/arch/x86_64/mm/mmap.c
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,87 @@
 +/*
 + *  linux/arch/x86-64/mm/mmap.c
 + *
@@ -749,14 +749,6 @@
 +		mm->unmap_area = arch_unmap_area_topdown;
 +	}
 +}
-+
-+unsigned long arch_align_stack(unsigned long sp)
-+{
-+	if (current->flags & PF_RANDOMIZE)
-+		sp -= get_random_int() % 8192;
-+	return sp & ~0xf;
-+}
-+
 Index: linux/drivers/char/random.c
 ===================================================================
 --- linux.orig/drivers/char/random.c
@@ -1290,7 +1282,7 @@
 ===================================================================
 --- linux.orig/include/asm-i386/processor.h
 +++ linux/include/asm-i386/processor.h
-@@ -319,7 +319,10 @@ extern int bootloader_type;
+@@ -319,7 +319,9 @@ extern int bootloader_type;
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
@@ -1298,7 +1290,6 @@
 +#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE/3)
 +
 +#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
  
  #define HAVE_ARCH_PICK_MMAP_LAYOUT
  
@@ -1446,12 +1437,11 @@
 ===================================================================
 --- linux.orig/include/asm-x86_64/processor.h
 +++ linux/include/asm-x86_64/processor.h
-@@ -164,6 +164,11 @@ static inline void clear_in_cr4 (unsigne
+@@ -164,6 +164,10 @@ static inline void clear_in_cr4 (unsigne
   */
  #define TASK_SIZE64	(0x800000000000UL - 4096)
  
 +#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
 +
 +#define HAVE_ARCH_PICK_MMAP_LAYOUT
 +