rpms/kernel/FC-3 kernel-2.6.spec, 1.844, 1.845 linux-2.6.11-exec-shield.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6.11-exec-shield.patch 
Log Message:
fix up task size thinko



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- kernel-2.6.spec	3 Jun 2005 17:50:20 -0000	1.844
+++ kernel-2.6.spec	10 Jun 2005 21:50:15 -0000	1.845
@@ -897,6 +897,9 @@
 %endif
 
 %changelog
+* Fri Jun 10 2005 Dave Jones <davej at redhat.com>
+- Fix up TASK_SIZE thinko in execshield patch. (#160097)
+
 * Fri Jun  3 2005 Dave Jones <davej at redhat.com>
 - Don't checksum CHECKSUM_UNNECESSARY skbs in TCP connection tracking. (#158710)
 

linux-2.6.11-exec-shield.patch:
 linux-2.6.11/include/asm-x86_64/processor.h |    4 
 linux/arch/i386/kernel/asm-offsets.c        |    1 
 linux/arch/i386/kernel/cpu/common.c         |    6 +
 linux/arch/i386/kernel/entry.S              |    8 +
 linux/arch/i386/kernel/process.c            |   69 ++++++++++++
 linux/arch/i386/kernel/signal.c             |    5 
 linux/arch/i386/kernel/smp.c                |    3 
 linux/arch/i386/kernel/sysenter.c           |   50 +++++++++
 linux/arch/i386/kernel/traps.c              |   44 ++++++++
 linux/arch/i386/kernel/vsyscall-sysenter.S  |    6 -
 linux/arch/i386/kernel/vsyscall.lds.S       |    4 
 linux/arch/i386/mm/init.c                   |    6 -
 linux/arch/i386/mm/mmap.c                   |   13 +-
 linux/arch/ia64/ia32/binfmt_elf32.c         |    2 
 linux/arch/x86_64/ia32/ia32_binfmt.c        |    2 
 linux/arch/x86_64/mm/Makefile               |    2 
 linux/arch/x86_64/mm/mmap.c                 |   95 +++++++++++++++++
 linux/drivers/char/random.c                 |   33 ++++++
 linux/fs/binfmt_elf.c                       |  152 +++++++++++++++++++++-------
 linux/fs/exec.c                             |    6 +
 linux/fs/proc/array.c                       |    8 +
 linux/fs/proc/base.c                        |    4 
 linux/fs/proc/task_mmu.c                    |   25 ++++
 linux/include/asm-i386/desc.h               |   14 ++
 linux/include/asm-i386/elf.h                |   42 +++++--
 linux/include/asm-i386/mmu.h                |    6 +
 linux/include/asm-i386/pgalloc.h            |    1 
 linux/include/asm-i386/processor.h          |    8 +
 linux/include/asm-i386/thread_info.h        |    1 
 linux/include/asm-ia64/pgalloc.h            |    4 
 linux/include/asm-ppc/pgalloc.h             |    5 
 linux/include/asm-ppc64/pgalloc.h           |    5 
 linux/include/asm-s390/pgalloc.h            |    4 
 linux/include/asm-sparc/pgalloc.h           |    4 
 linux/include/asm-sparc64/pgalloc.h         |    4 
 linux/include/asm-x86_64/pgalloc.h          |    7 +
 linux/include/asm-x86_64/processor.h        |    9 +
 linux/include/linux/mm.h                    |    9 +
 linux/include/linux/random.h                |    3 
 linux/include/linux/resource.h              |    5 
 linux/include/linux/sched.h                 |   11 ++
 linux/include/linux/sysctl.h                |    4 
 linux/kernel/signal.c                       |   38 +++++++
 linux/kernel/sysctl.c                       |   57 ++++++++++
 linux/mm/mmap.c                             |  104 +++++++++++++++++--
 linux/mm/mprotect.c                         |    5 
 linux/mm/mremap.c                           |    4 
 47 files changed, 812 insertions(+), 90 deletions(-)

Index: linux-2.6.11-exec-shield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.11-exec-shield.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.11-exec-shield.patch	1 Jun 2005 05:49:43 -0000	1.1
+++ linux-2.6.11-exec-shield.patch	10 Jun 2005 21:50:15 -0000	1.2
@@ -1722,7 +1722,7 @@
   */
  #define TASK_SIZE	(0x800000000000UL)
  
-+#define TASK_SIZE_64	(0x800000000000)
++#define TASK_SIZE_64	(0x800000000000UL)
 +
 +#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
 +
@@ -1750,3 +1750,16 @@
  #define pmd_populate_kernel(mm, pmd, pte) \
  		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
  #define pud_populate(mm, pud, pmd) \
+--- linux-2.6.11/include/asm-x86_64/processor.h~	2005-06-10 17:46:26.000000000 -0400
++++ linux-2.6.11/include/asm-x86_64/processor.h	2005-06-10 17:46:47.000000000 -0400
+@@ -162,9 +162,7 @@ static inline void clear_in_cr4 (unsigne
+ /*
+  * User space process size. 47bits minus one guard page.
+  */
+-#define TASK_SIZE	(0x800000000000UL - 4096)
+-
+-#define TASK_SIZE_64	(0x800000000000UL)
++#define TASK_SIZE_64	(0x800000000000UL - 4096)
+ 
+ #define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
+