add iptables header fix + dos fix

4 files changed, 587 insertions, 634 deletions

diff --git a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/0000_README b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/0000_README
index 6db1000bfd..e5a971151b 100644
--- a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/0000_README
+++ b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/0000_README
@@ -20,8 +20,16 @@ Invididual Patch Descriptions:
 -------------------------------------------------------------------------------
 Patch: 1000_grsecurity-2.0.1-2.6.7.patch
 from: Brad Spengler, http://grsecurity.net
-desc: GRSecurity for 2.6.7, prerelease pulled 29-Jun-2004 15:41
-		+ Minor fix on PPC from Chris Pebenito.
+desc: GRSecurity for 2.6.7, prerelease pulled 01-Jul-2004 16:35 
+
+Patch:	1010_ip_tables.patch
+from:	http://thread.gmane.org/gmane.comp.security.bugtraq/12272
+Desc:	Fix iptables DoS
+
+Patch:	1020_iptables-headers.patch
+from:	http://bugs.gentoo.org/show_bug.cgi?id=55501
+desc:	fixes bug 55501, and is already included in mainline tree.  To be
+	removed from this package once 2.6.8 is out.
 
 Patch: 1300_linux-2.6.4-selinux-hooks.patch
 from: Joshua Brindle <method@gentoo.org>
diff --git a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1000_grsecurity-2.0.1-2.6.7.patch b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1000_grsecurity-2.0.1-2.6.7.patch
index 970b40d6f1..d09e3fd2b3 100644
--- a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1000_grsecurity-2.0.1-2.6.7.patch
+++ b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1000_grsecurity-2.0.1-2.6.7.patch
@@ -1,6 +1,6 @@
-diff -urN linux-2.6.7/Makefile linux-2.6.7-new/Makefile
+diff -urN linux-2.6.7/Makefile linux-2.6.7/Makefile
 --- linux-2.6.7/Makefile	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/Makefile	2004-06-25 23:36:20 -0400
++++ linux-2.6.7/Makefile	2004-06-25 23:36:20 -0400
 @@ -1,7 +1,7 @@
  VERSION = 2
  PATCHLEVEL = 6
@@ -19,9 +19,9 @@ diff -urN linux-2.6.7/Makefile linux-2.6.7-new/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urN linux-2.6.7/arch/alpha/kernel/osf_sys.c linux-2.6.7-new/arch/alpha/kernel/osf_sys.c
+diff -urN linux-2.6.7/arch/alpha/kernel/osf_sys.c linux-2.6.7/arch/alpha/kernel/osf_sys.c
 --- linux-2.6.7/arch/alpha/kernel/osf_sys.c	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/arch/alpha/kernel/osf_sys.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/alpha/kernel/osf_sys.c	2004-06-25 17:41:53 -0400
 @@ -37,6 +37,7 @@
  #include <linux/namei.h>
  #include <linux/uio.h>
@@ -86,9 +86,9 @@ diff -urN linux-2.6.7/arch/alpha/kernel/osf_sys.c linux-2.6.7-new/arch/alpha/ker
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urN linux-2.6.7/arch/alpha/kernel/ptrace.c linux-2.6.7-new/arch/alpha/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/alpha/kernel/ptrace.c linux-2.6.7/arch/alpha/kernel/ptrace.c
 --- linux-2.6.7/arch/alpha/kernel/ptrace.c	2004-06-16 01:19:53 -0400
-+++ linux-2.6.7-new/arch/alpha/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/alpha/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -14,6 +14,7 @@
  #include <linux/user.h>
  #include <linux/slab.h>
@@ -107,9 +107,9 @@ diff -urN linux-2.6.7/arch/alpha/kernel/ptrace.c linux-2.6.7-new/arch/alpha/kern
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out;
-diff -urN linux-2.6.7/arch/alpha/mm/fault.c linux-2.6.7-new/arch/alpha/mm/fault.c
+diff -urN linux-2.6.7/arch/alpha/mm/fault.c linux-2.6.7/arch/alpha/mm/fault.c
 --- linux-2.6.7/arch/alpha/mm/fault.c	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/arch/alpha/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/alpha/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -25,6 +25,7 @@
  #include <linux/smp_lock.h>
  #include <linux/interrupt.h>
@@ -297,9 +297,9 @@ diff -urN linux-2.6.7/arch/alpha/mm/fault.c linux-2.6.7-new/arch/alpha/mm/fault.
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urN linux-2.6.7/arch/i386/Kconfig linux-2.6.7-new/arch/i386/Kconfig
+diff -urN linux-2.6.7/arch/i386/Kconfig linux-2.6.7/arch/i386/Kconfig
 --- linux-2.6.7/arch/i386/Kconfig	2004-06-16 01:18:59 -0400
-+++ linux-2.6.7-new/arch/i386/Kconfig	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/Kconfig	2004-06-25 17:41:53 -0400
 @@ -396,7 +396,7 @@
  
  config X86_ALIGNMENT_16
@@ -309,9 +309,9 @@ diff -urN linux-2.6.7/arch/i386/Kconfig linux-2.6.7-new/arch/i386/Kconfig
  	default y
  
  config X86_GOOD_APIC
-diff -urN linux-2.6.7/arch/i386/kernel/apm.c linux-2.6.7-new/arch/i386/kernel/apm.c
+diff -urN linux-2.6.7/arch/i386/kernel/apm.c linux-2.6.7/arch/i386/kernel/apm.c
 --- linux-2.6.7/arch/i386/kernel/apm.c	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/apm.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/apm.c	2004-06-25 17:41:53 -0400
 @@ -597,19 +597,40 @@
  	int			cpu;
  	struct desc_struct	save_desc_40;
@@ -394,9 +394,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/apm.c linux-2.6.7-new/arch/i386/kernel/ap
  	put_cpu();
  	apm_restore_cpus(cpus);
  	return error;
-diff -urN linux-2.6.7/arch/i386/kernel/cpu/common.c linux-2.6.7-new/arch/i386/kernel/cpu/common.c
+diff -urN linux-2.6.7/arch/i386/kernel/cpu/common.c linux-2.6.7/arch/i386/kernel/cpu/common.c
 --- linux-2.6.7/arch/i386/kernel/cpu/common.c	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/cpu/common.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/cpu/common.c	2004-06-25 17:41:53 -0400
 @@ -358,6 +358,10 @@
  	if (this_cpu->c_init)
  		this_cpu->c_init(c);
@@ -417,9 +417,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/cpu/common.c linux-2.6.7-new/arch/i386/ke
  
  	/* Set up doublefault TSS pointer in the GDT */
  	__set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
-diff -urN linux-2.6.7/arch/i386/kernel/entry.S linux-2.6.7-new/arch/i386/kernel/entry.S
+diff -urN linux-2.6.7/arch/i386/kernel/entry.S linux-2.6.7/arch/i386/kernel/entry.S
 --- linux-2.6.7/arch/i386/kernel/entry.S	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/entry.S	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/entry.S	2004-06-25 17:41:53 -0400
 @@ -266,6 +266,11 @@
  	movl TI_flags(%ebp), %ecx
  	testw $_TIF_ALLWORK_MASK, %cx
@@ -453,9 +453,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/entry.S linux-2.6.7-new/arch/i386/kernel/
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urN linux-2.6.7/arch/i386/kernel/head.S linux-2.6.7-new/arch/i386/kernel/head.S
+diff -urN linux-2.6.7/arch/i386/kernel/head.S linux-2.6.7/arch/i386/kernel/head.S
 --- linux-2.6.7/arch/i386/kernel/head.S	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/head.S	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/head.S	2004-06-25 17:41:53 -0400
 @@ -48,6 +48,12 @@
  
  
@@ -623,9 +623,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/head.S linux-2.6.7-new/arch/i386/kernel/h
  
  	.quad 0x0000000000000000	/* 0xd0 - unused */
  	.quad 0x0000000000000000	/* 0xd8 - unused */
-diff -urN linux-2.6.7/arch/i386/kernel/ioport.c linux-2.6.7-new/arch/i386/kernel/ioport.c
+diff -urN linux-2.6.7/arch/i386/kernel/ioport.c linux-2.6.7/arch/i386/kernel/ioport.c
 --- linux-2.6.7/arch/i386/kernel/ioport.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/ioport.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/i386/kernel/ioport.c	2004-06-25 14:07:21 -0400
 @@ -15,6 +15,7 @@
  #include <linux/stddef.h>
  #include <linux/slab.h>
@@ -666,9 +666,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/ioport.c linux-2.6.7-new/arch/i386/kernel
  	}
  	regs->eflags = (regs->eflags &~ 0x3000UL) | (level << 12);
  	/* Make sure we return the long way (not sysenter) */
-diff -urN linux-2.6.7/arch/i386/kernel/ldt.c linux-2.6.7-new/arch/i386/kernel/ldt.c
+diff -urN linux-2.6.7/arch/i386/kernel/ldt.c linux-2.6.7/arch/i386/kernel/ldt.c
 --- linux-2.6.7/arch/i386/kernel/ldt.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/ldt.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/ldt.c	2004-06-25 17:41:53 -0400
 @@ -102,6 +102,19 @@
  		retval = copy_ldt(&mm->context, &old_mm->context);
  		up(&old_mm->context.sem);
@@ -712,9 +712,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/ldt.c linux-2.6.7-new/arch/i386/kernel/ld
  	entry_1 = LDT_entry_a(&ldt_info);
  	entry_2 = LDT_entry_b(&ldt_info);
  	if (oldmode)
-diff -urN linux-2.6.7/arch/i386/kernel/process.c linux-2.6.7-new/arch/i386/kernel/process.c
+diff -urN linux-2.6.7/arch/i386/kernel/process.c linux-2.6.7/arch/i386/kernel/process.c
 --- linux-2.6.7/arch/i386/kernel/process.c	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/process.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/process.c	2004-06-25 17:41:53 -0400
 @@ -352,7 +352,7 @@
  	struct task_struct *tsk;
  	int err;
@@ -825,9 +825,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/process.c linux-2.6.7-new/arch/i386/kerne
 +	current->thread.esp0 = tss->esp0;
 +}
 +#endif
-diff -urN linux-2.6.7/arch/i386/kernel/ptrace.c linux-2.6.7-new/arch/i386/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/i386/kernel/ptrace.c linux-2.6.7/arch/i386/kernel/ptrace.c
 --- linux-2.6.7/arch/i386/kernel/ptrace.c	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/ptrace.c	2004-06-25 14:08:27 -0400
++++ linux-2.6.7/arch/i386/kernel/ptrace.c	2004-06-25 14:08:27 -0400
 @@ -15,6 +15,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -864,9 +864,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/ptrace.c linux-2.6.7-new/arch/i386/kernel
  			  
  			  if(addr == (long) &dummy->u_debugreg[7]) {
  				  data &= ~DR_CONTROL_RESERVED;
-diff -urN linux-2.6.7/arch/i386/kernel/reboot.c linux-2.6.7-new/arch/i386/kernel/reboot.c
+diff -urN linux-2.6.7/arch/i386/kernel/reboot.c linux-2.6.7/arch/i386/kernel/reboot.c
 --- linux-2.6.7/arch/i386/kernel/reboot.c	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/reboot.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/reboot.c	2004-06-25 17:41:53 -0400
 @@ -74,18 +74,18 @@
     doesn't work with at least one type of 486 motherboard.  It is easy
     to stop this code working; hence the copious comments. */
@@ -890,9 +890,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/reboot.c linux-2.6.7-new/arch/i386/kernel
  }
  real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, real_mode_gdt_entries },
  real_mode_idt = { 0x3ff, 0 },
-diff -urN linux-2.6.7/arch/i386/kernel/setup.c linux-2.6.7-new/arch/i386/kernel/setup.c
+diff -urN linux-2.6.7/arch/i386/kernel/setup.c linux-2.6.7/arch/i386/kernel/setup.c
 --- linux-2.6.7/arch/i386/kernel/setup.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/setup.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/setup.c	2004-06-25 17:41:53 -0400
 @@ -1137,7 +1137,7 @@
  
  	code_resource.start = virt_to_phys(_text);
@@ -918,9 +918,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/setup.c linux-2.6.7-new/arch/i386/kernel/
  #include "setup_arch_post.h"
  /*
   * Local Variables:
-diff -urN linux-2.6.7/arch/i386/kernel/signal.c linux-2.6.7-new/arch/i386/kernel/signal.c
+diff -urN linux-2.6.7/arch/i386/kernel/signal.c linux-2.6.7/arch/i386/kernel/signal.c
 --- linux-2.6.7/arch/i386/kernel/signal.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/signal.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/signal.c	2004-06-25 17:41:53 -0400
 @@ -367,7 +367,17 @@
  	if (err)
  		goto give_sigsegv;
@@ -958,9 +958,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/signal.c linux-2.6.7-new/arch/i386/kernel
  	if (ka->sa.sa_flags & SA_RESTORER)
  		restorer = ka->sa.sa_restorer;
  	err |= __put_user(restorer, &frame->pretcode);
-diff -urN linux-2.6.7/arch/i386/kernel/sys_i386.c linux-2.6.7-new/arch/i386/kernel/sys_i386.c
+diff -urN linux-2.6.7/arch/i386/kernel/sys_i386.c linux-2.6.7/arch/i386/kernel/sys_i386.c
 --- linux-2.6.7/arch/i386/kernel/sys_i386.c	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/sys_i386.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/sys_i386.c	2004-06-25 17:41:53 -0400
 @@ -19,6 +19,7 @@
  #include <linux/mman.h>
  #include <linux/file.h>
@@ -1072,9 +1072,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/sys_i386.c linux-2.6.7-new/arch/i386/kern
  
  struct sel_arg_struct {
  	unsigned long n;
-diff -urN linux-2.6.7/arch/i386/kernel/sysenter.c linux-2.6.7-new/arch/i386/kernel/sysenter.c
+diff -urN linux-2.6.7/arch/i386/kernel/sysenter.c linux-2.6.7/arch/i386/kernel/sysenter.c
 --- linux-2.6.7/arch/i386/kernel/sysenter.c	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/sysenter.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/sysenter.c	2004-06-25 17:41:53 -0400
 @@ -41,6 +41,7 @@
  extern const char vsyscall_int80_start, vsyscall_int80_end;
  extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
@@ -1088,9 +1088,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/sysenter.c linux-2.6.7-new/arch/i386/kern
  
  __initcall(sysenter_setup);
 +#endif
-diff -urN linux-2.6.7/arch/i386/kernel/trampoline.S linux-2.6.7-new/arch/i386/kernel/trampoline.S
+diff -urN linux-2.6.7/arch/i386/kernel/trampoline.S linux-2.6.7/arch/i386/kernel/trampoline.S
 --- linux-2.6.7/arch/i386/kernel/trampoline.S	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/trampoline.S	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/trampoline.S	2004-06-25 17:41:53 -0400
 @@ -58,7 +58,7 @@
  	inc	%ax		# protected mode (PE) bit
  	lmsw	%ax		# into protected mode
@@ -1100,9 +1100,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/trampoline.S linux-2.6.7-new/arch/i386/ke
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urN linux-2.6.7/arch/i386/kernel/traps.c linux-2.6.7-new/arch/i386/kernel/traps.c
+diff -urN linux-2.6.7/arch/i386/kernel/traps.c linux-2.6.7/arch/i386/kernel/traps.c
 --- linux-2.6.7/arch/i386/kernel/traps.c	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/traps.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/traps.c	2004-06-25 17:41:53 -0400
 @@ -26,6 +26,7 @@
  #include <linux/kallsyms.h>
  #include <linux/ptrace.h>
@@ -1251,9 +1251,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/traps.c linux-2.6.7-new/arch/i386/kernel/
  {
  	_set_gate(a,12,3,addr,__KERNEL_CS);
  }
-diff -urN linux-2.6.7/arch/i386/kernel/vmlinux.lds.S linux-2.6.7-new/arch/i386/kernel/vmlinux.lds.S
+diff -urN linux-2.6.7/arch/i386/kernel/vmlinux.lds.S linux-2.6.7/arch/i386/kernel/vmlinux.lds.S
 --- linux-2.6.7/arch/i386/kernel/vmlinux.lds.S	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/arch/i386/kernel/vmlinux.lds.S	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/kernel/vmlinux.lds.S	2004-06-25 17:41:53 -0400
 @@ -2,7 +2,12 @@
   * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
   */
@@ -1432,9 +1432,9 @@ diff -urN linux-2.6.7/arch/i386/kernel/vmlinux.lds.S linux-2.6.7-new/arch/i386/k
  
    _end = . ;
  
-diff -urN linux-2.6.7/arch/i386/mm/fault.c linux-2.6.7-new/arch/i386/mm/fault.c
+diff -urN linux-2.6.7/arch/i386/mm/fault.c linux-2.6.7/arch/i386/mm/fault.c
 --- linux-2.6.7/arch/i386/mm/fault.c	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/arch/i386/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -21,6 +21,9 @@
  #include <linux/vt_kern.h>		/* For unblank_screen() */
  #include <linux/highmem.h>
@@ -1876,9 +1876,9 @@ diff -urN linux-2.6.7/arch/i386/mm/fault.c linux-2.6.7-new/arch/i386/mm/fault.c
 +	printk("\n");
 +}
 +#endif
-diff -urN linux-2.6.7/arch/i386/mm/init.c linux-2.6.7-new/arch/i386/mm/init.c
+diff -urN linux-2.6.7/arch/i386/mm/init.c linux-2.6.7/arch/i386/mm/init.c
 --- linux-2.6.7/arch/i386/mm/init.c	2004-06-16 01:19:44 -0400
-+++ linux-2.6.7-new/arch/i386/mm/init.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/mm/init.c	2004-06-25 17:41:53 -0400
 @@ -40,6 +40,7 @@
  #include <asm/tlb.h>
  #include <asm/tlbflush.h>
@@ -1950,9 +1950,9 @@ diff -urN linux-2.6.7/arch/i386/mm/init.c linux-2.6.7-new/arch/i386/mm/init.c
  }
  
  #ifdef CONFIG_BLK_DEV_INITRD
-diff -urN linux-2.6.7/arch/i386/pci/pcbios.c linux-2.6.7-new/arch/i386/pci/pcbios.c
+diff -urN linux-2.6.7/arch/i386/pci/pcbios.c linux-2.6.7/arch/i386/pci/pcbios.c
 --- linux-2.6.7/arch/i386/pci/pcbios.c	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/arch/i386/pci/pcbios.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/i386/pci/pcbios.c	2004-06-25 17:41:53 -0400
 @@ -6,7 +6,7 @@
  #include <linux/init.h>
  #include "pci.h"
@@ -1995,9 +1995,9 @@ diff -urN linux-2.6.7/arch/i386/pci/pcbios.c linux-2.6.7-new/arch/i386/pci/pcbio
  
  static int pci_bios_present;
  
-diff -urN linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.7-new/arch/ia64/ia32/binfmt_elf32.c
+diff -urN linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c
 --- linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c	2004-06-16 01:20:03 -0400
-+++ linux-2.6.7-new/arch/ia64/ia32/binfmt_elf32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c	2004-06-25 17:41:53 -0400
 @@ -41,6 +41,17 @@
  #undef SET_PERSONALITY
  #define SET_PERSONALITY(ex, ibcs2)	elf32_set_personality()
@@ -2016,9 +2016,9 @@ diff -urN linux-2.6.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.7-new/arch/ia64/ia
  /* Ugly but avoids duplication */
  #include "../../../fs/binfmt_elf.c"
  
-diff -urN linux-2.6.7/arch/ia64/ia32/ia32priv.h linux-2.6.7-new/arch/ia64/ia32/ia32priv.h
+diff -urN linux-2.6.7/arch/ia64/ia32/ia32priv.h linux-2.6.7/arch/ia64/ia32/ia32priv.h
 --- linux-2.6.7/arch/ia64/ia32/ia32priv.h	2004-06-16 01:20:19 -0400
-+++ linux-2.6.7-new/arch/ia64/ia32/ia32priv.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ia64/ia32/ia32priv.h	2004-06-25 17:41:53 -0400
 @@ -295,7 +295,14 @@
  #define ELF_ARCH	EM_386
  
@@ -2035,9 +2035,9 @@ diff -urN linux-2.6.7/arch/ia64/ia32/ia32priv.h linux-2.6.7-new/arch/ia64/ia32/i
  
  /*
   * The system segments (GDT, TSS, LDT) have to be mapped below 4GB so the IA-32 engine can
-diff -urN linux-2.6.7/arch/ia64/ia32/sys_ia32.c linux-2.6.7-new/arch/ia64/ia32/sys_ia32.c
+diff -urN linux-2.6.7/arch/ia64/ia32/sys_ia32.c linux-2.6.7/arch/ia64/ia32/sys_ia32.c
 --- linux-2.6.7/arch/ia64/ia32/sys_ia32.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/arch/ia64/ia32/sys_ia32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ia64/ia32/sys_ia32.c	2004-06-25 17:41:53 -0400
 @@ -433,6 +433,11 @@
  
  	flags = a.flags;
@@ -2062,9 +2062,9 @@ diff -urN linux-2.6.7/arch/ia64/ia32/sys_ia32.c linux-2.6.7-new/arch/ia64/ia32/s
  	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
  	if (!(flags & MAP_ANONYMOUS)) {
  		file = fget(fd);
-diff -urN linux-2.6.7/arch/ia64/kernel/ptrace.c linux-2.6.7-new/arch/ia64/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/ia64/kernel/ptrace.c linux-2.6.7/arch/ia64/kernel/ptrace.c
 --- linux-2.6.7/arch/ia64/kernel/ptrace.c	2004-06-16 01:20:25 -0400
-+++ linux-2.6.7-new/arch/ia64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/ia64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -17,6 +17,7 @@
  #include <linux/smp_lock.h>
  #include <linux/user.h>
@@ -2083,9 +2083,9 @@ diff -urN linux-2.6.7/arch/ia64/kernel/ptrace.c linux-2.6.7-new/arch/ia64/kernel
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out_tsk;
-diff -urN linux-2.6.7/arch/ia64/kernel/sys_ia64.c linux-2.6.7-new/arch/ia64/kernel/sys_ia64.c
+diff -urN linux-2.6.7/arch/ia64/kernel/sys_ia64.c linux-2.6.7/arch/ia64/kernel/sys_ia64.c
 --- linux-2.6.7/arch/ia64/kernel/sys_ia64.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/arch/ia64/kernel/sys_ia64.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ia64/kernel/sys_ia64.c	2004-06-25 17:41:53 -0400
 @@ -18,6 +18,7 @@
  #include <linux/syscalls.h>
  #include <linux/highuid.h>
@@ -2155,9 +2155,9 @@ diff -urN linux-2.6.7/arch/ia64/kernel/sys_ia64.c linux-2.6.7-new/arch/ia64/kern
  	down_write(&current->mm->mmap_sem);
  	addr = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
  	up_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/arch/ia64/mm/fault.c linux-2.6.7-new/arch/ia64/mm/fault.c
+diff -urN linux-2.6.7/arch/ia64/mm/fault.c linux-2.6.7/arch/ia64/mm/fault.c
 --- linux-2.6.7/arch/ia64/mm/fault.c	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/arch/ia64/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ia64/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -9,6 +9,7 @@
  #include <linux/mm.h>
  #include <linux/smp_lock.h>
@@ -2254,9 +2254,9 @@ diff -urN linux-2.6.7/arch/ia64/mm/fault.c linux-2.6.7-new/arch/ia64/mm/fault.c
    survive:
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.7-new/arch/mips/kernel/binfmt_elfn32.c
+diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c
 --- linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/arch/mips/kernel/binfmt_elfn32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c	2004-06-25 17:41:53 -0400
 @@ -50,6 +50,17 @@
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -2275,9 +2275,9 @@ diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.7-new/arch/mips
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/config.h>
-diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.7-new/arch/mips/kernel/binfmt_elfo32.c
+diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c
 --- linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/arch/mips/kernel/binfmt_elfo32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c	2004-06-25 17:41:53 -0400
 @@ -52,6 +52,17 @@
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -2296,9 +2296,9 @@ diff -urN linux-2.6.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.7-new/arch/mips
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/config.h>
-diff -urN linux-2.6.7/arch/mips/kernel/syscall.c linux-2.6.7-new/arch/mips/kernel/syscall.c
+diff -urN linux-2.6.7/arch/mips/kernel/syscall.c linux-2.6.7/arch/mips/kernel/syscall.c
 --- linux-2.6.7/arch/mips/kernel/syscall.c	2004-06-16 01:19:44 -0400
-+++ linux-2.6.7-new/arch/mips/kernel/syscall.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/mips/kernel/syscall.c	2004-06-25 17:41:53 -0400
 @@ -86,6 +86,11 @@
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -2325,9 +2325,9 @@ diff -urN linux-2.6.7/arch/mips/kernel/syscall.c linux-2.6.7-new/arch/mips/kerne
  	addr = TASK_UNMAPPED_BASE;
  	if (do_color_align)
  		addr = COLOUR_ALIGN(addr, pgoff);
-diff -urN linux-2.6.7/arch/mips/mm/fault.c linux-2.6.7-new/arch/mips/mm/fault.c
+diff -urN linux-2.6.7/arch/mips/mm/fault.c linux-2.6.7/arch/mips/mm/fault.c
 --- linux-2.6.7/arch/mips/mm/fault.c	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/arch/mips/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/mips/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -27,6 +27,24 @@
  #include <asm/uaccess.h>
  #include <asm/ptrace.h>
@@ -2353,9 +2353,9 @@ diff -urN linux-2.6.7/arch/mips/mm/fault.c linux-2.6.7-new/arch/mips/mm/fault.c
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urN linux-2.6.7/arch/parisc/kernel/ptrace.c linux-2.6.7-new/arch/parisc/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/parisc/kernel/ptrace.c linux-2.6.7/arch/parisc/kernel/ptrace.c
 --- linux-2.6.7/arch/parisc/kernel/ptrace.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/arch/parisc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/parisc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -17,6 +17,7 @@
  #include <linux/personality.h>
  #include <linux/security.h>
@@ -2374,9 +2374,9 @@ diff -urN linux-2.6.7/arch/parisc/kernel/ptrace.c linux-2.6.7-new/arch/parisc/ke
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out_tsk;
-diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc.c linux-2.6.7-new/arch/parisc/kernel/sys_parisc.c
+diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc.c linux-2.6.7/arch/parisc/kernel/sys_parisc.c
 --- linux-2.6.7/arch/parisc/kernel/sys_parisc.c	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/arch/parisc/kernel/sys_parisc.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/parisc/kernel/sys_parisc.c	2004-06-25 17:41:53 -0400
 @@ -31,6 +31,7 @@
  #include <linux/shm.h>
  #include <linux/smp_lock.h>
@@ -2423,9 +2423,9 @@ diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc.c linux-2.6.7-new/arch/paris
  	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
  
  	down_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc32.c linux-2.6.7-new/arch/parisc/kernel/sys_parisc32.c
+diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc32.c linux-2.6.7/arch/parisc/kernel/sys_parisc32.c
 --- linux-2.6.7/arch/parisc/kernel/sys_parisc32.c	2004-06-16 01:19:11 -0400
-+++ linux-2.6.7-new/arch/parisc/kernel/sys_parisc32.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/parisc/kernel/sys_parisc32.c	2004-06-25 14:07:21 -0400
 @@ -48,6 +48,7 @@
  #include <linux/ptrace.h>
  #include <linux/swap.h>
@@ -2434,9 +2434,9 @@ diff -urN linux-2.6.7/arch/parisc/kernel/sys_parisc32.c linux-2.6.7-new/arch/par
  
  #include <asm/types.h>
  #include <asm/uaccess.h>
-diff -urN linux-2.6.7/arch/parisc/kernel/traps.c linux-2.6.7-new/arch/parisc/kernel/traps.c
+diff -urN linux-2.6.7/arch/parisc/kernel/traps.c linux-2.6.7/arch/parisc/kernel/traps.c
 --- linux-2.6.7/arch/parisc/kernel/traps.c	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/arch/parisc/kernel/traps.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/parisc/kernel/traps.c	2004-06-25 17:41:53 -0400
 @@ -656,9 +656,7 @@
  
  			down_read(&current->mm->mmap_sem);
@@ -2448,9 +2448,9 @@ diff -urN linux-2.6.7/arch/parisc/kernel/traps.c linux-2.6.7-new/arch/parisc/ker
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urN linux-2.6.7/arch/parisc/mm/fault.c linux-2.6.7-new/arch/parisc/mm/fault.c
+diff -urN linux-2.6.7/arch/parisc/mm/fault.c linux-2.6.7/arch/parisc/mm/fault.c
 --- linux-2.6.7/arch/parisc/mm/fault.c	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/arch/parisc/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/parisc/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -16,6 +16,8 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -2649,9 +2649,9 @@ diff -urN linux-2.6.7/arch/parisc/mm/fault.c linux-2.6.7-new/arch/parisc/mm/faul
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urN linux-2.6.7/arch/ppc/kernel/ptrace.c linux-2.6.7-new/arch/ppc/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/ppc/kernel/ptrace.c linux-2.6.7/arch/ppc/kernel/ptrace.c
 --- linux-2.6.7/arch/ppc/kernel/ptrace.c	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/arch/ppc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/ppc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -26,6 +26,7 @@
  #include <linux/ptrace.h>
  #include <linux/user.h>
@@ -2670,9 +2670,9 @@ diff -urN linux-2.6.7/arch/ppc/kernel/ptrace.c linux-2.6.7-new/arch/ppc/kernel/p
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out_tsk;
-diff -urN linux-2.6.7/arch/ppc/kernel/syscalls.c linux-2.6.7-new/arch/ppc/kernel/syscalls.c
+diff -urN linux-2.6.7/arch/ppc/kernel/syscalls.c linux-2.6.7/arch/ppc/kernel/syscalls.c
 --- linux-2.6.7/arch/ppc/kernel/syscalls.c	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/arch/ppc/kernel/syscalls.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ppc/kernel/syscalls.c	2004-06-25 17:41:53 -0400
 @@ -36,6 +36,7 @@
  #include <linux/utsname.h>
  #include <linux/file.h>
@@ -2705,9 +2705,9 @@ diff -urN linux-2.6.7/arch/ppc/kernel/syscalls.c linux-2.6.7-new/arch/ppc/kernel
  	down_write(&current->mm->mmap_sem);
  	ret = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
  	up_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/arch/ppc/mm/fault.c linux-2.6.7-new/arch/ppc/mm/fault.c
+diff -urN linux-2.6.7/arch/ppc/mm/fault.c linux-2.6.7/arch/ppc/mm/fault.c
 --- linux-2.6.7/arch/ppc/mm/fault.c	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/arch/ppc/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ppc/mm/fault.c	2004-06-30 13:03:30 -0400
 @@ -28,6 +28,11 @@
  #include <linux/interrupt.h>
  #include <linux/highmem.h>
@@ -3158,9 +3158,9 @@ diff -urN linux-2.6.7/arch/ppc/mm/fault.c linux-2.6.7-new/arch/ppc/mm/fault.c
  		info.si_signo = SIGSEGV;
  		info.si_errno = 0;
  		info.si_code = code;
-diff -urN linux-2.6.7/arch/ppc64/kernel/syscalls.c linux-2.6.7-new/arch/ppc64/kernel/syscalls.c
+diff -urN linux-2.6.7/arch/ppc64/kernel/syscalls.c linux-2.6.7/arch/ppc64/kernel/syscalls.c
 --- linux-2.6.7/arch/ppc64/kernel/syscalls.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/arch/ppc64/kernel/syscalls.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ppc64/kernel/syscalls.c	2004-06-25 17:41:53 -0400
 @@ -177,6 +177,11 @@
  	struct file * file = NULL;
  	unsigned long ret = -EBADF;
@@ -3173,9 +3173,9 @@ diff -urN linux-2.6.7/arch/ppc64/kernel/syscalls.c linux-2.6.7-new/arch/ppc64/ke
  	if (!(flags & MAP_ANONYMOUS)) {
  		if (!(file = fget(fd)))
  			goto out;
-diff -urN linux-2.6.7/arch/ppc64/mm/fault.c linux-2.6.7-new/arch/ppc64/mm/fault.c
+diff -urN linux-2.6.7/arch/ppc64/mm/fault.c linux-2.6.7/arch/ppc64/mm/fault.c
 --- linux-2.6.7/arch/ppc64/mm/fault.c	2004-06-16 01:19:44 -0400
-+++ linux-2.6.7-new/arch/ppc64/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/ppc64/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -29,6 +29,7 @@
  #include <linux/interrupt.h>
  #include <linux/smp_lock.h>
@@ -3265,9 +3265,9 @@ diff -urN linux-2.6.7/arch/ppc64/mm/fault.c linux-2.6.7-new/arch/ppc64/mm/fault.
  		info.si_signo = SIGSEGV;
  		info.si_errno = 0;
  		info.si_code = code;
-diff -urN linux-2.6.7/arch/sparc/kernel/ptrace.c linux-2.6.7-new/arch/sparc/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/sparc/kernel/ptrace.c linux-2.6.7/arch/sparc/kernel/ptrace.c
 --- linux-2.6.7/arch/sparc/kernel/ptrace.c	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/arch/sparc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/sparc/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -18,6 +18,7 @@
  #include <linux/smp.h>
  #include <linux/smp_lock.h>
@@ -3288,9 +3288,9 @@ diff -urN linux-2.6.7/arch/sparc/kernel/ptrace.c linux-2.6.7-new/arch/sparc/kern
  	if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
  	    || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
  		if (ptrace_attach(child)) {
-diff -urN linux-2.6.7/arch/sparc/kernel/sys_sparc.c linux-2.6.7-new/arch/sparc/kernel/sys_sparc.c
+diff -urN linux-2.6.7/arch/sparc/kernel/sys_sparc.c linux-2.6.7/arch/sparc/kernel/sys_sparc.c
 --- linux-2.6.7/arch/sparc/kernel/sys_sparc.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/arch/sparc/kernel/sys_sparc.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc/kernel/sys_sparc.c	2004-06-25 17:41:53 -0400
 @@ -21,6 +21,7 @@
  #include <linux/utsname.h>
  #include <linux/smp.h>
@@ -3338,9 +3338,9 @@ diff -urN linux-2.6.7/arch/sparc/kernel/sys_sparc.c linux-2.6.7-new/arch/sparc/k
  	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
  
  	down_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/arch/sparc/kernel/sys_sunos.c linux-2.6.7-new/arch/sparc/kernel/sys_sunos.c
+diff -urN linux-2.6.7/arch/sparc/kernel/sys_sunos.c linux-2.6.7/arch/sparc/kernel/sys_sunos.c
 --- linux-2.6.7/arch/sparc/kernel/sys_sunos.c	2004-06-16 01:19:17 -0400
-+++ linux-2.6.7-new/arch/sparc/kernel/sys_sunos.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc/kernel/sys_sunos.c	2004-06-25 17:41:53 -0400
 @@ -71,6 +71,11 @@
  	struct file * file = NULL;
  	unsigned long retval, ret_type;
@@ -3353,9 +3353,9 @@ diff -urN linux-2.6.7/arch/sparc/kernel/sys_sunos.c linux-2.6.7-new/arch/sparc/k
  	if (flags & MAP_NORESERVE) {
  		static int cnt;
  		if (cnt++ < 10)
-diff -urN linux-2.6.7/arch/sparc/mm/fault.c linux-2.6.7-new/arch/sparc/mm/fault.c
+diff -urN linux-2.6.7/arch/sparc/mm/fault.c linux-2.6.7/arch/sparc/mm/fault.c
 --- linux-2.6.7/arch/sparc/mm/fault.c	2004-06-16 01:19:11 -0400
-+++ linux-2.6.7-new/arch/sparc/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -21,6 +21,10 @@
  #include <linux/smp_lock.h>
  #include <linux/interrupt.h>
@@ -3667,9 +3667,9 @@ diff -urN linux-2.6.7/arch/sparc/mm/fault.c linux-2.6.7-new/arch/sparc/mm/fault.
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urN linux-2.6.7/arch/sparc/mm/init.c linux-2.6.7-new/arch/sparc/mm/init.c
+diff -urN linux-2.6.7/arch/sparc/mm/init.c linux-2.6.7/arch/sparc/mm/init.c
 --- linux-2.6.7/arch/sparc/mm/init.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/arch/sparc/mm/init.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc/mm/init.c	2004-06-25 17:41:53 -0400
 @@ -337,17 +337,17 @@
  
  	/* Initialize the protection map with non-constant, MMU dependent values. */
@@ -3694,9 +3694,9 @@ diff -urN linux-2.6.7/arch/sparc/mm/init.c linux-2.6.7-new/arch/sparc/mm/init.c
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urN linux-2.6.7/arch/sparc/mm/srmmu.c linux-2.6.7-new/arch/sparc/mm/srmmu.c
+diff -urN linux-2.6.7/arch/sparc/mm/srmmu.c linux-2.6.7/arch/sparc/mm/srmmu.c
 --- linux-2.6.7/arch/sparc/mm/srmmu.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/arch/sparc/mm/srmmu.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc/mm/srmmu.c	2004-06-25 17:41:53 -0400
 @@ -2149,6 +2149,13 @@
  	BTFIXUPSET_INT(page_shared, pgprot_val(SRMMU_PAGE_SHARED));
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -3711,9 +3711,9 @@ diff -urN linux-2.6.7/arch/sparc/mm/srmmu.c linux-2.6.7-new/arch/sparc/mm/srmmu.
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  	pg_iobits = SRMMU_VALID | SRMMU_WRITE | SRMMU_REF;
-diff -urN linux-2.6.7/arch/sparc64/kernel/itlb_base.S linux-2.6.7-new/arch/sparc64/kernel/itlb_base.S
+diff -urN linux-2.6.7/arch/sparc64/kernel/itlb_base.S linux-2.6.7/arch/sparc64/kernel/itlb_base.S
 --- linux-2.6.7/arch/sparc64/kernel/itlb_base.S	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/arch/sparc64/kernel/itlb_base.S	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc64/kernel/itlb_base.S	2004-06-25 17:41:53 -0400
 @@ -41,7 +41,9 @@
  	CREATE_VPTE_OFFSET2(%g4, %g6)			! Create VPTE offset
  	ldxa		[%g3 + %g6] ASI_P, %g5		! Load VPTE
@@ -3734,9 +3734,9 @@ diff -urN linux-2.6.7/arch/sparc64/kernel/itlb_base.S linux-2.6.7-new/arch/sparc
  	CREATE_VPTE_NOP
  
  #undef CREATE_VPTE_OFFSET1
-diff -urN linux-2.6.7/arch/sparc64/kernel/ptrace.c linux-2.6.7-new/arch/sparc64/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/sparc64/kernel/ptrace.c linux-2.6.7/arch/sparc64/kernel/ptrace.c
 --- linux-2.6.7/arch/sparc64/kernel/ptrace.c	2004-06-16 01:20:18 -0400
-+++ linux-2.6.7-new/arch/sparc64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/sparc64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -19,6 +19,7 @@
  #include <linux/smp.h>
  #include <linux/smp_lock.h>
@@ -3757,9 +3757,9 @@ diff -urN linux-2.6.7/arch/sparc64/kernel/ptrace.c linux-2.6.7-new/arch/sparc64/
  	if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
  	    || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
  		if (ptrace_attach(child)) {
-diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc.c linux-2.6.7-new/arch/sparc64/kernel/sys_sparc.c
+diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc.c linux-2.6.7/arch/sparc64/kernel/sys_sparc.c
 --- linux-2.6.7/arch/sparc64/kernel/sys_sparc.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/arch/sparc64/kernel/sys_sparc.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc64/kernel/sys_sparc.c	2004-06-25 17:41:53 -0400
 @@ -25,6 +25,7 @@
  #include <linux/syscalls.h>
  #include <linux/ipc.h>
@@ -3824,9 +3824,9 @@ diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc.c linux-2.6.7-new/arch/sparc
  	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
  	len = PAGE_ALIGN(len);
  	retval = -EINVAL;
-diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c linux-2.6.7-new/arch/sparc64/kernel/sys_sparc32.c
+diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c
 --- linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/arch/sparc64/kernel/sys_sparc32.c	2004-06-25 14:21:03 -0400
++++ linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c	2004-06-25 14:21:03 -0400
 @@ -54,6 +54,7 @@
  #include <linux/netfilter_ipv4/ip_tables.h>
  #include <linux/ptrace.h>
@@ -3835,9 +3835,9 @@ diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sparc32.c linux-2.6.7-new/arch/spa
  
  #include <asm/types.h>
  #include <asm/ipc.h>
-diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c linux-2.6.7-new/arch/sparc64/kernel/sys_sunos32.c
+diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c
 --- linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/arch/sparc64/kernel/sys_sunos32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c	2004-06-25 17:41:53 -0400
 @@ -66,6 +66,11 @@
  	struct file *file = NULL;
  	unsigned long retval, ret_type;
@@ -3850,9 +3850,9 @@ diff -urN linux-2.6.7/arch/sparc64/kernel/sys_sunos32.c linux-2.6.7-new/arch/spa
  	if (flags & MAP_NORESERVE) {
  		static int cnt;
  		if (cnt++ < 10)
-diff -urN linux-2.6.7/arch/sparc64/mm/fault.c linux-2.6.7-new/arch/sparc64/mm/fault.c
+diff -urN linux-2.6.7/arch/sparc64/mm/fault.c linux-2.6.7/arch/sparc64/mm/fault.c
 --- linux-2.6.7/arch/sparc64/mm/fault.c	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/arch/sparc64/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc64/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -18,6 +18,10 @@
  #include <linux/smp_lock.h>
  #include <linux/init.h>
@@ -4273,9 +4273,9 @@ diff -urN linux-2.6.7/arch/sparc64/mm/fault.c linux-2.6.7-new/arch/sparc64/mm/fa
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urN linux-2.6.7/arch/sparc64/solaris/misc.c linux-2.6.7-new/arch/sparc64/solaris/misc.c
+diff -urN linux-2.6.7/arch/sparc64/solaris/misc.c linux-2.6.7/arch/sparc64/solaris/misc.c
 --- linux-2.6.7/arch/sparc64/solaris/misc.c	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/arch/sparc64/solaris/misc.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/sparc64/solaris/misc.c	2004-06-25 17:41:53 -0400
 @@ -56,6 +56,11 @@
  	struct file *file = NULL;
  	unsigned long retval, ret_type;
@@ -4288,9 +4288,9 @@ diff -urN linux-2.6.7/arch/sparc64/solaris/misc.c linux-2.6.7-new/arch/sparc64/s
  	/* Do we need it here? */
  	set_personality(PER_SVR4);
  	if (flags & MAP_NORESERVE) {
-diff -urN linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.7-new/arch/x86_64/ia32/ia32_binfmt.c
+diff -urN linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c
 --- linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c	2004-06-16 01:18:55 -0400
-+++ linux-2.6.7-new/arch/x86_64/ia32/ia32_binfmt.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c	2004-06-25 17:41:53 -0400
 @@ -185,6 +185,17 @@
  //#include <asm/ia32.h>
  #include <linux/elf.h>
@@ -4323,9 +4323,9 @@ diff -urN linux-2.6.7/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.7-new/arch/x86_64
   		mpnt->vm_page_prot = (mpnt->vm_flags & VM_EXEC) ? 
   			PAGE_COPY_EXEC : PAGE_COPY;
  		insert_vm_struct(mm, mpnt);
-diff -urN linux-2.6.7/arch/x86_64/ia32/sys_ia32.c linux-2.6.7-new/arch/x86_64/ia32/sys_ia32.c
+diff -urN linux-2.6.7/arch/x86_64/ia32/sys_ia32.c linux-2.6.7/arch/x86_64/ia32/sys_ia32.c
 --- linux-2.6.7/arch/x86_64/ia32/sys_ia32.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/arch/x86_64/ia32/sys_ia32.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/x86_64/ia32/sys_ia32.c	2004-06-25 17:41:53 -0400
 @@ -212,6 +212,11 @@
  	if (a.offset & ~PAGE_MASK)
  		return -EINVAL; 
@@ -4350,9 +4350,9 @@ diff -urN linux-2.6.7/arch/x86_64/ia32/sys_ia32.c linux-2.6.7-new/arch/x86_64/ia
  	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
  	if (!(flags & MAP_ANONYMOUS)) {
  		file = fget(fd);
-diff -urN linux-2.6.7/arch/x86_64/kernel/ptrace.c linux-2.6.7-new/arch/x86_64/kernel/ptrace.c
+diff -urN linux-2.6.7/arch/x86_64/kernel/ptrace.c linux-2.6.7/arch/x86_64/kernel/ptrace.c
 --- linux-2.6.7/arch/x86_64/kernel/ptrace.c	2004-06-16 01:19:09 -0400
-+++ linux-2.6.7-new/arch/x86_64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/arch/x86_64/kernel/ptrace.c	2004-06-25 14:07:21 -0400
 @@ -213,6 +213,9 @@
  	if (pid == 1)		/* you may not mess with init */
  		goto out_tsk;
@@ -4363,9 +4363,9 @@ diff -urN linux-2.6.7/arch/x86_64/kernel/ptrace.c linux-2.6.7-new/arch/x86_64/ke
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out_tsk;
-diff -urN linux-2.6.7/arch/x86_64/kernel/setup64.c linux-2.6.7-new/arch/x86_64/kernel/setup64.c
+diff -urN linux-2.6.7/arch/x86_64/kernel/setup64.c linux-2.6.7/arch/x86_64/kernel/setup64.c
 --- linux-2.6.7/arch/x86_64/kernel/setup64.c	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/arch/x86_64/kernel/setup64.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/x86_64/kernel/setup64.c	2004-06-25 17:41:53 -0400
 @@ -43,8 +43,15 @@
  
  unsigned long __supported_pte_mask = ~0UL;
@@ -4382,9 +4382,9 @@ diff -urN linux-2.6.7/arch/x86_64/kernel/setup64.c linux-2.6.7-new/arch/x86_64/k
  unsigned long vm_data_default_flags = __VM_DATA_DEFAULT_FLAGS; 
  unsigned long vm_data_default_flags32 = __VM_DATA_DEFAULT_FLAGS; 
  unsigned long vm_force_exec32 = PROT_EXEC; 
-diff -urN linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c linux-2.6.7-new/arch/x86_64/kernel/sys_x86_64.c
+diff -urN linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c
 --- linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/arch/x86_64/kernel/sys_x86_64.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c	2004-06-25 17:41:53 -0400
 @@ -48,6 +48,11 @@
  	if (off & ~PAGE_MASK)
  		goto out;
@@ -4413,9 +4413,9 @@ diff -urN linux-2.6.7/arch/x86_64/kernel/sys_x86_64.c linux-2.6.7-new/arch/x86_6
  	if (len > end)
  		return -ENOMEM;
  
-diff -urN linux-2.6.7/arch/x86_64/mm/fault.c linux-2.6.7-new/arch/x86_64/mm/fault.c
+diff -urN linux-2.6.7/arch/x86_64/mm/fault.c linux-2.6.7/arch/x86_64/mm/fault.c
 --- linux-2.6.7/arch/x86_64/mm/fault.c	2004-06-16 01:18:52 -0400
-+++ linux-2.6.7-new/arch/x86_64/mm/fault.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/arch/x86_64/mm/fault.c	2004-06-25 17:41:53 -0400
 @@ -23,6 +23,7 @@
  #include <linux/vt_kern.h>		/* For unblank_screen() */
  #include <linux/compiler.h>
@@ -4512,9 +4512,9 @@ diff -urN linux-2.6.7/arch/x86_64/mm/fault.c linux-2.6.7-new/arch/x86_64/mm/faul
  	info.si_code = SEGV_ACCERR;
  	write = 0;
  	switch (error_code & 3) {
-diff -urN linux-2.6.7/drivers/char/keyboard.c linux-2.6.7-new/drivers/char/keyboard.c
+diff -urN linux-2.6.7/drivers/char/keyboard.c linux-2.6.7/drivers/char/keyboard.c
 --- linux-2.6.7/drivers/char/keyboard.c	2004-06-16 01:20:27 -0400
-+++ linux-2.6.7-new/drivers/char/keyboard.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/drivers/char/keyboard.c	2004-06-25 14:07:21 -0400
 @@ -606,6 +606,16 @@
  	     kbd->kbdmode == VC_MEDIUMRAW) && 
  	     value != KVAL(K_SAK))
@@ -4532,9 +4532,9 @@ diff -urN linux-2.6.7/drivers/char/keyboard.c linux-2.6.7-new/drivers/char/keybo
  	fn_handler[value](vc, regs);
  }
  
-diff -urN linux-2.6.7/drivers/char/mem.c linux-2.6.7-new/drivers/char/mem.c
+diff -urN linux-2.6.7/drivers/char/mem.c linux-2.6.7/drivers/char/mem.c
 --- linux-2.6.7/drivers/char/mem.c	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/drivers/char/mem.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/drivers/char/mem.c	2004-06-30 12:55:14 -0400
 @@ -23,6 +23,7 @@
  #include <linux/devfs_fs_kernel.h>
  #include <linux/ptrace.h>
@@ -4641,31 +4641,31 @@ diff -urN linux-2.6.7/drivers/char/mem.c linux-2.6.7-new/drivers/char/mem.c
  #define open_kmem	open_mem
  
  static struct file_operations mem_fops = {
-@@ -679,6 +725,11 @@
- 		case 9:
- 			filp->f_op = &urandom_fops;
+@@ -682,6 +728,11 @@
+ 		case 11:
+ 			filp->f_op = &kmsg_fops;
  			break;
 +#ifdef CONFIG_GRKERNSEC
-+		case 10:
++		case 12:
 +			filp->f_op = &grsec_fops;
 +			break;
 +#endif
- 		case 11:
- 			filp->f_op = &kmsg_fops;
- 			break;
-@@ -710,6 +761,9 @@
- 	{7, "full",    S_IRUGO | S_IWUGO,           &full_fops},
+ 		default:
+ 			return -ENXIO;
+ 	}
+@@ -711,6 +762,9 @@
  	{8, "random",  S_IRUGO | S_IWUSR,           &random_fops},
  	{9, "urandom", S_IRUGO | S_IWUSR,           &urandom_fops},
+ 	{11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
 +#ifdef CONFIG_GRKERNSEC
-+	{10,"grsec",   S_IRUSR | S_IWUGO,	    &grsec_fops},
++	{12,"grsec",   S_IRUSR | S_IWUGO,	    &grsec_fops},
 +#endif
- 	{11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
  };
  
-diff -urN linux-2.6.7/drivers/char/random.c linux-2.6.7-new/drivers/char/random.c
+ static struct class_simple *mem_class;
+diff -urN linux-2.6.7/drivers/char/random.c linux-2.6.7/drivers/char/random.c
 --- linux-2.6.7/drivers/char/random.c	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/drivers/char/random.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/drivers/char/random.c	2004-06-25 17:41:53 -0400
 @@ -263,9 +263,15 @@
  /*
   * Configuration information
@@ -4738,9 +4738,9 @@ diff -urN linux-2.6.7/drivers/char/random.c linux-2.6.7-new/drivers/char/random.
 +	return *(unsigned long *)secret;
 +}
 +#endif
-diff -urN linux-2.6.7/drivers/char/vt_ioctl.c linux-2.6.7-new/drivers/char/vt_ioctl.c
+diff -urN linux-2.6.7/drivers/char/vt_ioctl.c linux-2.6.7/drivers/char/vt_ioctl.c
 --- linux-2.6.7/drivers/char/vt_ioctl.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/drivers/char/vt_ioctl.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/drivers/char/vt_ioctl.c	2004-06-25 14:07:21 -0400
 @@ -96,6 +96,12 @@
  	case KDSKBENT:
  		if (!perm)
@@ -4768,9 +4768,9 @@ diff -urN linux-2.6.7/drivers/char/vt_ioctl.c linux-2.6.7-new/drivers/char/vt_io
  		q = func_table[i];
  		first_free = funcbufptr + (funcbufsize - funcbufleft);
  		for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-diff -urN linux-2.6.7/drivers/pci/proc.c linux-2.6.7-new/drivers/pci/proc.c
+diff -urN linux-2.6.7/drivers/pci/proc.c linux-2.6.7/drivers/pci/proc.c
 --- linux-2.6.7/drivers/pci/proc.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/drivers/pci/proc.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/drivers/pci/proc.c	2004-06-25 14:07:21 -0400
 @@ -565,7 +565,15 @@
  
  static void legacy_proc_init(void)
@@ -4803,9 +4803,9 @@ diff -urN linux-2.6.7/drivers/pci/proc.c linux-2.6.7-new/drivers/pci/proc.c
  	entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
  	if (entry)
  		entry->proc_fops = &proc_bus_pci_dev_operations;
-diff -urN linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.7-new/drivers/pnp/pnpbios/bioscalls.c
+diff -urN linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c
 --- linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/drivers/pnp/pnpbios/bioscalls.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c	2004-06-25 17:41:53 -0400
 @@ -79,7 +79,7 @@
  set_limit(cpu_gdt_table[cpu][(selname) >> 3], size); \
  } while(0)
@@ -4862,9 +4862,9 @@ diff -urN linux-2.6.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.7-new/drivers/pn
  	put_cpu();
  
  	/* If we get here and this is set then the PnP BIOS faulted on us. */
-diff -urN linux-2.6.7/drivers/scsi/scsi_devinfo.c linux-2.6.7-new/drivers/scsi/scsi_devinfo.c
+diff -urN linux-2.6.7/drivers/scsi/scsi_devinfo.c linux-2.6.7/drivers/scsi/scsi_devinfo.c
 --- linux-2.6.7/drivers/scsi/scsi_devinfo.c	2004-06-16 01:19:11 -0400
-+++ linux-2.6.7-new/drivers/scsi/scsi_devinfo.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/drivers/scsi/scsi_devinfo.c	2004-06-25 17:41:53 -0400
 @@ -27,7 +27,7 @@
  static const char spaces[] = "                "; /* 16 of them */
  static unsigned scsi_default_dev_flags;
@@ -4874,9 +4874,9 @@ diff -urN linux-2.6.7/drivers/scsi/scsi_devinfo.c linux-2.6.7-new/drivers/scsi/s
  
  /*
   * scsi_static_device_list: deprecated list of devices that require
-diff -urN linux-2.6.7/drivers/video/vesafb.c linux-2.6.7-new/drivers/video/vesafb.c
+diff -urN linux-2.6.7/drivers/video/vesafb.c linux-2.6.7/drivers/video/vesafb.c
 --- linux-2.6.7/drivers/video/vesafb.c	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/drivers/video/vesafb.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/drivers/video/vesafb.c	2004-06-25 17:41:53 -0400
 @@ -250,7 +250,7 @@
  	if (vesafb_fix.smem_len > 16 * 1024 * 1024)
  		vesafb_fix.smem_len = 16 * 1024 * 1024;
@@ -4886,9 +4886,9 @@ diff -urN linux-2.6.7/drivers/video/vesafb.c linux-2.6.7-new/drivers/video/vesaf
  	screen_info.vesapm_seg = 0;
  #endif
  
-diff -urN linux-2.6.7/fs/Kconfig linux-2.6.7-new/fs/Kconfig
+diff -urN linux-2.6.7/fs/Kconfig linux-2.6.7/fs/Kconfig
 --- linux-2.6.7/fs/Kconfig	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/fs/Kconfig	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/Kconfig	2004-06-25 14:07:21 -0400
 @@ -815,6 +815,7 @@
  
  config PROC_KCORE
@@ -4897,9 +4897,9 @@ diff -urN linux-2.6.7/fs/Kconfig linux-2.6.7-new/fs/Kconfig
  	default y if !ARM
  
  config SYSFS
-diff -urN linux-2.6.7/fs/binfmt_aout.c linux-2.6.7-new/fs/binfmt_aout.c
+diff -urN linux-2.6.7/fs/binfmt_aout.c linux-2.6.7/fs/binfmt_aout.c
 --- linux-2.6.7/fs/binfmt_aout.c	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/fs/binfmt_aout.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/fs/binfmt_aout.c	2004-06-25 17:41:53 -0400
 @@ -24,6 +24,7 @@
  #include <linux/binfmts.h>
  #include <linux/personality.h>
@@ -4986,9 +4986,9 @@ diff -urN linux-2.6.7/fs/binfmt_aout.c linux-2.6.7-new/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/fs/binfmt_elf.c linux-2.6.7-new/fs/binfmt_elf.c
+diff -urN linux-2.6.7/fs/binfmt_elf.c linux-2.6.7/fs/binfmt_elf.c
 --- linux-2.6.7/fs/binfmt_elf.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/fs/binfmt_elf.c	2004-06-25 17:44:19 -0400
++++ linux-2.6.7/fs/binfmt_elf.c	2004-06-25 17:44:19 -0400
 @@ -37,11 +37,17 @@
  #include <linux/pagemap.h>
  #include <linux/security.h>
@@ -5550,9 +5550,9 @@ diff -urN linux-2.6.7/fs/binfmt_elf.c linux-2.6.7-new/fs/binfmt_elf.c
  #define DUMP_SEEK(off)	\
  	if (!dump_seek(file, (off))) \
  		goto end_coredump;
-diff -urN linux-2.6.7/fs/binfmt_flat.c linux-2.6.7-new/fs/binfmt_flat.c
+diff -urN linux-2.6.7/fs/binfmt_flat.c linux-2.6.7/fs/binfmt_flat.c
 --- linux-2.6.7/fs/binfmt_flat.c	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/fs/binfmt_flat.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/fs/binfmt_flat.c	2004-06-25 17:41:53 -0400
 @@ -541,7 +541,9 @@
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -5585,9 +5585,9 @@ diff -urN linux-2.6.7/fs/binfmt_flat.c linux-2.6.7-new/fs/binfmt_flat.c
  			return result;
  		}
  	}
-diff -urN linux-2.6.7/fs/binfmt_misc.c linux-2.6.7-new/fs/binfmt_misc.c
+diff -urN linux-2.6.7/fs/binfmt_misc.c linux-2.6.7/fs/binfmt_misc.c
 --- linux-2.6.7/fs/binfmt_misc.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/fs/binfmt_misc.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/fs/binfmt_misc.c	2004-06-25 17:41:53 -0400
 @@ -108,9 +108,11 @@
  	int retval;
  
@@ -5601,9 +5601,9 @@ diff -urN linux-2.6.7/fs/binfmt_misc.c linux-2.6.7-new/fs/binfmt_misc.c
  	/* to keep locking time low, we copy the interpreter string */
  	read_lock(&entries_lock);
  	fmt = check_file(bprm);
-diff -urN linux-2.6.7/fs/buffer.c linux-2.6.7-new/fs/buffer.c
+diff -urN linux-2.6.7/fs/buffer.c linux-2.6.7/fs/buffer.c
 --- linux-2.6.7/fs/buffer.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/fs/buffer.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/buffer.c	2004-06-25 14:07:21 -0400
 @@ -37,6 +37,7 @@
  #include <linux/bio.h>
  #include <linux/notifier.h>
@@ -5622,9 +5622,9 @@ diff -urN linux-2.6.7/fs/buffer.c linux-2.6.7-new/fs/buffer.c
          limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
  	if (limit != RLIM_INFINITY && size > (loff_t)limit) {
  		send_sig(SIGXFSZ, current, 0);
-diff -urN linux-2.6.7/fs/compat.c linux-2.6.7-new/fs/compat.c
+diff -urN linux-2.6.7/fs/compat.c linux-2.6.7/fs/compat.c
 --- linux-2.6.7/fs/compat.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/fs/compat.c	2004-06-28 10:44:33 -0400
++++ linux-2.6.7/fs/compat.c	2004-06-28 10:44:33 -0400
 @@ -40,6 +40,7 @@
  #include <linux/nfsd/nfsd.h>
  #include <linux/nfsd/syscall.h>
@@ -5716,9 +5716,9 @@ diff -urN linux-2.6.7/fs/compat.c linux-2.6.7-new/fs/compat.c
  out:
  	/* Something went wrong, return the inode and free the argument pages*/
  	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -urN linux-2.6.7/fs/dcache.c linux-2.6.7-new/fs/dcache.c
+diff -urN linux-2.6.7/fs/dcache.c linux-2.6.7/fs/dcache.c
 --- linux-2.6.7/fs/dcache.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/fs/dcache.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/dcache.c	2004-06-25 14:07:21 -0400
 @@ -1275,7 +1275,7 @@
   *
   * "buflen" should be positive. Caller holds the dcache_lock.
@@ -5728,9 +5728,9 @@ diff -urN linux-2.6.7/fs/dcache.c linux-2.6.7-new/fs/dcache.c
  			struct dentry *root, struct vfsmount *rootmnt,
  			char *buffer, int buflen)
  {
-diff -urN linux-2.6.7/fs/exec.c linux-2.6.7-new/fs/exec.c
+diff -urN linux-2.6.7/fs/exec.c linux-2.6.7/fs/exec.c
 --- linux-2.6.7/fs/exec.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/fs/exec.c	2004-06-28 11:21:18 -0400
++++ linux-2.6.7/fs/exec.c	2004-06-28 11:21:18 -0400
 @@ -46,6 +46,8 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -6178,9 +6178,9 @@ diff -urN linux-2.6.7/fs/exec.c linux-2.6.7-new/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-diff -urN linux-2.6.7/fs/fcntl.c linux-2.6.7-new/fs/fcntl.c
+diff -urN linux-2.6.7/fs/fcntl.c linux-2.6.7/fs/fcntl.c
 --- linux-2.6.7/fs/fcntl.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/fs/fcntl.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/fcntl.c	2004-06-25 14:07:21 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/security.h>
@@ -6236,9 +6236,9 @@ diff -urN linux-2.6.7/fs/fcntl.c linux-2.6.7-new/fs/fcntl.c
  		}
  	}
  	read_unlock(&tasklist_lock);
-diff -urN linux-2.6.7/fs/namei.c linux-2.6.7-new/fs/namei.c
+diff -urN linux-2.6.7/fs/namei.c linux-2.6.7/fs/namei.c
 --- linux-2.6.7/fs/namei.c	2004-06-16 01:19:12 -0400
-+++ linux-2.6.7-new/fs/namei.c	2004-06-25 17:29:01 -0400
++++ linux-2.6.7/fs/namei.c	2004-06-25 17:29:01 -0400
 @@ -27,6 +27,7 @@
  #include <linux/security.h>
  #include <linux/mount.h>
@@ -6541,9 +6541,9 @@ diff -urN linux-2.6.7/fs/namei.c linux-2.6.7-new/fs/namei.c
  exit5:
  	dput(new_dentry);
  exit4:
-diff -urN linux-2.6.7/fs/namespace.c linux-2.6.7-new/fs/namespace.c
+diff -urN linux-2.6.7/fs/namespace.c linux-2.6.7/fs/namespace.c
 --- linux-2.6.7/fs/namespace.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/fs/namespace.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/namespace.c	2004-06-25 14:07:21 -0400
 @@ -21,6 +21,8 @@
  #include <linux/namei.h>
  #include <linux/security.h>
@@ -6604,9 +6604,9 @@ diff -urN linux-2.6.7/fs/namespace.c linux-2.6.7-new/fs/namespace.c
  	lock_kernel();
  
  	error = __user_walk(new_root, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
-diff -urN linux-2.6.7/fs/open.c linux-2.6.7-new/fs/open.c
+diff -urN linux-2.6.7/fs/open.c linux-2.6.7/fs/open.c
 --- linux-2.6.7/fs/open.c	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/fs/open.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/open.c	2004-06-25 14:07:21 -0400
 @@ -22,6 +22,7 @@
  #include <asm/uaccess.h>
  #include <linux/fs.h>
@@ -6831,9 +6831,9 @@ diff -urN linux-2.6.7/fs/open.c linux-2.6.7-new/fs/open.c
  	if (fd >= current->rlim[RLIMIT_NOFILE].rlim_cur)
  		goto out;
  
-diff -urN linux-2.6.7/fs/proc/array.c linux-2.6.7-new/fs/proc/array.c
+diff -urN linux-2.6.7/fs/proc/array.c linux-2.6.7/fs/proc/array.c
 --- linux-2.6.7/fs/proc/array.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/fs/proc/array.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/fs/proc/array.c	2004-06-25 17:41:53 -0400
 @@ -274,6 +274,19 @@
  			    cap_t(p->cap_effective));
  }
@@ -6926,9 +6926,9 @@ diff -urN linux-2.6.7/fs/proc/array.c linux-2.6.7-new/fs/proc/array.c
 +}
 +#endif
 +
-diff -urN linux-2.6.7/fs/proc/base.c linux-2.6.7-new/fs/proc/base.c
+diff -urN linux-2.6.7/fs/proc/base.c linux-2.6.7/fs/proc/base.c
 --- linux-2.6.7/fs/proc/base.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/fs/proc/base.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/proc/base.c	2004-06-25 14:07:21 -0400
 @@ -32,6 +32,7 @@
  #include <linux/mount.h>
  #include <linux/security.h>
@@ -7119,9 +7119,9 @@ diff -urN linux-2.6.7/fs/proc/base.c linux-2.6.7-new/fs/proc/base.c
  		if (--index >= 0)
  			continue;
  		tgids[nr_tgids] = tgid;
-diff -urN linux-2.6.7/fs/proc/inode.c linux-2.6.7-new/fs/proc/inode.c
+diff -urN linux-2.6.7/fs/proc/inode.c linux-2.6.7/fs/proc/inode.c
 --- linux-2.6.7/fs/proc/inode.c	2004-06-16 01:20:03 -0400
-+++ linux-2.6.7-new/fs/proc/inode.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/proc/inode.c	2004-06-25 14:07:21 -0400
 @@ -209,7 +209,11 @@
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -7134,9 +7134,9 @@ diff -urN linux-2.6.7/fs/proc/inode.c linux-2.6.7-new/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urN linux-2.6.7/fs/proc/proc_misc.c linux-2.6.7-new/fs/proc/proc_misc.c
+diff -urN linux-2.6.7/fs/proc/proc_misc.c linux-2.6.7/fs/proc/proc_misc.c
 --- linux-2.6.7/fs/proc/proc_misc.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/fs/proc/proc_misc.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/proc/proc_misc.c	2004-06-25 14:07:21 -0400
 @@ -654,6 +654,8 @@
  void __init proc_misc_init(void)
  {
@@ -7203,9 +7203,9 @@ diff -urN linux-2.6.7/fs/proc/proc_misc.c linux-2.6.7-new/fs/proc/proc_misc.c
  	proc_root_kcore = create_proc_entry("kcore", S_IRUSR, NULL);
  	if (proc_root_kcore) {
  		proc_root_kcore->proc_fops = &proc_kcore_operations;
-diff -urN linux-2.6.7/fs/proc/root.c linux-2.6.7-new/fs/proc/root.c
+diff -urN linux-2.6.7/fs/proc/root.c linux-2.6.7/fs/proc/root.c
 --- linux-2.6.7/fs/proc/root.c	2004-06-16 01:19:44 -0400
-+++ linux-2.6.7-new/fs/proc/root.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/fs/proc/root.c	2004-06-25 14:07:21 -0400
 @@ -52,13 +52,26 @@
  		return;
  	}
@@ -7249,9 +7249,9 @@ diff -urN linux-2.6.7/fs/proc/root.c linux-2.6.7-new/fs/proc/root.c
  }
  
  static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
-diff -urN linux-2.6.7/fs/proc/task_mmu.c linux-2.6.7-new/fs/proc/task_mmu.c
+diff -urN linux-2.6.7/fs/proc/task_mmu.c linux-2.6.7/fs/proc/task_mmu.c
 --- linux-2.6.7/fs/proc/task_mmu.c	2004-06-16 01:18:59 -0400
-+++ linux-2.6.7-new/fs/proc/task_mmu.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/fs/proc/task_mmu.c	2004-06-25 17:41:53 -0400
 @@ -34,12 +34,23 @@
  		"VmData:\t%8lu kB\n"
  		"VmStk:\t%8lu kB\n"
@@ -7312,9 +7312,9 @@ diff -urN linux-2.6.7/fs/proc/task_mmu.c linux-2.6.7-new/fs/proc/task_mmu.c
  			flags & VM_READ ? 'r' : '-',
  			flags & VM_WRITE ? 'w' : '-',
  			flags & VM_EXEC ? 'x' : '-',
-diff -urN linux-2.6.7/fs/readdir.c linux-2.6.7-new/fs/readdir.c
+diff -urN linux-2.6.7/fs/readdir.c linux-2.6.7/fs/readdir.c
 --- linux-2.6.7/fs/readdir.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/fs/readdir.c	2004-06-25 17:29:52 -0400
++++ linux-2.6.7/fs/readdir.c	2004-06-25 17:29:52 -0400
 @@ -15,6 +15,8 @@
  #include <linux/dirent.h>
  #include <linux/security.h>
@@ -7411,9 +7411,9 @@ diff -urN linux-2.6.7/fs/readdir.c linux-2.6.7-new/fs/readdir.c
  	error = vfs_readdir(file, filldir64, &buf);
  	if (error < 0)
  		goto out_putf;
-diff -urN linux-2.6.7/grsecurity/Kconfig linux-2.6.7-new/grsecurity/Kconfig
+diff -urN linux-2.6.7/grsecurity/Kconfig linux-2.6.7/grsecurity/Kconfig
 --- linux-2.6.7/grsecurity/Kconfig	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/Kconfig	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/Kconfig	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,864 @@
 +#
 +# grecurity configuration
@@ -8279,9 +8279,9 @@ diff -urN linux-2.6.7/grsecurity/Kconfig linux-2.6.7-new/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urN linux-2.6.7/grsecurity/Makefile linux-2.6.7-new/grsecurity/Makefile
+diff -urN linux-2.6.7/grsecurity/Makefile linux-2.6.7/grsecurity/Makefile
 --- linux-2.6.7/grsecurity/Makefile	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/Makefile	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/Makefile	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,21 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001, 2002, and 2003 it has been completely redesigned by
@@ -8304,145 +8304,9 @@ diff -urN linux-2.6.7/grsecurity/Makefile linux-2.6.7-new/grsecurity/Makefile
 +obj-y += grsec_disabled.o
 +endif
 +
-diff -urN linux-2.6.7/grsecurity/cvs.patch linux-2.6.7-new/grsecurity/cvs.patch
---- linux-2.6.7/grsecurity/cvs.patch	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/cvs.patch	2004-06-29 12:30:16 -0400
-@@ -0,0 +1,132 @@
-+Index: grsecurity/gracl.c
-+===================================================================
-+RCS file: /home/cvs/grsecurity2/grsecurity/gracl.c,v
-+retrieving revision 1.15
-+retrieving revision 1.17
-+diff -u -r1.15 -r1.17
-+--- grsecurity/gracl.c	25 Jun 2004 20:55:45 -0000	1.15
-++++ grsecurity/gracl.c	29 Jun 2004 16:10:01 -0000	1.17
-+@@ -1483,39 +1483,99 @@
-+ 	return error;
-+ }
-+ 
-++/* derived from glibc fnmatch() 0: match, 1: no match*/
-++
-+ static int
-+-glob_match(char *pattern, char *string)
-++glob_match(const char *pattern, const char *string)
-+ {
-+-	char *p1, *p2;
-+-
-+-	p1 = pattern;
-+-	p2 = string;
-++	const char *p = pattern, *n = string;
-++	char c;
-+ 
-+-	while (*p1 != '\0' && *p2 != '\0' && *p1 != '*') {
-+-		if (*p1 == *p2 || *p1 == '?') {
-+-			p1++;
-+-			p2++;
-+-		} else
-++	while ((c = *p++) != '\0') {
-++	switch (c) {
-++		case '?':
-++			if (*n == '\0')
-++				return 1;
-++			else if (*n == '/')
-++				return 1;
-+ 			break;
-+-	}
-+-	if (*p1 == '*') {
-+-		p1++;
-+-		while (*p2 != '\0') {
-+-			if (!glob_match(p1, p2))
-++		case '\\':
-++			if (*n != c)
-++				return 1;
-++			break;
-++		case '*':
-++			for (c = *p++; c == '?' || c == '*'; c= *p++, ++n)
-++				if (*n == '/') || (c == '?' && *n == '\0'))
-++					return 1;
-++			if (c == '\0')
-+ 				return 0;
-+-			else
-+-				p2++;
-++			{
-++				char c1 = c;
-++				for (--p; *n != '\0'; ++n)
-++					if ((c == '[') || (*n == c1)) && !glob_match(p, n))
-++						return 0;
-++				return 1;
-++			}
-++		case '[':
-++			{
-++			int not;
-++
-++			if (*n == '\0')
-++				return 1;
-++			not = (*p == '!' || *p == '^');
-++			if (not)
-++				++p;
-++
-++			c = *p++;
-++			for (;;) {
-++				char cstart = c, cend = c;
-++
-++				if (c == '\0')
-++					return 1;
-++				c = *p++;
-++
-++				if (c == '/')
-++					return 1;
-++
-++				if (c == '-' && *p != ']') {
-++					cend = *p++;
-++					if (cent == '\0')
-++						return 1;
-++					c = *p++;
-++				}
-++
-++				if (*n >= cstart && *n <= cend)
-++					goto matched;
-++
-++				if (c == ']')
-++					break;
-++			}
-++			if (!not)
-++				return 1;
-++			break;
-++		matched:
-++			while (c != ']') {
-++				if (c == '\0')
-++					return 1;
-++
-++				c = *p++;
-++			}
-++			if (not)
-++				return 1;
-+ 		}
-++		break;
-++	default:
-++		if (c != *n)
-++			return 1;
-+ 	}
-+ 
-+-	if (*p2 == '\0' && *p1 == '*')
-+-		while (*p1 == '*')
-+-			p1++;
-+-
-+-	if (*p1 == '\0' && *p2 == '\0')
-++	++n;
-++	}
-++				
-++	if (*n == '\0')
-+ 		return 0;
-+-	else
-+-		return 1;
-++
-++	return 1;
-+ }
-+ 
-+ static struct acl_object_label *
-diff -urN linux-2.6.7/grsecurity/gracl.c linux-2.6.7-new/grsecurity/gracl.c
+diff -urN linux-2.6.7/grsecurity/gracl.c linux-2.6.7/grsecurity/gracl.c
 --- linux-2.6.7/grsecurity/gracl.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl.c	2004-06-29 15:32:19 -0400
++++ linux-2.6.7/grsecurity/gracl.c	2004-06-29 15:32:19 -0400
 @@ -0,0 +1,3426 @@
 +/* 
 + * grsecurity/gracl.c
@@ -11870,9 +11734,9 @@ diff -urN linux-2.6.7/grsecurity/gracl.c linux-2.6.7-new/grsecurity/gracl.c
 +	}
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_alloc.c linux-2.6.7-new/grsecurity/gracl_alloc.c
+diff -urN linux-2.6.7/grsecurity/gracl_alloc.c linux-2.6.7/grsecurity/gracl_alloc.c
 --- linux-2.6.7/grsecurity/gracl_alloc.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_alloc.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_alloc.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,93 @@
 +/* stack-based acl allocation tracking (c) Brad Spengler 2002,2003 */
 +
@@ -11967,9 +11831,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_alloc.c linux-2.6.7-new/grsecurity/gracl_
 +	else
 +		return 1;
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_cap.c linux-2.6.7-new/grsecurity/gracl_cap.c
+diff -urN linux-2.6.7/grsecurity/gracl_cap.c linux-2.6.7/grsecurity/gracl_cap.c
 --- linux-2.6.7/grsecurity/gracl_cap.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_cap.c	2004-06-29 10:06:07 -0400
++++ linux-2.6.7/grsecurity/gracl_cap.c	2004-06-29 10:06:07 -0400
 @@ -0,0 +1,116 @@
 +/* capability handling routines, (c) Brad Spengler 2002,2003 */
 +
@@ -12087,9 +11951,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_cap.c linux-2.6.7-new/grsecurity/gracl_ca
 +	return 0;
 +}
 +
-diff -urN linux-2.6.7/grsecurity/gracl_fs.c linux-2.6.7-new/grsecurity/gracl_fs.c
+diff -urN linux-2.6.7/grsecurity/gracl_fs.c linux-2.6.7/grsecurity/gracl_fs.c
 --- linux-2.6.7/grsecurity/gracl_fs.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_fs.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_fs.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,462 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -12553,9 +12417,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_fs.c linux-2.6.7-new/grsecurity/gracl_fs.
 +
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_ip.c linux-2.6.7-new/grsecurity/gracl_ip.c
+diff -urN linux-2.6.7/grsecurity/gracl_ip.c linux-2.6.7/grsecurity/gracl_ip.c
 --- linux-2.6.7/grsecurity/gracl_ip.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_ip.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_ip.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,236 @@
 +/* 
 + * grsecurity/gracl_ip.c
@@ -12793,9 +12657,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_ip.c linux-2.6.7-new/grsecurity/gracl_ip.
 +
 +	return gr_search_connectbind(GR_CONNECT, sk, &sin, SOCK_DGRAM);
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_learn.c linux-2.6.7-new/grsecurity/gracl_learn.c
+diff -urN linux-2.6.7/grsecurity/gracl_learn.c linux-2.6.7/grsecurity/gracl_learn.c
 --- linux-2.6.7/grsecurity/gracl_learn.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_learn.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_learn.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,204 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -13001,9 +12865,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_learn.c linux-2.6.7-new/grsecurity/gracl_
 +	release:	close_learn,
 +	poll:		poll_learn,
 +};
-diff -urN linux-2.6.7/grsecurity/gracl_res.c linux-2.6.7-new/grsecurity/gracl_res.c
+diff -urN linux-2.6.7/grsecurity/gracl_res.c linux-2.6.7/grsecurity/gracl_res.c
 --- linux-2.6.7/grsecurity/gracl_res.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_res.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_res.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,50 @@
 +/* resource handling routines (c) Brad Spengler 2002, 2003 */
 +
@@ -13055,9 +12919,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_res.c linux-2.6.7-new/grsecurity/gracl_re
 +
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_segv.c linux-2.6.7-new/grsecurity/gracl_segv.c
+diff -urN linux-2.6.7/grsecurity/gracl_segv.c linux-2.6.7/grsecurity/gracl_segv.c
 --- linux-2.6.7/grsecurity/gracl_segv.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_segv.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_segv.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,330 @@
 +/* 
 + * grsecurity/gracl_segv.c
@@ -13389,9 +13253,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_segv.c linux-2.6.7-new/grsecurity/gracl_s
 +
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/gracl_shm.c linux-2.6.7-new/grsecurity/gracl_shm.c
+diff -urN linux-2.6.7/grsecurity/gracl_shm.c linux-2.6.7/grsecurity/gracl_shm.c
 --- linux-2.6.7/grsecurity/gracl_shm.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/gracl_shm.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/gracl_shm.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,36 @@
 +/* shared memory handling routines, (c) Brad Spengler 2002, 2003 */
 +
@@ -13429,9 +13293,9 @@ diff -urN linux-2.6.7/grsecurity/gracl_shm.c linux-2.6.7-new/grsecurity/gracl_sh
 +
 +	return 1;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_chdir.c linux-2.6.7-new/grsecurity/grsec_chdir.c
+diff -urN linux-2.6.7/grsecurity/grsec_chdir.c linux-2.6.7/grsecurity/grsec_chdir.c
 --- linux-2.6.7/grsecurity/grsec_chdir.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_chdir.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_chdir.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,20 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -13453,9 +13317,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_chdir.c linux-2.6.7-new/grsecurity/grsec_
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_chroot.c linux-2.6.7-new/grsecurity/grsec_chroot.c
+diff -urN linux-2.6.7/grsecurity/grsec_chroot.c linux-2.6.7/grsecurity/grsec_chroot.c
 --- linux-2.6.7/grsecurity/grsec_chroot.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_chroot.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_chroot.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,360 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -13817,9 +13681,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_chroot.c linux-2.6.7-new/grsecurity/grsec
 +#endif
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_disabled.c linux-2.6.7-new/grsecurity/grsec_disabled.c
+diff -urN linux-2.6.7/grsecurity/grsec_disabled.c linux-2.6.7/grsecurity/grsec_disabled.c
 --- linux-2.6.7/grsecurity/grsec_disabled.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_disabled.c	2004-06-25 17:25:57 -0400
++++ linux-2.6.7/grsecurity/grsec_disabled.c	2004-06-25 17:25:57 -0400
 @@ -0,0 +1,413 @@
 +/* 
 + * when grsecurity is disabled, compile all external functions into nothing
@@ -14234,9 +14098,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_disabled.c linux-2.6.7-new/grsecurity/grs
 +EXPORT_SYMBOL(gr_learn_resource);
 +EXPORT_SYMBOL(gr_set_kernel_label);
 +
-diff -urN linux-2.6.7/grsecurity/grsec_exec.c linux-2.6.7-new/grsecurity/grsec_exec.c
+diff -urN linux-2.6.7/grsecurity/grsec_exec.c linux-2.6.7/grsecurity/grsec_exec.c
 --- linux-2.6.7/grsecurity/grsec_exec.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_exec.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_exec.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,71 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14309,9 +14173,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_exec.c linux-2.6.7-new/grsecurity/grsec_e
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_fifo.c linux-2.6.7-new/grsecurity/grsec_fifo.c
+diff -urN linux-2.6.7/grsecurity/grsec_fifo.c linux-2.6.7/grsecurity/grsec_fifo.c
 --- linux-2.6.7/grsecurity/grsec_fifo.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_fifo.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_fifo.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14337,9 +14201,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_fifo.c linux-2.6.7-new/grsecurity/grsec_f
 +#endif
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_fork.c linux-2.6.7-new/grsecurity/grsec_fork.c
+diff -urN linux-2.6.7/grsecurity/grsec_fork.c linux-2.6.7/grsecurity/grsec_fork.c
 --- linux-2.6.7/grsecurity/grsec_fork.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_fork.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_fork.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14355,9 +14219,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_fork.c linux-2.6.7-new/grsecurity/grsec_f
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_init.c linux-2.6.7-new/grsecurity/grsec_init.c
+diff -urN linux-2.6.7/grsecurity/grsec_init.c linux-2.6.7/grsecurity/grsec_init.c
 --- linux-2.6.7/grsecurity/grsec_init.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_init.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_init.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,225 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14584,9 +14448,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_init.c linux-2.6.7-new/grsecurity/grsec_i
 +
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_ipc.c linux-2.6.7-new/grsecurity/grsec_ipc.c
+diff -urN linux-2.6.7/grsecurity/grsec_ipc.c linux-2.6.7/grsecurity/grsec_ipc.c
 --- linux-2.6.7/grsecurity/grsec_ipc.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_ipc.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_ipc.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,81 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14669,9 +14533,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_ipc.c linux-2.6.7-new/grsecurity/grsec_ip
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_link.c linux-2.6.7-new/grsecurity/grsec_link.c
+diff -urN linux-2.6.7/grsecurity/grsec_link.c linux-2.6.7/grsecurity/grsec_link.c
 --- linux-2.6.7/grsecurity/grsec_link.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_link.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_link.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,41 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14714,9 +14578,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_link.c linux-2.6.7-new/grsecurity/grsec_l
 +#endif
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_mem.c linux-2.6.7-new/grsecurity/grsec_mem.c
+diff -urN linux-2.6.7/grsecurity/grsec_mem.c linux-2.6.7/grsecurity/grsec_mem.c
 --- linux-2.6.7/grsecurity/grsec_mem.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_mem.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_mem.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,54 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14772,9 +14636,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_mem.c linux-2.6.7-new/grsecurity/grsec_me
 +
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_mount.c linux-2.6.7-new/grsecurity/grsec_mount.c
+diff -urN linux-2.6.7/grsecurity/grsec_mount.c linux-2.6.7/grsecurity/grsec_mount.c
 --- linux-2.6.7/grsecurity/grsec_mount.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_mount.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_mount.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,34 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14810,9 +14674,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_mount.c linux-2.6.7-new/grsecurity/grsec_
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_rand.c linux-2.6.7-new/grsecurity/grsec_rand.c
+diff -urN linux-2.6.7/grsecurity/grsec_rand.c linux-2.6.7/grsecurity/grsec_rand.c
 --- linux-2.6.7/grsecurity/grsec_rand.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_rand.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_rand.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,22 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14836,9 +14700,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_rand.c linux-2.6.7-new/grsecurity/grsec_r
 +#endif
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_sig.c linux-2.6.7-new/grsecurity/grsec_sig.c
+diff -urN linux-2.6.7/grsecurity/grsec_sig.c linux-2.6.7/grsecurity/grsec_sig.c
 --- linux-2.6.7/grsecurity/grsec_sig.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_sig.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_sig.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,48 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -14888,9 +14752,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_sig.c linux-2.6.7-new/grsecurity/grsec_si
 +#endif
 +	return 0;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_sock.c linux-2.6.7-new/grsecurity/grsec_sock.c
+diff -urN linux-2.6.7/grsecurity/grsec_sock.c linux-2.6.7/grsecurity/grsec_sock.c
 --- linux-2.6.7/grsecurity/grsec_sock.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_sock.c	2004-06-29 11:04:30 -0400
++++ linux-2.6.7/grsecurity/grsec_sock.c	2004-06-29 11:04:30 -0400
 @@ -0,0 +1,259 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -15151,9 +15015,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_sock.c linux-2.6.7-new/grsecurity/grsec_s
 +	return current->cap_effective;
 +#endif
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_sysctl.c linux-2.6.7-new/grsecurity/grsec_sysctl.c
+diff -urN linux-2.6.7/grsecurity/grsec_sysctl.c linux-2.6.7/grsecurity/grsec_sysctl.c
 --- linux-2.6.7/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_sysctl.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_sysctl.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,453 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -15608,9 +15472,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_sysctl.c linux-2.6.7-new/grsecurity/grsec
 +	{ .ctl_name = 0 }
 +};
 +#endif
-diff -urN linux-2.6.7/grsecurity/grsec_textrel.c linux-2.6.7-new/grsecurity/grsec_textrel.c
+diff -urN linux-2.6.7/grsecurity/grsec_textrel.c linux-2.6.7/grsecurity/grsec_textrel.c
 --- linux-2.6.7/grsecurity/grsec_textrel.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_textrel.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_textrel.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -15631,9 +15495,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_textrel.c linux-2.6.7-new/grsecurity/grse
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_time.c linux-2.6.7-new/grsecurity/grsec_time.c
+diff -urN linux-2.6.7/grsecurity/grsec_time.c linux-2.6.7/grsecurity/grsec_time.c
 --- linux-2.6.7/grsecurity/grsec_time.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_time.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_time.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,13 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -15648,9 +15512,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_time.c linux-2.6.7-new/grsecurity/grsec_t
 +#endif
 +	return;
 +}
-diff -urN linux-2.6.7/grsecurity/grsec_tpe.c linux-2.6.7-new/grsecurity/grsec_tpe.c
+diff -urN linux-2.6.7/grsecurity/grsec_tpe.c linux-2.6.7/grsecurity/grsec_tpe.c
 --- linux-2.6.7/grsecurity/grsec_tpe.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsec_tpe.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsec_tpe.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,35 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -15687,9 +15551,9 @@ diff -urN linux-2.6.7/grsecurity/grsec_tpe.c linux-2.6.7-new/grsecurity/grsec_tp
 +#endif
 +	return 1;
 +}
-diff -urN linux-2.6.7/grsecurity/grsum.c linux-2.6.7-new/grsecurity/grsum.c
+diff -urN linux-2.6.7/grsecurity/grsum.c linux-2.6.7/grsecurity/grsum.c
 --- linux-2.6.7/grsecurity/grsum.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/grsum.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/grsum.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,59 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -15750,9 +15614,9 @@ diff -urN linux-2.6.7/grsecurity/grsum.c linux-2.6.7-new/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urN linux-2.6.7/grsecurity/obsd_rand.c linux-2.6.7-new/grsecurity/obsd_rand.c
+diff -urN linux-2.6.7/grsecurity/obsd_rand.c linux-2.6.7/grsecurity/obsd_rand.c
 --- linux-2.6.7/grsecurity/obsd_rand.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/grsecurity/obsd_rand.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/grsecurity/obsd_rand.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,186 @@
 +
 +/*
@@ -15940,9 +15804,9 @@ diff -urN linux-2.6.7/grsecurity/obsd_rand.c linux-2.6.7-new/grsecurity/obsd_ran
 +	return (((tcp_rndiss_encrypt(tcp_rndiss_cnt++) |
 +		  tcp_rndiss_msb) << 16) | (get_random_long() & 0x7fff));
 +}
-diff -urN linux-2.6.7/include/asm-alpha/a.out.h linux-2.6.7-new/include/asm-alpha/a.out.h
+diff -urN linux-2.6.7/include/asm-alpha/a.out.h linux-2.6.7/include/asm-alpha/a.out.h
 --- linux-2.6.7/include/asm-alpha/a.out.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-alpha/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-alpha/a.out.h	2004-06-25 17:41:53 -0400
 @@ -98,7 +98,7 @@
  	set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000 \
  			   ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))
@@ -15952,9 +15816,9 @@ diff -urN linux-2.6.7/include/asm-alpha/a.out.h linux-2.6.7-new/include/asm-alph
    (current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)
  
  #endif
-diff -urN linux-2.6.7/include/asm-alpha/elf.h linux-2.6.7-new/include/asm-alpha/elf.h
+diff -urN linux-2.6.7/include/asm-alpha/elf.h linux-2.6.7/include/asm-alpha/elf.h
 --- linux-2.6.7/include/asm-alpha/elf.h	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/include/asm-alpha/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-alpha/elf.h	2004-06-25 17:41:53 -0400
 @@ -89,6 +89,17 @@
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15973,9 +15837,9 @@ diff -urN linux-2.6.7/include/asm-alpha/elf.h linux-2.6.7-new/include/asm-alpha/
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urN linux-2.6.7/include/asm-alpha/mman.h linux-2.6.7-new/include/asm-alpha/mman.h
+diff -urN linux-2.6.7/include/asm-alpha/mman.h linux-2.6.7/include/asm-alpha/mman.h
 --- linux-2.6.7/include/asm-alpha/mman.h	2004-06-16 01:18:52 -0400
-+++ linux-2.6.7-new/include/asm-alpha/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-alpha/mman.h	2004-06-25 17:41:53 -0400
 @@ -29,6 +29,10 @@
  #define MAP_POPULATE	0x20000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x40000		/* do not block on IO */
@@ -15987,9 +15851,9 @@ diff -urN linux-2.6.7/include/asm-alpha/mman.h linux-2.6.7-new/include/asm-alpha
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_SYNC		2		/* synchronous memory sync */
  #define MS_INVALIDATE	4		/* invalidate the caches */
-diff -urN linux-2.6.7/include/asm-alpha/page.h linux-2.6.7-new/include/asm-alpha/page.h
+diff -urN linux-2.6.7/include/asm-alpha/page.h linux-2.6.7/include/asm-alpha/page.h
 --- linux-2.6.7/include/asm-alpha/page.h	2004-06-16 01:19:44 -0400
-+++ linux-2.6.7-new/include/asm-alpha/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-alpha/page.h	2004-06-25 17:41:53 -0400
 @@ -106,6 +106,15 @@
  #define VM_DATA_DEFAULT_FLAGS		(VM_READ | VM_WRITE | VM_EXEC | \
  					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -16006,9 +15870,9 @@ diff -urN linux-2.6.7/include/asm-alpha/page.h linux-2.6.7-new/include/asm-alpha
  #endif /* __KERNEL__ */
  
  #endif /* _ALPHA_PAGE_H */
-diff -urN linux-2.6.7/include/asm-alpha/pgtable.h linux-2.6.7-new/include/asm-alpha/pgtable.h
+diff -urN linux-2.6.7/include/asm-alpha/pgtable.h linux-2.6.7/include/asm-alpha/pgtable.h
 --- linux-2.6.7/include/asm-alpha/pgtable.h	2004-06-16 01:19:03 -0400
-+++ linux-2.6.7-new/include/asm-alpha/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-alpha/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -96,6 +96,17 @@
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -16027,9 +15891,9 @@ diff -urN linux-2.6.7/include/asm-alpha/pgtable.h linux-2.6.7-new/include/asm-al
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urN linux-2.6.7/include/asm-i386/a.out.h linux-2.6.7-new/include/asm-i386/a.out.h
+diff -urN linux-2.6.7/include/asm-i386/a.out.h linux-2.6.7/include/asm-i386/a.out.h
 --- linux-2.6.7/include/asm-i386/a.out.h	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/include/asm-i386/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/a.out.h	2004-06-25 17:41:53 -0400
 @@ -19,7 +19,11 @@
  
  #ifdef __KERNEL__
@@ -16043,9 +15907,9 @@ diff -urN linux-2.6.7/include/asm-i386/a.out.h linux-2.6.7-new/include/asm-i386/
  
  #endif
  
-diff -urN linux-2.6.7/include/asm-i386/desc.h linux-2.6.7-new/include/asm-i386/desc.h
+diff -urN linux-2.6.7/include/asm-i386/desc.h linux-2.6.7/include/asm-i386/desc.h
 --- linux-2.6.7/include/asm-i386/desc.h	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/include/asm-i386/desc.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/desc.h	2004-06-25 17:41:53 -0400
 @@ -8,11 +8,71 @@
  
  #include <linux/preempt.h>
@@ -16206,9 +16070,9 @@ diff -urN linux-2.6.7/include/asm-i386/desc.h linux-2.6.7-new/include/asm-i386/d
  #endif /* !__ASSEMBLY__ */
  
  #endif
-diff -urN linux-2.6.7/include/asm-i386/elf.h linux-2.6.7-new/include/asm-i386/elf.h
+diff -urN linux-2.6.7/include/asm-i386/elf.h linux-2.6.7/include/asm-i386/elf.h
 --- linux-2.6.7/include/asm-i386/elf.h	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/include/asm-i386/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/elf.h	2004-06-25 17:41:53 -0400
 @@ -72,6 +72,19 @@
  
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
@@ -16262,9 +16126,9 @@ diff -urN linux-2.6.7/include/asm-i386/elf.h linux-2.6.7-new/include/asm-i386/el
  #endif
 +
 +#endif
-diff -urN linux-2.6.7/include/asm-i386/mach-default/apm.h linux-2.6.7-new/include/asm-i386/mach-default/apm.h
+diff -urN linux-2.6.7/include/asm-i386/mach-default/apm.h linux-2.6.7/include/asm-i386/mach-default/apm.h
 --- linux-2.6.7/include/asm-i386/mach-default/apm.h	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/include/asm-i386/mach-default/apm.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/mach-default/apm.h	2004-06-25 17:41:53 -0400
 @@ -36,7 +36,7 @@
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -16283,9 +16147,9 @@ diff -urN linux-2.6.7/include/asm-i386/mach-default/apm.h linux-2.6.7-new/includ
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urN linux-2.6.7/include/asm-i386/mach-pc9800/apm.h linux-2.6.7-new/include/asm-i386/mach-pc9800/apm.h
+diff -urN linux-2.6.7/include/asm-i386/mach-pc9800/apm.h linux-2.6.7/include/asm-i386/mach-pc9800/apm.h
 --- linux-2.6.7/include/asm-i386/mach-pc9800/apm.h	2004-06-16 01:19:17 -0400
-+++ linux-2.6.7-new/include/asm-i386/mach-pc9800/apm.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/mach-pc9800/apm.h	2004-06-25 17:41:53 -0400
 @@ -39,7 +39,7 @@
  		"pushl %%edi\n\t"
  		"pushl %%ebp\n\t"
@@ -16304,9 +16168,9 @@ diff -urN linux-2.6.7/include/asm-i386/mach-pc9800/apm.h linux-2.6.7-new/include
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urN linux-2.6.7/include/asm-i386/mman.h linux-2.6.7-new/include/asm-i386/mman.h
+diff -urN linux-2.6.7/include/asm-i386/mman.h linux-2.6.7/include/asm-i386/mman.h
 --- linux-2.6.7/include/asm-i386/mman.h	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/include/asm-i386/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/mman.h	2004-06-25 17:41:53 -0400
 @@ -23,6 +23,10 @@
  #define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x10000		/* do not block on IO */
@@ -16318,9 +16182,9 @@ diff -urN linux-2.6.7/include/asm-i386/mman.h linux-2.6.7-new/include/asm-i386/m
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-i386/mmu.h linux-2.6.7-new/include/asm-i386/mmu.h
+diff -urN linux-2.6.7/include/asm-i386/mmu.h linux-2.6.7/include/asm-i386/mmu.h
 --- linux-2.6.7/include/asm-i386/mmu.h	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/include/asm-i386/mmu.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/mmu.h	2004-06-25 17:41:53 -0400
 @@ -12,6 +12,17 @@
  	int size;
  	struct semaphore sem;
@@ -16339,9 +16203,9 @@ diff -urN linux-2.6.7/include/asm-i386/mmu.h linux-2.6.7-new/include/asm-i386/mm
  } mm_context_t;
  
  #endif
-diff -urN linux-2.6.7/include/asm-i386/mmu_context.h linux-2.6.7-new/include/asm-i386/mmu_context.h
+diff -urN linux-2.6.7/include/asm-i386/mmu_context.h linux-2.6.7/include/asm-i386/mmu_context.h
 --- linux-2.6.7/include/asm-i386/mmu_context.h	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/include/asm-i386/mmu_context.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/mmu_context.h	2004-06-25 17:41:53 -0400
 @@ -46,6 +46,13 @@
  		 */
  		if (unlikely(prev->context.ldt != next->context.ldt))
@@ -16369,9 +16233,9 @@ diff -urN linux-2.6.7/include/asm-i386/mmu_context.h linux-2.6.7-new/include/asm
  		}
  	}
  #endif
-diff -urN linux-2.6.7/include/asm-i386/module.h linux-2.6.7-new/include/asm-i386/module.h
+diff -urN linux-2.6.7/include/asm-i386/module.h linux-2.6.7/include/asm-i386/module.h
 --- linux-2.6.7/include/asm-i386/module.h	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/include/asm-i386/module.h	2004-06-25 14:23:23 -0400
++++ linux-2.6.7/include/asm-i386/module.h	2004-06-25 14:23:23 -0400
 @@ -66,6 +66,12 @@
  #define MODULE_STACKSIZE ""
  #endif
@@ -16386,9 +16250,9 @@ diff -urN linux-2.6.7/include/asm-i386/module.h linux-2.6.7-new/include/asm-i386
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_REGPARM MODULE_STACKSIZE MODULE_GRSEC
  
  #endif /* _ASM_I386_MODULE_H */
-diff -urN linux-2.6.7/include/asm-i386/page.h linux-2.6.7-new/include/asm-i386/page.h
+diff -urN linux-2.6.7/include/asm-i386/page.h linux-2.6.7/include/asm-i386/page.h
 --- linux-2.6.7/include/asm-i386/page.h	2004-06-16 01:18:59 -0400
-+++ linux-2.6.7-new/include/asm-i386/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/page.h	2004-06-25 17:41:53 -0400
 @@ -120,6 +120,19 @@
  #define __PAGE_OFFSET		(0xC0000000UL)
  #endif
@@ -16429,9 +16293,9 @@ diff -urN linux-2.6.7/include/asm-i386/page.h linux-2.6.7-new/include/asm-i386/p
  #endif /* __KERNEL__ */
  
  #endif /* _I386_PAGE_H */
-diff -urN linux-2.6.7/include/asm-i386/pgalloc.h linux-2.6.7-new/include/asm-i386/pgalloc.h
+diff -urN linux-2.6.7/include/asm-i386/pgalloc.h linux-2.6.7/include/asm-i386/pgalloc.h
 --- linux-2.6.7/include/asm-i386/pgalloc.h	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/include/asm-i386/pgalloc.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/pgalloc.h	2004-06-25 17:41:53 -0400
 @@ -8,7 +8,7 @@
  #include <linux/mm.h>		/* for struct page */
  
@@ -16441,9 +16305,9 @@ diff -urN linux-2.6.7/include/asm-i386/pgalloc.h linux-2.6.7-new/include/asm-i38
  
  static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
  {
-diff -urN linux-2.6.7/include/asm-i386/pgtable.h linux-2.6.7-new/include/asm-i386/pgtable.h
+diff -urN linux-2.6.7/include/asm-i386/pgtable.h linux-2.6.7/include/asm-i386/pgtable.h
 --- linux-2.6.7/include/asm-i386/pgtable.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-i386/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -25,13 +25,6 @@
  #include <linux/list.h>
  #include <linux/spinlock.h>
@@ -16544,9 +16408,9 @@ diff -urN linux-2.6.7/include/asm-i386/pgtable.h linux-2.6.7-new/include/asm-i38
  #ifndef CONFIG_DISCONTIGMEM
  #define kern_addr_valid(addr)	(1)
  #endif /* !CONFIG_DISCONTIGMEM */
-diff -urN linux-2.6.7/include/asm-i386/processor.h linux-2.6.7-new/include/asm-i386/processor.h
+diff -urN linux-2.6.7/include/asm-i386/processor.h linux-2.6.7/include/asm-i386/processor.h
 --- linux-2.6.7/include/asm-i386/processor.h	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/include/asm-i386/processor.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/processor.h	2004-06-25 17:41:53 -0400
 @@ -28,7 +28,7 @@
  };
  
@@ -16617,9 +16481,9 @@ diff -urN linux-2.6.7/include/asm-i386/processor.h linux-2.6.7-new/include/asm-i
  			  X86_FEATURE_3DNOW,
  			  "r" (x));
  }
-diff -urN linux-2.6.7/include/asm-i386/system.h linux-2.6.7-new/include/asm-i386/system.h
+diff -urN linux-2.6.7/include/asm-i386/system.h linux-2.6.7/include/asm-i386/system.h
 --- linux-2.6.7/include/asm-i386/system.h	2004-06-16 01:18:38 -0400
-+++ linux-2.6.7-new/include/asm-i386/system.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-i386/system.h	2004-06-25 17:41:53 -0400
 @@ -5,6 +5,7 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>
@@ -16664,9 +16528,9 @@ diff -urN linux-2.6.7/include/asm-i386/system.h linux-2.6.7-new/include/asm-i386
  
  /*
   * Force strict CPU ordering.
-diff -urN linux-2.6.7/include/asm-ia64/elf.h linux-2.6.7-new/include/asm-ia64/elf.h
+diff -urN linux-2.6.7/include/asm-ia64/elf.h linux-2.6.7/include/asm-ia64/elf.h
 --- linux-2.6.7/include/asm-ia64/elf.h	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/include/asm-ia64/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ia64/elf.h	2004-06-25 17:41:53 -0400
 @@ -162,6 +162,16 @@
  typedef struct ia64_fpreg elf_fpreg_t;
  typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
@@ -16684,9 +16548,9 @@ diff -urN linux-2.6.7/include/asm-ia64/elf.h linux-2.6.7-new/include/asm-ia64/el
  
  
  struct pt_regs;	/* forward declaration... */
-diff -urN linux-2.6.7/include/asm-ia64/mman.h linux-2.6.7-new/include/asm-ia64/mman.h
+diff -urN linux-2.6.7/include/asm-ia64/mman.h linux-2.6.7/include/asm-ia64/mman.h
 --- linux-2.6.7/include/asm-ia64/mman.h	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/include/asm-ia64/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ia64/mman.h	2004-06-25 17:41:53 -0400
 @@ -31,6 +31,10 @@
  #define MAP_POPULATE	0x08000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x10000		/* do not block on IO */
@@ -16698,9 +16562,9 @@ diff -urN linux-2.6.7/include/asm-ia64/mman.h linux-2.6.7-new/include/asm-ia64/m
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-ia64/page.h linux-2.6.7-new/include/asm-ia64/page.h
+diff -urN linux-2.6.7/include/asm-ia64/page.h linux-2.6.7/include/asm-ia64/page.h
 --- linux-2.6.7/include/asm-ia64/page.h	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/include/asm-ia64/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ia64/page.h	2004-06-25 17:41:53 -0400
 @@ -187,4 +187,13 @@
  					 (((current->thread.flags & IA64_THREAD_XSTACK) != 0)	\
  					  ? VM_EXEC : 0))
@@ -16715,9 +16579,9 @@ diff -urN linux-2.6.7/include/asm-ia64/page.h linux-2.6.7-new/include/asm-ia64/p
 +#endif
 +
  #endif /* _ASM_IA64_PAGE_H */
-diff -urN linux-2.6.7/include/asm-ia64/pgtable.h linux-2.6.7-new/include/asm-ia64/pgtable.h
+diff -urN linux-2.6.7/include/asm-ia64/pgtable.h linux-2.6.7/include/asm-ia64/pgtable.h
 --- linux-2.6.7/include/asm-ia64/pgtable.h	2004-06-16 01:19:09 -0400
-+++ linux-2.6.7-new/include/asm-ia64/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ia64/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -121,6 +121,17 @@
  #define PAGE_READONLY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -16736,9 +16600,9 @@ diff -urN linux-2.6.7/include/asm-ia64/pgtable.h linux-2.6.7-new/include/asm-ia6
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urN linux-2.6.7/include/asm-ia64/ustack.h linux-2.6.7-new/include/asm-ia64/ustack.h
+diff -urN linux-2.6.7/include/asm-ia64/ustack.h linux-2.6.7/include/asm-ia64/ustack.h
 --- linux-2.6.7/include/asm-ia64/ustack.h	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/include/asm-ia64/ustack.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ia64/ustack.h	2004-06-25 17:41:53 -0400
 @@ -11,6 +11,6 @@
  #define MAX_USER_STACK_SIZE	(RGN_MAP_LIMIT/2)
  /* Make a default stack size of 2GB */
@@ -16747,9 +16611,9 @@ diff -urN linux-2.6.7/include/asm-ia64/ustack.h linux-2.6.7-new/include/asm-ia64
 +#define __STACK_TOP		(0x6000000000000000UL + RGN_MAP_LIMIT)
  
  #endif /* _ASM_IA64_USTACK_H */
-diff -urN linux-2.6.7/include/asm-mips/a.out.h linux-2.6.7-new/include/asm-mips/a.out.h
+diff -urN linux-2.6.7/include/asm-mips/a.out.h linux-2.6.7/include/asm-mips/a.out.h
 --- linux-2.6.7/include/asm-mips/a.out.h	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/include/asm-mips/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-mips/a.out.h	2004-06-25 17:41:53 -0400
 @@ -36,10 +36,10 @@
  #ifdef __KERNEL__
  
@@ -16763,9 +16627,9 @@ diff -urN linux-2.6.7/include/asm-mips/a.out.h linux-2.6.7-new/include/asm-mips/
  #endif
  
  #endif
-diff -urN linux-2.6.7/include/asm-mips/elf.h linux-2.6.7-new/include/asm-mips/elf.h
+diff -urN linux-2.6.7/include/asm-mips/elf.h linux-2.6.7/include/asm-mips/elf.h
 --- linux-2.6.7/include/asm-mips/elf.h	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/include/asm-mips/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-mips/elf.h	2004-06-25 17:41:53 -0400
 @@ -273,4 +273,15 @@
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -16782,9 +16646,9 @@ diff -urN linux-2.6.7/include/asm-mips/elf.h linux-2.6.7-new/include/asm-mips/el
 +#endif
 +
  #endif /* _ASM_ELF_H */
-diff -urN linux-2.6.7/include/asm-mips/page.h linux-2.6.7-new/include/asm-mips/page.h
+diff -urN linux-2.6.7/include/asm-mips/page.h linux-2.6.7/include/asm-mips/page.h
 --- linux-2.6.7/include/asm-mips/page.h	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/include/asm-mips/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-mips/page.h	2004-06-25 17:41:53 -0400
 @@ -124,6 +124,15 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -16801,9 +16665,9 @@ diff -urN linux-2.6.7/include/asm-mips/page.h linux-2.6.7-new/include/asm-mips/p
  #define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE)
  #define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET)
  
-diff -urN linux-2.6.7/include/asm-parisc/a.out.h linux-2.6.7-new/include/asm-parisc/a.out.h
+diff -urN linux-2.6.7/include/asm-parisc/a.out.h linux-2.6.7/include/asm-parisc/a.out.h
 --- linux-2.6.7/include/asm-parisc/a.out.h	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/include/asm-parisc/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-parisc/a.out.h	2004-06-25 17:41:53 -0400
 @@ -22,7 +22,7 @@
  /* XXX: STACK_TOP actually should be STACK_BOTTOM for parisc.
   * prumpf */
@@ -16813,9 +16677,9 @@ diff -urN linux-2.6.7/include/asm-parisc/a.out.h linux-2.6.7-new/include/asm-par
  
  #endif
  
-diff -urN linux-2.6.7/include/asm-parisc/elf.h linux-2.6.7-new/include/asm-parisc/elf.h
+diff -urN linux-2.6.7/include/asm-parisc/elf.h linux-2.6.7/include/asm-parisc/elf.h
 --- linux-2.6.7/include/asm-parisc/elf.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-parisc/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-parisc/elf.h	2004-06-25 17:41:53 -0400
 @@ -337,6 +337,17 @@
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -16834,9 +16698,9 @@ diff -urN linux-2.6.7/include/asm-parisc/elf.h linux-2.6.7-new/include/asm-paris
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urN linux-2.6.7/include/asm-parisc/mman.h linux-2.6.7-new/include/asm-parisc/mman.h
+diff -urN linux-2.6.7/include/asm-parisc/mman.h linux-2.6.7/include/asm-parisc/mman.h
 --- linux-2.6.7/include/asm-parisc/mman.h	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/include/asm-parisc/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-parisc/mman.h	2004-06-25 17:41:53 -0400
 @@ -23,6 +23,10 @@
  #define MAP_POPULATE	0x10000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x20000		/* do not block on IO */
@@ -16848,9 +16712,9 @@ diff -urN linux-2.6.7/include/asm-parisc/mman.h linux-2.6.7-new/include/asm-pari
  #define MS_SYNC		1		/* synchronous memory sync */
  #define MS_ASYNC	2		/* sync memory asynchronously */
  #define MS_INVALIDATE	4		/* invalidate the caches */
-diff -urN linux-2.6.7/include/asm-parisc/page.h linux-2.6.7-new/include/asm-parisc/page.h
+diff -urN linux-2.6.7/include/asm-parisc/page.h linux-2.6.7/include/asm-parisc/page.h
 --- linux-2.6.7/include/asm-parisc/page.h	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/include/asm-parisc/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-parisc/page.h	2004-06-25 17:41:53 -0400
 @@ -157,6 +157,15 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -16867,9 +16731,9 @@ diff -urN linux-2.6.7/include/asm-parisc/page.h linux-2.6.7-new/include/asm-pari
  #endif /* __KERNEL__ */
  
  #endif /* _PARISC_PAGE_H */
-diff -urN linux-2.6.7/include/asm-parisc/pgtable.h linux-2.6.7-new/include/asm-parisc/pgtable.h
+diff -urN linux-2.6.7/include/asm-parisc/pgtable.h linux-2.6.7/include/asm-parisc/pgtable.h
 --- linux-2.6.7/include/asm-parisc/pgtable.h	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/include/asm-parisc/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-parisc/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -189,6 +189,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -16888,9 +16752,9 @@ diff -urN linux-2.6.7/include/asm-parisc/pgtable.h linux-2.6.7-new/include/asm-p
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO	__pgprot(_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_DIRTY | _PAGE_ACCESSED)
  #define PAGE_KERNEL_UNC	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urN linux-2.6.7/include/asm-ppc/a.out.h linux-2.6.7-new/include/asm-ppc/a.out.h
+diff -urN linux-2.6.7/include/asm-ppc/a.out.h linux-2.6.7/include/asm-ppc/a.out.h
 --- linux-2.6.7/include/asm-ppc/a.out.h	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/include/asm-ppc/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc/a.out.h	2004-06-25 17:41:53 -0400
 @@ -2,7 +2,7 @@
  #define __PPC_A_OUT_H__
  
@@ -16900,9 +16764,9 @@ diff -urN linux-2.6.7/include/asm-ppc/a.out.h linux-2.6.7-new/include/asm-ppc/a.
  
  
  struct exec
-diff -urN linux-2.6.7/include/asm-ppc/elf.h linux-2.6.7-new/include/asm-ppc/elf.h
+diff -urN linux-2.6.7/include/asm-ppc/elf.h linux-2.6.7/include/asm-ppc/elf.h
 --- linux-2.6.7/include/asm-ppc/elf.h	2004-06-16 01:18:37 -0400
-+++ linux-2.6.7-new/include/asm-ppc/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc/elf.h	2004-06-25 17:41:53 -0400
 @@ -89,6 +89,17 @@
  
  #define ELF_ET_DYN_BASE         (0x08000000)
@@ -16921,9 +16785,9 @@ diff -urN linux-2.6.7/include/asm-ppc/elf.h linux-2.6.7-new/include/asm-ppc/elf.
  #define USE_ELF_CORE_DUMP
  #define ELF_EXEC_PAGESIZE	4096
  
-diff -urN linux-2.6.7/include/asm-ppc/mman.h linux-2.6.7-new/include/asm-ppc/mman.h
+diff -urN linux-2.6.7/include/asm-ppc/mman.h linux-2.6.7/include/asm-ppc/mman.h
 --- linux-2.6.7/include/asm-ppc/mman.h	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/include/asm-ppc/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc/mman.h	2004-06-25 17:41:53 -0400
 @@ -24,6 +24,10 @@
  #define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x10000		/* do not block on IO */
@@ -16935,9 +16799,9 @@ diff -urN linux-2.6.7/include/asm-ppc/mman.h linux-2.6.7-new/include/asm-ppc/mma
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-ppc/page.h linux-2.6.7-new/include/asm-ppc/page.h
+diff -urN linux-2.6.7/include/asm-ppc/page.h linux-2.6.7/include/asm-ppc/page.h
 --- linux-2.6.7/include/asm-ppc/page.h	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/include/asm-ppc/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc/page.h	2004-06-25 17:41:53 -0400
 @@ -163,5 +163,14 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -16953,9 +16817,9 @@ diff -urN linux-2.6.7/include/asm-ppc/page.h linux-2.6.7-new/include/asm-ppc/pag
 +
  #endif /* __KERNEL__ */
  #endif /* _PPC_PAGE_H */
-diff -urN linux-2.6.7/include/asm-ppc/pgtable.h linux-2.6.7-new/include/asm-ppc/pgtable.h
+diff -urN linux-2.6.7/include/asm-ppc/pgtable.h linux-2.6.7/include/asm-ppc/pgtable.h
 --- linux-2.6.7/include/asm-ppc/pgtable.h	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/include/asm-ppc/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -349,11 +349,21 @@
  
  #define PAGE_NONE	__pgprot(_PAGE_BASE)
@@ -17013,9 +16877,9 @@ diff -urN linux-2.6.7/include/asm-ppc/pgtable.h linux-2.6.7-new/include/asm-ppc/
  #define __S111	PAGE_SHARED_X
  
  #ifndef __ASSEMBLY__
-diff -urN linux-2.6.7/include/asm-ppc64/a.out.h linux-2.6.7-new/include/asm-ppc64/a.out.h
+diff -urN linux-2.6.7/include/asm-ppc64/a.out.h linux-2.6.7/include/asm-ppc64/a.out.h
 --- linux-2.6.7/include/asm-ppc64/a.out.h	2004-06-16 01:18:52 -0400
-+++ linux-2.6.7-new/include/asm-ppc64/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc64/a.out.h	2004-06-25 17:41:53 -0400
 @@ -35,7 +35,7 @@
  /* Give 32-bit user space a full 4G address space to live in. */
  #define STACK_TOP_USER32 (TASK_SIZE_USER32)
@@ -17025,9 +16889,9 @@ diff -urN linux-2.6.7/include/asm-ppc64/a.out.h linux-2.6.7-new/include/asm-ppc6
  		(ppcdebugset(PPCDBG_BINFMT_32ADDR))) ? \
  		STACK_TOP_USER32 : STACK_TOP_USER64)
  
-diff -urN linux-2.6.7/include/asm-ppc64/elf.h linux-2.6.7-new/include/asm-ppc64/elf.h
+diff -urN linux-2.6.7/include/asm-ppc64/elf.h linux-2.6.7/include/asm-ppc64/elf.h
 --- linux-2.6.7/include/asm-ppc64/elf.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-ppc64/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc64/elf.h	2004-06-25 17:41:53 -0400
 @@ -154,6 +154,17 @@
  
  #define ELF_ET_DYN_BASE         (0x08000000)
@@ -17046,9 +16910,9 @@ diff -urN linux-2.6.7/include/asm-ppc64/elf.h linux-2.6.7-new/include/asm-ppc64/
  #ifdef __KERNEL__
  
  /* Common routine for both 32-bit and 64-bit processes */
-diff -urN linux-2.6.7/include/asm-ppc64/mman.h linux-2.6.7-new/include/asm-ppc64/mman.h
+diff -urN linux-2.6.7/include/asm-ppc64/mman.h linux-2.6.7/include/asm-ppc64/mman.h
 --- linux-2.6.7/include/asm-ppc64/mman.h	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/include/asm-ppc64/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc64/mman.h	2004-06-25 17:41:53 -0400
 @@ -29,6 +29,10 @@
  #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
  #define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
@@ -17060,9 +16924,9 @@ diff -urN linux-2.6.7/include/asm-ppc64/mman.h linux-2.6.7-new/include/asm-ppc64
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-ppc64/page.h linux-2.6.7-new/include/asm-ppc64/page.h
+diff -urN linux-2.6.7/include/asm-ppc64/page.h linux-2.6.7/include/asm-ppc64/page.h
 --- linux-2.6.7/include/asm-ppc64/page.h	2004-06-16 01:18:47 -0400
-+++ linux-2.6.7-new/include/asm-ppc64/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc64/page.h	2004-06-25 17:41:53 -0400
 @@ -245,5 +245,14 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -17078,9 +16942,9 @@ diff -urN linux-2.6.7/include/asm-ppc64/page.h linux-2.6.7-new/include/asm-ppc64
 +
  #endif /* __KERNEL__ */
  #endif /* _PPC64_PAGE_H */
-diff -urN linux-2.6.7/include/asm-ppc64/pgtable.h linux-2.6.7-new/include/asm-ppc64/pgtable.h
+diff -urN linux-2.6.7/include/asm-ppc64/pgtable.h linux-2.6.7/include/asm-ppc64/pgtable.h
 --- linux-2.6.7/include/asm-ppc64/pgtable.h	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/include/asm-ppc64/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-ppc64/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -112,6 +112,17 @@
  #define PAGE_COPY_X	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC)
  #define PAGE_READONLY	__pgprot(_PAGE_BASE | _PAGE_USER)
@@ -17131,9 +16995,9 @@ diff -urN linux-2.6.7/include/asm-ppc64/pgtable.h linux-2.6.7-new/include/asm-pp
  #define __S111	PAGE_SHARED_X
  
  #ifndef __ASSEMBLY__
-diff -urN linux-2.6.7/include/asm-sparc/a.out.h linux-2.6.7-new/include/asm-sparc/a.out.h
+diff -urN linux-2.6.7/include/asm-sparc/a.out.h linux-2.6.7/include/asm-sparc/a.out.h
 --- linux-2.6.7/include/asm-sparc/a.out.h	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/include/asm-sparc/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/a.out.h	2004-06-25 17:41:53 -0400
 @@ -91,7 +91,7 @@
  
  #include <asm/page.h>
@@ -17143,9 +17007,9 @@ diff -urN linux-2.6.7/include/asm-sparc/a.out.h linux-2.6.7-new/include/asm-spar
  
  #endif /* __KERNEL__ */
  
-diff -urN linux-2.6.7/include/asm-sparc/elf.h linux-2.6.7-new/include/asm-sparc/elf.h
+diff -urN linux-2.6.7/include/asm-sparc/elf.h linux-2.6.7/include/asm-sparc/elf.h
 --- linux-2.6.7/include/asm-sparc/elf.h	2004-06-16 01:19:51 -0400
-+++ linux-2.6.7-new/include/asm-sparc/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/elf.h	2004-06-25 17:41:53 -0400
 @@ -145,6 +145,17 @@
  
  #define ELF_ET_DYN_BASE         (0x08000000)
@@ -17164,9 +17028,9 @@ diff -urN linux-2.6.7/include/asm-sparc/elf.h linux-2.6.7-new/include/asm-sparc/
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urN linux-2.6.7/include/asm-sparc/mman.h linux-2.6.7-new/include/asm-sparc/mman.h
+diff -urN linux-2.6.7/include/asm-sparc/mman.h linux-2.6.7/include/asm-sparc/mman.h
 --- linux-2.6.7/include/asm-sparc/mman.h	2004-06-16 01:20:04 -0400
-+++ linux-2.6.7-new/include/asm-sparc/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/mman.h	2004-06-25 17:41:53 -0400
 @@ -27,6 +27,10 @@
  #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
  #define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
@@ -17178,9 +17042,9 @@ diff -urN linux-2.6.7/include/asm-sparc/mman.h linux-2.6.7-new/include/asm-sparc
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-sparc/page.h linux-2.6.7-new/include/asm-sparc/page.h
+diff -urN linux-2.6.7/include/asm-sparc/page.h linux-2.6.7/include/asm-sparc/page.h
 --- linux-2.6.7/include/asm-sparc/page.h	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/include/asm-sparc/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/page.h	2004-06-25 17:41:53 -0400
 @@ -176,6 +176,15 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -17197,9 +17061,9 @@ diff -urN linux-2.6.7/include/asm-sparc/page.h linux-2.6.7-new/include/asm-sparc
  #endif /* __KERNEL__ */
  
  #endif /* _SPARC_PAGE_H */
-diff -urN linux-2.6.7/include/asm-sparc/pgtable.h linux-2.6.7-new/include/asm-sparc/pgtable.h
+diff -urN linux-2.6.7/include/asm-sparc/pgtable.h linux-2.6.7/include/asm-sparc/pgtable.h
 --- linux-2.6.7/include/asm-sparc/pgtable.h	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/include/asm-sparc/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -91,6 +91,13 @@
  BTFIXUPDEF_INT(page_shared)
  BTFIXUPDEF_INT(page_copy)
@@ -17231,9 +17095,9 @@ diff -urN linux-2.6.7/include/asm-sparc/pgtable.h linux-2.6.7-new/include/asm-sp
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urN linux-2.6.7/include/asm-sparc/pgtsrmmu.h linux-2.6.7-new/include/asm-sparc/pgtsrmmu.h
+diff -urN linux-2.6.7/include/asm-sparc/pgtsrmmu.h linux-2.6.7/include/asm-sparc/pgtsrmmu.h
 --- linux-2.6.7/include/asm-sparc/pgtsrmmu.h	2004-06-16 01:19:10 -0400
-+++ linux-2.6.7-new/include/asm-sparc/pgtsrmmu.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/pgtsrmmu.h	2004-06-25 17:41:53 -0400
 @@ -114,6 +114,16 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -17251,9 +17115,9 @@ diff -urN linux-2.6.7/include/asm-sparc/pgtsrmmu.h linux-2.6.7-new/include/asm-s
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urN linux-2.6.7/include/asm-sparc/uaccess.h linux-2.6.7-new/include/asm-sparc/uaccess.h
+diff -urN linux-2.6.7/include/asm-sparc/uaccess.h linux-2.6.7/include/asm-sparc/uaccess.h
 --- linux-2.6.7/include/asm-sparc/uaccess.h	2004-06-16 01:19:53 -0400
-+++ linux-2.6.7-new/include/asm-sparc/uaccess.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc/uaccess.h	2004-06-25 17:41:53 -0400
 @@ -41,7 +41,7 @@
   * No one can read/write anything from userland in the kernel space by setting
   * large size and address near to PAGE_OFFSET - a fault will break his intentions.
@@ -17263,9 +17127,9 @@ diff -urN linux-2.6.7/include/asm-sparc/uaccess.h linux-2.6.7-new/include/asm-sp
  #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
  #define __access_ok(addr,size) (__user_ok((addr) & get_fs().seg,(size)))
  #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
-diff -urN linux-2.6.7/include/asm-sparc64/a.out.h linux-2.6.7-new/include/asm-sparc64/a.out.h
+diff -urN linux-2.6.7/include/asm-sparc64/a.out.h linux-2.6.7/include/asm-sparc64/a.out.h
 --- linux-2.6.7/include/asm-sparc64/a.out.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-sparc64/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc64/a.out.h	2004-06-25 17:41:53 -0400
 @@ -95,7 +95,7 @@
  
  #ifdef __KERNEL__
@@ -17275,9 +17139,9 @@ diff -urN linux-2.6.7/include/asm-sparc64/a.out.h linux-2.6.7-new/include/asm-sp
  
  #endif
  
-diff -urN linux-2.6.7/include/asm-sparc64/elf.h linux-2.6.7-new/include/asm-sparc64/elf.h
+diff -urN linux-2.6.7/include/asm-sparc64/elf.h linux-2.6.7/include/asm-sparc64/elf.h
 --- linux-2.6.7/include/asm-sparc64/elf.h	2004-06-16 01:19:10 -0400
-+++ linux-2.6.7-new/include/asm-sparc64/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc64/elf.h	2004-06-25 17:41:53 -0400
 @@ -140,6 +140,16 @@
  #define ELF_ET_DYN_BASE         0x0000010000000000UL
  #endif
@@ -17295,9 +17159,9 @@ diff -urN linux-2.6.7/include/asm-sparc64/elf.h linux-2.6.7-new/include/asm-spar
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urN linux-2.6.7/include/asm-sparc64/mman.h linux-2.6.7-new/include/asm-sparc64/mman.h
+diff -urN linux-2.6.7/include/asm-sparc64/mman.h linux-2.6.7/include/asm-sparc64/mman.h
 --- linux-2.6.7/include/asm-sparc64/mman.h	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/include/asm-sparc64/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc64/mman.h	2004-06-25 17:41:53 -0400
 @@ -27,6 +27,10 @@
  #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
  #define MAP_EXECUTABLE	0x1000		/* mark it as an executable */
@@ -17309,9 +17173,9 @@ diff -urN linux-2.6.7/include/asm-sparc64/mman.h linux-2.6.7-new/include/asm-spa
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-sparc64/page.h linux-2.6.7-new/include/asm-sparc64/page.h
+diff -urN linux-2.6.7/include/asm-sparc64/page.h linux-2.6.7/include/asm-sparc64/page.h
 --- linux-2.6.7/include/asm-sparc64/page.h	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/include/asm-sparc64/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc64/page.h	2004-06-25 17:41:53 -0400
 @@ -168,6 +168,15 @@
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -17328,9 +17192,9 @@ diff -urN linux-2.6.7/include/asm-sparc64/page.h linux-2.6.7-new/include/asm-spa
  #endif /* !(__KERNEL__) */
  
  #endif /* !(_SPARC64_PAGE_H) */
-diff -urN linux-2.6.7/include/asm-sparc64/pgtable.h linux-2.6.7-new/include/asm-sparc64/pgtable.h
+diff -urN linux-2.6.7/include/asm-sparc64/pgtable.h linux-2.6.7/include/asm-sparc64/pgtable.h
 --- linux-2.6.7/include/asm-sparc64/pgtable.h	2004-06-16 01:18:52 -0400
-+++ linux-2.6.7-new/include/asm-sparc64/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-sparc64/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -128,7 +128,8 @@
  
  /* Here are the SpitFire software bits we use in the TTE's. */
@@ -17401,9 +17265,9 @@ diff -urN linux-2.6.7/include/asm-sparc64/pgtable.h linux-2.6.7-new/include/asm-
  #define __S100	PAGE_READONLY
  #define __S101	PAGE_READONLY
  #define __S110	PAGE_SHARED
-diff -urN linux-2.6.7/include/asm-x86_64/a.out.h linux-2.6.7-new/include/asm-x86_64/a.out.h
+diff -urN linux-2.6.7/include/asm-x86_64/a.out.h linux-2.6.7/include/asm-x86_64/a.out.h
 --- linux-2.6.7/include/asm-x86_64/a.out.h	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/a.out.h	2004-06-25 17:41:53 -0400
 @@ -21,7 +21,7 @@
  
  #ifdef __KERNEL__
@@ -17413,9 +17277,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/a.out.h linux-2.6.7-new/include/asm-x86
  #endif
  
  #endif /* __A_OUT_GNU_H__ */
-diff -urN linux-2.6.7/include/asm-x86_64/elf.h linux-2.6.7-new/include/asm-x86_64/elf.h
+diff -urN linux-2.6.7/include/asm-x86_64/elf.h linux-2.6.7/include/asm-x86_64/elf.h
 --- linux-2.6.7/include/asm-x86_64/elf.h	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/elf.h	2004-06-25 17:41:53 -0400
 @@ -89,6 +89,17 @@
  
  #define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
@@ -17434,9 +17298,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/elf.h linux-2.6.7-new/include/asm-x86_6
  /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
     now struct_user_regs, they are different). Assumes current is the process
     getting dumped. */
-diff -urN linux-2.6.7/include/asm-x86_64/mman.h linux-2.6.7-new/include/asm-x86_64/mman.h
+diff -urN linux-2.6.7/include/asm-x86_64/mman.h linux-2.6.7/include/asm-x86_64/mman.h
 --- linux-2.6.7/include/asm-x86_64/mman.h	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/mman.h	2004-06-25 17:41:53 -0400
 @@ -24,6 +24,10 @@
  #define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */
  #define MAP_NONBLOCK	0x10000		/* do not block on IO */
@@ -17448,9 +17312,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/mman.h linux-2.6.7-new/include/asm-x86_
  #define MS_ASYNC	1		/* sync memory asynchronously */
  #define MS_INVALIDATE	2		/* invalidate the caches */
  #define MS_SYNC		4		/* synchronous memory sync */
-diff -urN linux-2.6.7/include/asm-x86_64/page.h linux-2.6.7-new/include/asm-x86_64/page.h
+diff -urN linux-2.6.7/include/asm-x86_64/page.h linux-2.6.7/include/asm-x86_64/page.h
 --- linux-2.6.7/include/asm-x86_64/page.h	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/page.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/page.h	2004-06-25 17:41:53 -0400
 @@ -132,6 +132,16 @@
  
  #define __VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
@@ -17477,9 +17341,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/page.h linux-2.6.7-new/include/asm-x86_
  #define CONFIG_ARCH_GATE_AREA 1	
  
  #ifndef __ASSEMBLY__
-diff -urN linux-2.6.7/include/asm-x86_64/pgalloc.h linux-2.6.7-new/include/asm-x86_64/pgalloc.h
+diff -urN linux-2.6.7/include/asm-x86_64/pgalloc.h linux-2.6.7/include/asm-x86_64/pgalloc.h
 --- linux-2.6.7/include/asm-x86_64/pgalloc.h	2004-06-16 01:19:29 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/pgalloc.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/pgalloc.h	2004-06-25 17:41:53 -0400
 @@ -8,7 +8,7 @@
  #include <linux/mm.h>
  
@@ -17489,9 +17353,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/pgalloc.h linux-2.6.7-new/include/asm-x
  #define pgd_populate(mm, pgd, pmd) \
  		set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pmd)))
  
-diff -urN linux-2.6.7/include/asm-x86_64/pgtable.h linux-2.6.7-new/include/asm-x86_64/pgtable.h
+diff -urN linux-2.6.7/include/asm-x86_64/pgtable.h linux-2.6.7/include/asm-x86_64/pgtable.h
 --- linux-2.6.7/include/asm-x86_64/pgtable.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/asm-x86_64/pgtable.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/asm-x86_64/pgtable.h	2004-06-25 17:41:53 -0400
 @@ -170,6 +170,10 @@
  #define PAGE_COPY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
  #define PAGE_READONLY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)
@@ -17503,9 +17367,9 @@ diff -urN linux-2.6.7/include/asm-x86_64/pgtable.h linux-2.6.7-new/include/asm-x
  #define __PAGE_KERNEL \
  	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX)
  #define __PAGE_KERNEL_EXECUTABLE \
-diff -urN linux-2.6.7/include/linux/a.out.h linux-2.6.7-new/include/linux/a.out.h
+diff -urN linux-2.6.7/include/linux/a.out.h linux-2.6.7/include/linux/a.out.h
 --- linux-2.6.7/include/linux/a.out.h	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/include/linux/a.out.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/a.out.h	2004-06-25 17:41:53 -0400
 @@ -7,6 +7,16 @@
  
  #include <asm/a.out.h>
@@ -17538,9 +17402,9 @@ diff -urN linux-2.6.7/include/linux/a.out.h linux-2.6.7-new/include/linux/a.out.
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urN linux-2.6.7/include/linux/binfmts.h linux-2.6.7-new/include/linux/binfmts.h
+diff -urN linux-2.6.7/include/linux/binfmts.h linux-2.6.7/include/linux/binfmts.h
 --- linux-2.6.7/include/linux/binfmts.h	2004-06-16 01:19:26 -0400
-+++ linux-2.6.7-new/include/linux/binfmts.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/binfmts.h	2004-06-25 17:41:53 -0400
 @@ -36,6 +36,7 @@
  				   of the time same as filename, but could be
  				   different for binfmt_{misc,script} */
@@ -17558,9 +17422,9 @@ diff -urN linux-2.6.7/include/linux/binfmts.h linux-2.6.7-new/include/linux/binf
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_BINFMTS_H */
-diff -urN linux-2.6.7/include/linux/elf.h linux-2.6.7-new/include/linux/elf.h
+diff -urN linux-2.6.7/include/linux/elf.h linux-2.6.7/include/linux/elf.h
 --- linux-2.6.7/include/linux/elf.h	2004-06-16 01:18:59 -0400
-+++ linux-2.6.7-new/include/linux/elf.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/elf.h	2004-06-25 17:41:53 -0400
 @@ -37,6 +37,16 @@
  
  #define PT_GNU_STACK	(PT_LOOS + 0x474e551)
@@ -17632,9 +17496,9 @@ diff -urN linux-2.6.7/include/linux/elf.h linux-2.6.7-new/include/linux/elf.h
  
  #endif
  
-diff -urN linux-2.6.7/include/linux/fs.h linux-2.6.7-new/include/linux/fs.h
+diff -urN linux-2.6.7/include/linux/fs.h linux-2.6.7/include/linux/fs.h
 --- linux-2.6.7/include/linux/fs.h	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/include/linux/fs.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/fs.h	2004-06-25 14:07:21 -0400
 @@ -1192,7 +1192,7 @@
  
  /* fs/open.c */
@@ -17644,9 +17508,9 @@ diff -urN linux-2.6.7/include/linux/fs.h linux-2.6.7-new/include/linux/fs.h
  extern struct file *filp_open(const char *, int, int);
  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
  extern int filp_close(struct file *, fl_owner_t id);
-diff -urN linux-2.6.7/include/linux/gracl.h linux-2.6.7-new/include/linux/gracl.h
+diff -urN linux-2.6.7/include/linux/gracl.h linux-2.6.7/include/linux/gracl.h
 --- linux-2.6.7/include/linux/gracl.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/gracl.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/gracl.h	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,243 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -17891,9 +17755,9 @@ diff -urN linux-2.6.7/include/linux/gracl.h linux-2.6.7-new/include/linux/gracl.
 +
 +#endif
 +
-diff -urN linux-2.6.7/include/linux/gralloc.h linux-2.6.7-new/include/linux/gralloc.h
+diff -urN linux-2.6.7/include/linux/gralloc.h linux-2.6.7/include/linux/gralloc.h
 --- linux-2.6.7/include/linux/gralloc.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/gralloc.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/gralloc.h	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,8 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -17903,9 +17767,9 @@ diff -urN linux-2.6.7/include/linux/gralloc.h linux-2.6.7-new/include/linux/gral
 +void *acl_alloc(unsigned long len);
 +
 +#endif
-diff -urN linux-2.6.7/include/linux/grdefs.h linux-2.6.7-new/include/linux/grdefs.h
+diff -urN linux-2.6.7/include/linux/grdefs.h linux-2.6.7/include/linux/grdefs.h
 --- linux-2.6.7/include/linux/grdefs.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/grdefs.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/grdefs.h	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,116 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -18023,9 +17887,9 @@ diff -urN linux-2.6.7/include/linux/grdefs.h linux-2.6.7-new/include/linux/grdef
 +};
 +
 +#endif
-diff -urN linux-2.6.7/include/linux/grinternal.h linux-2.6.7-new/include/linux/grinternal.h
+diff -urN linux-2.6.7/include/linux/grinternal.h linux-2.6.7/include/linux/grinternal.h
 --- linux-2.6.7/include/linux/grinternal.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/grinternal.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/grinternal.h	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,202 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -18229,9 +18093,9 @@ diff -urN linux-2.6.7/include/linux/grinternal.h linux-2.6.7-new/include/linux/g
 +#endif
 +
 +#endif
-diff -urN linux-2.6.7/include/linux/grmsg.h linux-2.6.7-new/include/linux/grmsg.h
+diff -urN linux-2.6.7/include/linux/grmsg.h linux-2.6.7/include/linux/grmsg.h
 --- linux-2.6.7/include/linux/grmsg.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/grmsg.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/grmsg.h	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,108 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%d/%d gid/egid:%d/%d, parent %.256s[%.16s:%d] uid/euid:%d/%d gid/egid:%d/%d"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%d/%d gid/egid:%d/%d run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%d/%d gid/egid:%d/%d"
@@ -18341,9 +18205,9 @@ diff -urN linux-2.6.7/include/linux/grmsg.h linux-2.6.7-new/include/linux/grmsg.
 +#define GR_SHMR_AUDIT_MSG "shared memory of uid:%d euid:%d removed by " DEFAULTSECMSG
 +#define GR_RESOURCE_MSG "attempted resource overstep by requesting %lu for %.16s against limit %lu by " DEFAULTSECMSG
 +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " DEFAULTSECMSG
-diff -urN linux-2.6.7/include/linux/grsecurity.h linux-2.6.7-new/include/linux/grsecurity.h
+diff -urN linux-2.6.7/include/linux/grsecurity.h linux-2.6.7/include/linux/grsecurity.h
 --- linux-2.6.7/include/linux/grsecurity.h	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/include/linux/grsecurity.h	2004-06-28 11:25:45 -0400
++++ linux-2.6.7/include/linux/grsecurity.h	2004-06-28 11:25:45 -0400
 @@ -0,0 +1,189 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -18534,9 +18398,9 @@ diff -urN linux-2.6.7/include/linux/grsecurity.h linux-2.6.7-new/include/linux/g
 +#endif
 +
 +#endif
-diff -urN linux-2.6.7/include/linux/mm.h linux-2.6.7-new/include/linux/mm.h
+diff -urN linux-2.6.7/include/linux/mm.h linux-2.6.7/include/linux/mm.h
 --- linux-2.6.7/include/linux/mm.h	2004-06-16 01:18:56 -0400
-+++ linux-2.6.7-new/include/linux/mm.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/mm.h	2004-06-25 17:41:53 -0400
 @@ -29,6 +29,7 @@
  #include <asm/pgtable.h>
  #include <asm/processor.h>
@@ -18599,9 +18463,9 @@ diff -urN linux-2.6.7/include/linux/mm.h linux-2.6.7-new/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urN linux-2.6.7/include/linux/mman.h linux-2.6.7-new/include/linux/mman.h
+diff -urN linux-2.6.7/include/linux/mman.h linux-2.6.7/include/linux/mman.h
 --- linux-2.6.7/include/linux/mman.h	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/include/linux/mman.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/mman.h	2004-06-25 17:41:53 -0400
 @@ -56,6 +56,11 @@
  calc_vm_flag_bits(unsigned long flags)
  {
@@ -18614,9 +18478,9 @@ diff -urN linux-2.6.7/include/linux/mman.h linux-2.6.7-new/include/linux/mman.h
  	       _calc_vm_trans(flags, MAP_DENYWRITE,  VM_DENYWRITE ) |
  	       _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
  	       _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    );
-diff -urN linux-2.6.7/include/linux/proc_fs.h linux-2.6.7-new/include/linux/proc_fs.h
+diff -urN linux-2.6.7/include/linux/proc_fs.h linux-2.6.7/include/linux/proc_fs.h
 --- linux-2.6.7/include/linux/proc_fs.h	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/include/linux/proc_fs.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/proc_fs.h	2004-06-25 14:07:21 -0400
 @@ -221,7 +221,7 @@
  
  #endif /* CONFIG_PROC_FS */
@@ -18626,9 +18490,9 @@ diff -urN linux-2.6.7/include/linux/proc_fs.h linux-2.6.7-new/include/linux/proc
  static inline void kclist_add(struct kcore_list *new, void *addr, size_t size)
  {
  }
-diff -urN linux-2.6.7/include/linux/random.h linux-2.6.7-new/include/linux/random.h
+diff -urN linux-2.6.7/include/linux/random.h linux-2.6.7/include/linux/random.h
 --- linux-2.6.7/include/linux/random.h	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/include/linux/random.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/random.h	2004-06-25 17:41:53 -0400
 @@ -69,6 +69,8 @@
  
  extern __u32 secure_ipv6_id(__u32 *daddr);
@@ -18638,9 +18502,9 @@ diff -urN linux-2.6.7/include/linux/random.h linux-2.6.7-new/include/linux/rando
  #ifndef MODULE
  extern struct file_operations random_fops, urandom_fops;
  #endif
-diff -urN linux-2.6.7/include/linux/sched.h linux-2.6.7-new/include/linux/sched.h
+diff -urN linux-2.6.7/include/linux/sched.h linux-2.6.7/include/linux/sched.h
 --- linux-2.6.7/include/linux/sched.h	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/include/linux/sched.h	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/include/linux/sched.h	2004-06-25 17:41:53 -0400
 @@ -31,6 +31,7 @@
  #include <linux/percpu.h>
  
@@ -18755,9 +18619,9 @@ diff -urN linux-2.6.7/include/linux/sched.h linux-2.6.7-new/include/linux/sched.
  		current->flags |= PF_SUPERPRIV;
  		return 1;
  	}
-diff -urN linux-2.6.7/include/linux/shm.h linux-2.6.7-new/include/linux/shm.h
+diff -urN linux-2.6.7/include/linux/shm.h linux-2.6.7/include/linux/shm.h
 --- linux-2.6.7/include/linux/shm.h	2004-06-16 01:19:43 -0400
-+++ linux-2.6.7-new/include/linux/shm.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/linux/shm.h	2004-06-25 14:07:21 -0400
 @@ -84,6 +84,10 @@
  	time_t			shm_ctim;
  	pid_t			shm_cprid;
@@ -18769,9 +18633,9 @@ diff -urN linux-2.6.7/include/linux/shm.h linux-2.6.7-new/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urN linux-2.6.7/include/linux/sysctl.h linux-2.6.7-new/include/linux/sysctl.h
+diff -urN linux-2.6.7/include/linux/sysctl.h linux-2.6.7/include/linux/sysctl.h
 --- linux-2.6.7/include/linux/sysctl.h	2004-06-16 01:19:35 -0400
-+++ linux-2.6.7-new/include/linux/sysctl.h	2004-06-25 17:47:51 -0400
++++ linux-2.6.7/include/linux/sysctl.h	2004-06-25 17:47:51 -0400
 @@ -133,7 +133,20 @@
  	KERN_NGROUPS_MAX=63,	/* int: NGROUPS_MAX */
  	KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
@@ -18793,9 +18657,9 @@ diff -urN linux-2.6.7/include/linux/sysctl.h linux-2.6.7-new/include/linux/sysct
  
  
  /* CTL_VM names: */
-diff -urN linux-2.6.7/include/net/ip.h linux-2.6.7-new/include/net/ip.h
+diff -urN linux-2.6.7/include/net/ip.h linux-2.6.7/include/net/ip.h
 --- linux-2.6.7/include/net/ip.h	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/include/net/ip.h	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/include/net/ip.h	2004-06-25 14:07:21 -0400
 @@ -33,6 +33,11 @@
  #include <net/route.h>
  #include <net/arp.h>
@@ -18822,9 +18686,9 @@ diff -urN linux-2.6.7/include/net/ip.h linux-2.6.7-new/include/net/ip.h
  	if (iph->frag_off & htons(IP_DF)) {
  		/* This is only to work around buggy Windows95/2000
  		 * VJ compression implementations.  If the ID field
-diff -urN linux-2.6.7/init/Kconfig linux-2.6.7-new/init/Kconfig
+diff -urN linux-2.6.7/init/Kconfig linux-2.6.7/init/Kconfig
 --- linux-2.6.7/init/Kconfig	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/init/Kconfig	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/init/Kconfig	2004-06-25 14:07:21 -0400
 @@ -230,6 +230,7 @@
  config KALLSYMS
  	 bool "Load all symbols for debugging/kksymoops" if EMBEDDED
@@ -18833,9 +18697,9 @@ diff -urN linux-2.6.7/init/Kconfig linux-2.6.7-new/init/Kconfig
  	 help
  	   Say Y here to let the kernel print out symbolic crash information and
  	   symbolic stack backtraces. This increases the size of the kernel
-diff -urN linux-2.6.7/init/do_mounts.c linux-2.6.7-new/init/do_mounts.c
+diff -urN linux-2.6.7/init/do_mounts.c linux-2.6.7/init/do_mounts.c
 --- linux-2.6.7/init/do_mounts.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/init/do_mounts.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/init/do_mounts.c	2004-06-25 14:07:21 -0400
 @@ -291,6 +291,7 @@
  			case -EINVAL:
  				continue;
@@ -18844,9 +18708,9 @@ diff -urN linux-2.6.7/init/do_mounts.c linux-2.6.7-new/init/do_mounts.c
  	        /*
  		 * Allow the user to distinguish between failed sys_open
  		 * and bad superblock on root device.
-diff -urN linux-2.6.7/init/main.c linux-2.6.7-new/init/main.c
+diff -urN linux-2.6.7/init/main.c linux-2.6.7/init/main.c
 --- linux-2.6.7/init/main.c	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/init/main.c	2004-06-25 17:33:13 -0400
++++ linux-2.6.7/init/main.c	2004-06-25 17:33:13 -0400
 @@ -91,6 +91,7 @@
  extern void populate_rootfs(void);
  extern void driver_init(void);
@@ -18863,9 +18727,9 @@ diff -urN linux-2.6.7/init/main.c linux-2.6.7-new/init/main.c
  
  	/*
  	 * Ok, we have completed the initial bootup, and
-diff -urN linux-2.6.7/ipc/msg.c linux-2.6.7-new/ipc/msg.c
+diff -urN linux-2.6.7/ipc/msg.c linux-2.6.7/ipc/msg.c
 --- linux-2.6.7/ipc/msg.c	2004-06-16 01:18:38 -0400
-+++ linux-2.6.7-new/ipc/msg.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/ipc/msg.c	2004-06-25 14:07:21 -0400
 @@ -24,6 +24,7 @@
  #include <linux/list.h>
  #include <linux/security.h>
@@ -18893,9 +18757,9 @@ diff -urN linux-2.6.7/ipc/msg.c linux-2.6.7-new/ipc/msg.c
  		freeque (msq, msqid); 
  		break;
  	}
-diff -urN linux-2.6.7/ipc/sem.c linux-2.6.7-new/ipc/sem.c
+diff -urN linux-2.6.7/ipc/sem.c linux-2.6.7/ipc/sem.c
 --- linux-2.6.7/ipc/sem.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/ipc/sem.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/ipc/sem.c	2004-06-25 14:07:21 -0400
 @@ -71,6 +71,7 @@
  #include <linux/time.h>
  #include <linux/smp_lock.h>
@@ -18923,9 +18787,9 @@ diff -urN linux-2.6.7/ipc/sem.c linux-2.6.7-new/ipc/sem.c
  		freeary(sma, semid);
  		err = 0;
  		break;
-diff -urN linux-2.6.7/ipc/shm.c linux-2.6.7-new/ipc/shm.c
+diff -urN linux-2.6.7/ipc/shm.c linux-2.6.7/ipc/shm.c
 --- linux-2.6.7/ipc/shm.c	2004-06-16 01:19:23 -0400
-+++ linux-2.6.7-new/ipc/shm.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/ipc/shm.c	2004-06-25 14:07:21 -0400
 @@ -26,6 +26,7 @@
  #include <linux/proc_fs.h>
  #include <linux/shmem_fs.h>
@@ -19005,9 +18869,9 @@ diff -urN linux-2.6.7/ipc/shm.c linux-2.6.7-new/ipc/shm.c
  	shm_unlock(shp);
  
  	down_write(&current->mm->mmap_sem);
-diff -urN linux-2.6.7/kernel/capability.c linux-2.6.7-new/kernel/capability.c
+diff -urN linux-2.6.7/kernel/capability.c linux-2.6.7/kernel/capability.c
 --- linux-2.6.7/kernel/capability.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/kernel/capability.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/capability.c	2004-06-25 14:07:21 -0400
 @@ -10,6 +10,7 @@
  #include <linux/mm.h>
  #include <linux/module.h>
@@ -19028,9 +18892,9 @@ diff -urN linux-2.6.7/kernel/capability.c linux-2.6.7-new/kernel/capability.c
       ret = -EPERM;
  
       if (security_capset_check(target, &effective, &inheritable, &permitted))
-diff -urN linux-2.6.7/kernel/configs.c linux-2.6.7-new/kernel/configs.c
+diff -urN linux-2.6.7/kernel/configs.c linux-2.6.7/kernel/configs.c
 --- linux-2.6.7/kernel/configs.c	2004-06-16 01:19:12 -0400
-+++ linux-2.6.7-new/kernel/configs.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/configs.c	2004-06-25 14:07:21 -0400
 @@ -78,8 +78,16 @@
  	struct proc_dir_entry *entry;
  
@@ -19048,9 +18912,9 @@ diff -urN linux-2.6.7/kernel/configs.c linux-2.6.7-new/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urN linux-2.6.7/kernel/exit.c linux-2.6.7-new/kernel/exit.c
+diff -urN linux-2.6.7/kernel/exit.c linux-2.6.7/kernel/exit.c
 --- linux-2.6.7/kernel/exit.c	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/kernel/exit.c	2004-06-25 17:30:50 -0400
++++ linux-2.6.7/kernel/exit.c	2004-06-25 17:30:50 -0400
 @@ -23,6 +23,11 @@
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
@@ -19118,9 +18982,9 @@ diff -urN linux-2.6.7/kernel/exit.c linux-2.6.7-new/kernel/exit.c
  	__exit_mm(tsk);
  
  	exit_sem(tsk);
-diff -urN linux-2.6.7/kernel/fork.c linux-2.6.7-new/kernel/fork.c
+diff -urN linux-2.6.7/kernel/fork.c linux-2.6.7/kernel/fork.c
 --- linux-2.6.7/kernel/fork.c	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/kernel/fork.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/kernel/fork.c	2004-06-25 17:41:53 -0400
 @@ -36,6 +36,7 @@
  #include <linux/mount.h>
  #include <linux/audit.h>
@@ -19167,9 +19031,9 @@ diff -urN linux-2.6.7/kernel/fork.c linux-2.6.7-new/kernel/fork.c
  	goto fork_out;
  }
  
-diff -urN linux-2.6.7/kernel/kallsyms.c linux-2.6.7-new/kernel/kallsyms.c
+diff -urN linux-2.6.7/kernel/kallsyms.c linux-2.6.7/kernel/kallsyms.c
 --- linux-2.6.7/kernel/kallsyms.c	2004-06-16 01:20:19 -0400
-+++ linux-2.6.7-new/kernel/kallsyms.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/kallsyms.c	2004-06-25 14:07:21 -0400
 @@ -313,7 +313,15 @@
  {
  	struct proc_dir_entry *entry;
@@ -19186,9 +19050,9 @@ diff -urN linux-2.6.7/kernel/kallsyms.c linux-2.6.7-new/kernel/kallsyms.c
  	if (entry)
  		entry->proc_fops = &kallsyms_operations;
  	return 0;
-diff -urN linux-2.6.7/kernel/pid.c linux-2.6.7-new/kernel/pid.c
+diff -urN linux-2.6.7/kernel/pid.c linux-2.6.7/kernel/pid.c
 --- linux-2.6.7/kernel/pid.c	2004-06-16 01:19:36 -0400
-+++ linux-2.6.7-new/kernel/pid.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/pid.c	2004-06-25 14:07:21 -0400
 @@ -25,6 +25,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h>
@@ -19230,9 +19094,9 @@ diff -urN linux-2.6.7/kernel/pid.c linux-2.6.7-new/kernel/pid.c
  }
  
  EXPORT_SYMBOL(find_task_by_pid);
-diff -urN linux-2.6.7/kernel/printk.c linux-2.6.7-new/kernel/printk.c
+diff -urN linux-2.6.7/kernel/printk.c linux-2.6.7/kernel/printk.c
 --- linux-2.6.7/kernel/printk.c	2004-06-16 01:20:26 -0400
-+++ linux-2.6.7-new/kernel/printk.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/printk.c	2004-06-25 14:07:21 -0400
 @@ -30,6 +30,7 @@
  #include <linux/smp.h>
  #include <linux/security.h>
@@ -19253,9 +19117,9 @@ diff -urN linux-2.6.7/kernel/printk.c linux-2.6.7-new/kernel/printk.c
  	error = security_syslog(type);
  	if (error)
  		return error;
-diff -urN linux-2.6.7/kernel/resource.c linux-2.6.7-new/kernel/resource.c
+diff -urN linux-2.6.7/kernel/resource.c linux-2.6.7/kernel/resource.c
 --- linux-2.6.7/kernel/resource.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/kernel/resource.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/resource.c	2004-06-25 14:07:21 -0400
 @@ -134,10 +134,27 @@
  {
  	struct proc_dir_entry *entry;
@@ -19284,9 +19148,9 @@ diff -urN linux-2.6.7/kernel/resource.c linux-2.6.7-new/kernel/resource.c
  	if (entry)
  		entry->proc_fops = &proc_iomem_operations;
  	return 0;
-diff -urN linux-2.6.7/kernel/sched.c linux-2.6.7-new/kernel/sched.c
+diff -urN linux-2.6.7/kernel/sched.c linux-2.6.7/kernel/sched.c
 --- linux-2.6.7/kernel/sched.c	2004-06-16 01:19:51 -0400
-+++ linux-2.6.7-new/kernel/sched.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/sched.c	2004-06-25 14:07:21 -0400
 @@ -40,6 +40,7 @@
  #include <linux/cpu.h>
  #include <linux/percpu.h>
@@ -19304,9 +19168,9 @@ diff -urN linux-2.6.7/kernel/sched.c linux-2.6.7-new/kernel/sched.c
  	}
  	if (increment > 40)
  		increment = 40;
-diff -urN linux-2.6.7/kernel/signal.c linux-2.6.7-new/kernel/signal.c
+diff -urN linux-2.6.7/kernel/signal.c linux-2.6.7/kernel/signal.c
 --- linux-2.6.7/kernel/signal.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/kernel/signal.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/signal.c	2004-06-25 14:07:21 -0400
 @@ -21,6 +21,7 @@
  #include <linux/binfmts.h>
  #include <linux/security.h>
@@ -19391,9 +19255,9 @@ diff -urN linux-2.6.7/kernel/signal.c linux-2.6.7-new/kernel/signal.c
  			}
  		}
  		read_unlock(&tasklist_lock);
-diff -urN linux-2.6.7/kernel/sys.c linux-2.6.7-new/kernel/sys.c
+diff -urN linux-2.6.7/kernel/sys.c linux-2.6.7/kernel/sys.c
 --- linux-2.6.7/kernel/sys.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/kernel/sys.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/sys.c	2004-06-25 14:07:21 -0400
 @@ -23,6 +23,7 @@
  #include <linux/security.h>
  #include <linux/dcookies.h>
@@ -19467,9 +19331,9 @@ diff -urN linux-2.6.7/kernel/sys.c linux-2.6.7-new/kernel/sys.c
  	if (sgid != (gid_t) -1)
  		current->sgid = sgid;
  	return 0;
-diff -urN linux-2.6.7/kernel/sysctl.c linux-2.6.7-new/kernel/sysctl.c
+diff -urN linux-2.6.7/kernel/sysctl.c linux-2.6.7/kernel/sysctl.c
 --- linux-2.6.7/kernel/sysctl.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/kernel/sysctl.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/kernel/sysctl.c	2004-06-25 17:41:53 -0400
 @@ -46,6 +46,14 @@
  #endif
  
@@ -19572,9 +19436,9 @@ diff -urN linux-2.6.7/kernel/sysctl.c linux-2.6.7-new/kernel/sysctl.c
  			error = do_sysctl_strategy(table, name, nlen,
  						   oldval, oldlenp,
  						   newval, newlen, context);
-diff -urN linux-2.6.7/kernel/time.c linux-2.6.7-new/kernel/time.c
+diff -urN linux-2.6.7/kernel/time.c linux-2.6.7/kernel/time.c
 --- linux-2.6.7/kernel/time.c	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/kernel/time.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/time.c	2004-06-25 14:07:21 -0400
 @@ -28,6 +28,7 @@
  #include <linux/timex.h>
  #include <linux/errno.h>
@@ -19602,9 +19466,9 @@ diff -urN linux-2.6.7/kernel/time.c linux-2.6.7-new/kernel/time.c
  	return do_sys_settimeofday(tv ? &new_ts : NULL, tz ? &new_tz : NULL);
  }
  
-diff -urN linux-2.6.7/kernel/timer.c linux-2.6.7-new/kernel/timer.c
+diff -urN linux-2.6.7/kernel/timer.c linux-2.6.7/kernel/timer.c
 --- linux-2.6.7/kernel/timer.c	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/kernel/timer.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/kernel/timer.c	2004-06-25 14:07:21 -0400
 @@ -31,6 +31,7 @@
  #include <linux/time.h>
  #include <linux/jiffies.h>
@@ -19623,9 +19487,9 @@ diff -urN linux-2.6.7/kernel/timer.c linux-2.6.7-new/kernel/timer.c
  	if (psecs / HZ > p->rlim[RLIMIT_CPU].rlim_cur) {
  		/* Send SIGXCPU every second.. */
  		if (!(psecs % HZ))
-diff -urN linux-2.6.7/mm/filemap.c linux-2.6.7-new/mm/filemap.c
+diff -urN linux-2.6.7/mm/filemap.c linux-2.6.7/mm/filemap.c
 --- linux-2.6.7/mm/filemap.c	2004-06-16 01:19:12 -0400
-+++ linux-2.6.7-new/mm/filemap.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/filemap.c	2004-06-25 17:41:53 -0400
 @@ -27,6 +27,8 @@
  #include <linux/pagevec.h>
  #include <linux/blkdev.h>
@@ -19656,9 +19520,9 @@ diff -urN linux-2.6.7/mm/filemap.c linux-2.6.7-new/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urN linux-2.6.7/mm/madvise.c linux-2.6.7-new/mm/madvise.c
+diff -urN linux-2.6.7/mm/madvise.c linux-2.6.7/mm/madvise.c
 --- linux-2.6.7/mm/madvise.c	2004-06-16 01:19:02 -0400
-+++ linux-2.6.7-new/mm/madvise.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/madvise.c	2004-06-25 17:41:53 -0400
 @@ -13,8 +13,42 @@
   * We can potentially split a vm area into separate
   * areas, each area with its own behavior.
@@ -19702,9 +19566,9 @@ diff -urN linux-2.6.7/mm/madvise.c linux-2.6.7-new/mm/madvise.c
  {
  	struct mm_struct * mm = vma->vm_mm;
  	int error;
-diff -urN linux-2.6.7/mm/memory.c linux-2.6.7-new/mm/memory.c
+diff -urN linux-2.6.7/mm/memory.c linux-2.6.7/mm/memory.c
 --- linux-2.6.7/mm/memory.c	2004-06-16 01:19:22 -0400
-+++ linux-2.6.7-new/mm/memory.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/memory.c	2004-06-25 17:41:53 -0400
 @@ -46,6 +46,7 @@
  #include <linux/rmap.h>
  #include <linux/module.h>
@@ -19930,9 +19794,9 @@ diff -urN linux-2.6.7/mm/memory.c linux-2.6.7-new/mm/memory.c
  	pmd = pmd_alloc(mm, pgd, address);
  
  	if (pmd) {
-diff -urN linux-2.6.7/mm/mlock.c linux-2.6.7-new/mm/mlock.c
+diff -urN linux-2.6.7/mm/mlock.c linux-2.6.7/mm/mlock.c
 --- linux-2.6.7/mm/mlock.c	2004-06-16 01:18:57 -0400
-+++ linux-2.6.7-new/mm/mlock.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/mlock.c	2004-06-25 17:41:53 -0400
 @@ -7,11 +7,43 @@
  
  #include <linux/mman.h>
@@ -20028,9 +19892,9 @@ diff -urN linux-2.6.7/mm/mlock.c linux-2.6.7-new/mm/mlock.c
  	if (current->mm->total_vm <= lock_limit)
  		ret = do_mlockall(flags);
  out:
-diff -urN linux-2.6.7/mm/mmap.c linux-2.6.7-new/mm/mmap.c
+diff -urN linux-2.6.7/mm/mmap.c linux-2.6.7/mm/mmap.c
 --- linux-2.6.7/mm/mmap.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/mm/mmap.c	2004-06-25 22:44:53 -0400
++++ linux-2.6.7/mm/mmap.c	2004-06-25 22:44:53 -0400
 @@ -23,6 +23,7 @@
  #include <linux/mount.h>
  #include <linux/mempolicy.h>
@@ -20752,9 +20616,9 @@ diff -urN linux-2.6.7/mm/mmap.c linux-2.6.7-new/mm/mmap.c
  	return addr;
  }
  
-diff -urN linux-2.6.7/mm/mprotect.c linux-2.6.7-new/mm/mprotect.c
+diff -urN linux-2.6.7/mm/mprotect.c linux-2.6.7/mm/mprotect.c
 --- linux-2.6.7/mm/mprotect.c	2004-06-16 01:20:27 -0400
-+++ linux-2.6.7-new/mm/mprotect.c	2004-06-28 10:50:16 -0400
++++ linux-2.6.7/mm/mprotect.c	2004-06-28 10:50:16 -0400
 @@ -17,12 +17,19 @@
  #include <linux/highmem.h>
  #include <linux/security.h>
@@ -21015,15 +20879,15 @@ diff -urN linux-2.6.7/mm/mprotect.c linux-2.6.7-new/mm/mprotect.c
  out:
  	up_write(&current->mm->mmap_sem);
  	return error;
-diff -urN linux-2.6.7/mm/mremap.c linux-2.6.7-new/mm/mremap.c
+diff -urN linux-2.6.7/mm/mremap.c linux-2.6.7/mm/mremap.c
 --- linux-2.6.7/mm/mremap.c	2004-06-16 01:19:35 -0400
-+++ linux-2.6.7-new/mm/mremap.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/mremap.c	2004-07-01 16:33:43 -0400
 @@ -129,6 +129,12 @@
  			if (dst) {
  				pte_t pte;
  				pte = ptep_clear_flush(vma, old_addr, src);
 +
-+#ifdef CONFIG_PAX_PAGEEXEC
++#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
 +				if ((current->flags & PF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_EXEC))
 +					pte_exprotect(pte);
 +#endif
@@ -21112,9 +20976,9 @@ diff -urN linux-2.6.7/mm/mremap.c linux-2.6.7-new/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urN linux-2.6.7/mm/rmap.c linux-2.6.7-new/mm/rmap.c
+diff -urN linux-2.6.7/mm/rmap.c linux-2.6.7/mm/rmap.c
 --- linux-2.6.7/mm/rmap.c	2004-06-16 01:20:03 -0400
-+++ linux-2.6.7-new/mm/rmap.c	2004-06-25 17:41:53 -0400
++++ linux-2.6.7/mm/rmap.c	2004-06-25 17:41:53 -0400
 @@ -83,6 +83,19 @@
  			list_add(&vma->anon_vma_node, &anon_vma->head);
  			allocated = NULL;
@@ -21135,9 +20999,9 @@ diff -urN linux-2.6.7/mm/rmap.c linux-2.6.7-new/mm/rmap.c
  		spin_unlock(&mm->page_table_lock);
  		if (unlikely(allocated))
  			anon_vma_free(allocated);
-diff -urN linux-2.6.7/net/ipv4/af_inet.c linux-2.6.7-new/net/ipv4/af_inet.c
+diff -urN linux-2.6.7/net/ipv4/af_inet.c linux-2.6.7/net/ipv4/af_inet.c
 --- linux-2.6.7/net/ipv4/af_inet.c	2004-06-16 01:18:58 -0400
-+++ linux-2.6.7-new/net/ipv4/af_inet.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/af_inet.c	2004-06-25 14:07:21 -0400
 @@ -87,6 +87,7 @@
  #include <linux/init.h>
  #include <linux/poll.h>
@@ -21160,9 +21024,9 @@ diff -urN linux-2.6.7/net/ipv4/af_inet.c linux-2.6.7-new/net/ipv4/af_inet.c
  
  	sock_init_data(sock, sk);
  	sk_set_owner(sk, THIS_MODULE);
-diff -urN linux-2.6.7/net/ipv4/ip_output.c linux-2.6.7-new/net/ipv4/ip_output.c
+diff -urN linux-2.6.7/net/ipv4/ip_output.c linux-2.6.7/net/ipv4/ip_output.c
 --- linux-2.6.7/net/ipv4/ip_output.c	2004-06-16 01:20:22 -0400
-+++ linux-2.6.7-new/net/ipv4/ip_output.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/ip_output.c	2004-06-25 14:07:21 -0400
 @@ -64,6 +64,7 @@
  #include <linux/proc_fs.h>
  #include <linux/stat.h>
@@ -21184,9 +21048,9 @@ diff -urN linux-2.6.7/net/ipv4/ip_output.c linux-2.6.7-new/net/ipv4/ip_output.c
  	if (!df) {
  		__ip_select_ident(iph, &rt->u.dst, 0);
  	} else {
-diff -urN linux-2.6.7/net/ipv4/netfilter/Kconfig linux-2.6.7-new/net/ipv4/netfilter/Kconfig
+diff -urN linux-2.6.7/net/ipv4/netfilter/Kconfig linux-2.6.7/net/ipv4/netfilter/Kconfig
 --- linux-2.6.7/net/ipv4/netfilter/Kconfig	2004-06-16 01:19:52 -0400
-+++ linux-2.6.7-new/net/ipv4/netfilter/Kconfig	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/netfilter/Kconfig	2004-06-25 14:07:21 -0400
 @@ -225,6 +225,21 @@
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -21209,9 +21073,9 @@ diff -urN linux-2.6.7/net/ipv4/netfilter/Kconfig linux-2.6.7-new/net/ipv4/netfil
  config IP_NF_MATCH_HELPER
  	tristate "Helper match support"
  	depends on IP_NF_CONNTRACK && IP_NF_IPTABLES
-diff -urN linux-2.6.7/net/ipv4/netfilter/Makefile linux-2.6.7-new/net/ipv4/netfilter/Makefile
+diff -urN linux-2.6.7/net/ipv4/netfilter/Makefile linux-2.6.7/net/ipv4/netfilter/Makefile
 --- linux-2.6.7/net/ipv4/netfilter/Makefile	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/net/ipv4/netfilter/Makefile	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/netfilter/Makefile	2004-06-25 14:07:21 -0400
 @@ -65,6 +65,8 @@
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
@@ -21221,9 +21085,9 @@ diff -urN linux-2.6.7/net/ipv4/netfilter/Makefile linux-2.6.7-new/net/ipv4/netfi
  obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt_physdev.o
  
  # targets
-diff -urN linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c linux-2.6.7-new/net/ipv4/netfilter/ipt_stealth.c
+diff -urN linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c
 --- linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c	1969-12-31 19:00:00 -0500
-+++ linux-2.6.7-new/net/ipv4/netfilter/ipt_stealth.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c	2004-06-25 14:07:21 -0400
 @@ -0,0 +1,112 @@
 +/* Kernel module to add stealth support.
 + *
@@ -21337,9 +21201,9 @@ diff -urN linux-2.6.7/net/ipv4/netfilter/ipt_stealth.c linux-2.6.7-new/net/ipv4/
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.6.7/net/ipv4/tcp_ipv4.c linux-2.6.7-new/net/ipv4/tcp_ipv4.c
+diff -urN linux-2.6.7/net/ipv4/tcp_ipv4.c linux-2.6.7/net/ipv4/tcp_ipv4.c
 --- linux-2.6.7/net/ipv4/tcp_ipv4.c	2004-06-16 01:19:10 -0400
-+++ linux-2.6.7-new/net/ipv4/tcp_ipv4.c	2004-06-28 16:43:12 -0400
++++ linux-2.6.7/net/ipv4/tcp_ipv4.c	2004-06-28 16:43:12 -0400
 @@ -62,6 +62,7 @@
  #include <linux/jhash.h>
  #include <linux/init.h>
@@ -21447,9 +21311,9 @@ diff -urN linux-2.6.7/net/ipv4/tcp_ipv4.c linux-2.6.7-new/net/ipv4/tcp_ipv4.c
  
  	tcp_sync_mss(newsk, dst_pmtu(dst));
  	newtp->advmss = dst_metric(dst, RTAX_ADVMSS);
-diff -urN linux-2.6.7/net/ipv4/udp.c linux-2.6.7-new/net/ipv4/udp.c
+diff -urN linux-2.6.7/net/ipv4/udp.c linux-2.6.7/net/ipv4/udp.c
 --- linux-2.6.7/net/ipv4/udp.c	2004-06-16 01:18:59 -0400
-+++ linux-2.6.7-new/net/ipv4/udp.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/ipv4/udp.c	2004-06-25 14:07:21 -0400
 @@ -100,6 +100,7 @@
  #include <linux/skbuff.h>
  #include <linux/proc_fs.h>
@@ -21516,9 +21380,9 @@ diff -urN linux-2.6.7/net/ipv4/udp.c linux-2.6.7-new/net/ipv4/udp.c
  
  	sk_dst_set(sk, &rt->u.dst);
  	return(0);
-diff -urN linux-2.6.7/net/socket.c linux-2.6.7-new/net/socket.c
+diff -urN linux-2.6.7/net/socket.c linux-2.6.7/net/socket.c
 --- linux-2.6.7/net/socket.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/net/socket.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/socket.c	2004-06-25 14:07:21 -0400
 @@ -81,6 +81,7 @@
  #include <linux/syscalls.h>
  #include <linux/compat.h>
@@ -21638,9 +21502,9 @@ diff -urN linux-2.6.7/net/socket.c linux-2.6.7-new/net/socket.c
  	return err;
  }
  
-diff -urN linux-2.6.7/net/sunrpc/xprt.c linux-2.6.7-new/net/sunrpc/xprt.c
+diff -urN linux-2.6.7/net/sunrpc/xprt.c linux-2.6.7/net/sunrpc/xprt.c
 --- linux-2.6.7/net/sunrpc/xprt.c	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/net/sunrpc/xprt.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/sunrpc/xprt.c	2004-06-25 14:07:21 -0400
 @@ -58,6 +58,7 @@
  #include <linux/file.h>
  #include <linux/workqueue.h>
@@ -21662,9 +21526,9 @@ diff -urN linux-2.6.7/net/sunrpc/xprt.c linux-2.6.7-new/net/sunrpc/xprt.c
  	return xprt->xid++;
  }
  
-diff -urN linux-2.6.7/net/unix/af_unix.c linux-2.6.7-new/net/unix/af_unix.c
+diff -urN linux-2.6.7/net/unix/af_unix.c linux-2.6.7/net/unix/af_unix.c
 --- linux-2.6.7/net/unix/af_unix.c	2004-06-16 01:19:37 -0400
-+++ linux-2.6.7-new/net/unix/af_unix.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/net/unix/af_unix.c	2004-06-25 14:07:21 -0400
 @@ -118,6 +118,7 @@
  #include <linux/mount.h>
  #include <net/checksum.h>
@@ -21729,9 +21593,9 @@ diff -urN linux-2.6.7/net/unix/af_unix.c linux-2.6.7-new/net/unix/af_unix.c
  		list = &unix_socket_table[addr->hash];
  	} else {
  		list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-diff -urN linux-2.6.7/security/Kconfig linux-2.6.7-new/security/Kconfig
+diff -urN linux-2.6.7/security/Kconfig linux-2.6.7/security/Kconfig
 --- linux-2.6.7/security/Kconfig	2004-06-16 01:19:42 -0400
-+++ linux-2.6.7-new/security/Kconfig	2004-06-28 11:27:47 -0400
++++ linux-2.6.7/security/Kconfig	2004-06-28 11:27:47 -0400
 @@ -4,6 +4,422 @@
  
  menu "Security options"
@@ -22155,9 +22019,9 @@ diff -urN linux-2.6.7/security/Kconfig linux-2.6.7-new/security/Kconfig
  config SECURITY
  	bool "Enable different security models"
  	help
-diff -urN linux-2.6.7/security/commoncap.c linux-2.6.7-new/security/commoncap.c
+diff -urN linux-2.6.7/security/commoncap.c linux-2.6.7/security/commoncap.c
 --- linux-2.6.7/security/commoncap.c	2004-06-16 01:19:13 -0400
-+++ linux-2.6.7-new/security/commoncap.c	2004-06-25 14:33:47 -0400
++++ linux-2.6.7/security/commoncap.c	2004-06-25 14:33:47 -0400
 @@ -23,11 +23,12 @@
  #include <linux/ptrace.h>
  #include <linux/xattr.h>
@@ -22222,9 +22086,9 @@ diff -urN linux-2.6.7/security/commoncap.c linux-2.6.7-new/security/commoncap.c
  			n -= n / 32;
  		free += n;
  
-diff -urN linux-2.6.7/security/dummy.c linux-2.6.7-new/security/dummy.c
+diff -urN linux-2.6.7/security/dummy.c linux-2.6.7/security/dummy.c
 --- linux-2.6.7/security/dummy.c	2004-06-16 01:19:01 -0400
-+++ linux-2.6.7-new/security/dummy.c	2004-06-25 14:35:43 -0400
++++ linux-2.6.7/security/dummy.c	2004-06-25 14:35:43 -0400
 @@ -28,6 +28,7 @@
  #include <linux/hugetlb.h>
  #include <linux/ptrace.h>
@@ -22247,9 +22111,9 @@ diff -urN linux-2.6.7/security/dummy.c linux-2.6.7-new/security/dummy.c
  }
  
  static int dummy_bprm_set_security (struct linux_binprm *bprm)
-diff -urN linux-2.6.7/security/security.c linux-2.6.7-new/security/security.c
+diff -urN linux-2.6.7/security/security.c linux-2.6.7/security/security.c
 --- linux-2.6.7/security/security.c	2004-06-16 01:18:38 -0400
-+++ linux-2.6.7-new/security/security.c	2004-06-25 14:07:21 -0400
++++ linux-2.6.7/security/security.c	2004-06-25 14:07:21 -0400
 @@ -206,4 +206,5 @@
  EXPORT_SYMBOL_GPL(mod_reg_security);
  EXPORT_SYMBOL_GPL(mod_unreg_security);
diff --git a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1010_ip_tables.patch b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1010_ip_tables.patch
new file mode 100644
index 0000000000..58180ee51b
--- /dev/null
+++ b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1010_ip_tables.patch
@@ -0,0 +1,16 @@
+Patch from http://thread.gmane.org/gmane.comp.security.bugtraq/12272
+to fix ip_tables DoS.
+
+Patch against 2.6.7
+
+--- 1.17/net/ipv4/netfilter/ip_tables.c	2004-06-07 12:55:28 -07:00
++++ edited/net/ipv4/netfilter/ip_tables.c	2004-06-30 14:23:37 -07:00
+@@ -1458,7 +1458,7 @@
+ 		int *hotdrop)
+ {
+ 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
+-	char opt[60 - sizeof(struct tcphdr)];
++	u_int8_t opt[60 - sizeof(struct tcphdr)];
+ 	unsigned int i;
+ 
+ 	duprintf("tcp_match: finding option\n");
diff --git a/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1020_iptables-headers.patch b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1020_iptables-headers.patch
new file mode 100644
index 0000000000..118b6d9085
--- /dev/null
+++ b/src/kernel/hardened-patches/hardened-patches-2.6-7.3/1020_iptables-headers.patch
@@ -0,0 +1,65 @@
+--- 1.9/include/linux/netfilter.h	2004-06-07 12:15:03 +09:00
++++ edited/include/linux/netfilter.h	2004-06-19 02:10:55 +09:00
+@@ -10,6 +10,7 @@
+ #include <linux/wait.h>
+ #include <linux/list.h>
+ #endif
++#include <linux/compiler.h>
+ 
+ /* Responses from hook functions. */
+ #define NF_DROP 0
+===== include/linux/netfilter_arp/arp_tables.h 1.3 vs edited =====
+--- 1.3/include/linux/netfilter_arp/arp_tables.h	2004-06-04 09:52:00 +09:00
++++ edited/include/linux/netfilter_arp/arp_tables.h	2004-06-19 02:08:09 +09:00
+@@ -16,7 +16,7 @@
+ #include <linux/if_arp.h>
+ #include <linux/skbuff.h>
+ #endif
+-
++#include <linux/compiler.h>
+ #include <linux/netfilter_arp.h>
+ 
+ #define ARPT_FUNCTION_MAXNAMELEN 30
+===== include/linux/netfilter_ipv4/ip_tables.h 1.7 vs edited =====
+--- 1.7/include/linux/netfilter_ipv4/ip_tables.h	2004-06-07 12:15:03 +09:00
++++ edited/include/linux/netfilter_ipv4/ip_tables.h	2004-06-19 02:08:39 +09:00
+@@ -22,6 +22,7 @@
+ #include <linux/ip.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/compiler.h>
+ #include <linux/netfilter_ipv4.h>
+ 
+ #define IPT_FUNCTION_MAXNAMELEN 30
+@@ -336,8 +337,8 @@
+ /*
+  *	Main firewall chains definitions and global var's definitions.
+  */
+-static DECLARE_MUTEX(ipt_mutex);
+ #ifdef __KERNEL__
++static DECLARE_MUTEX(ipt_mutex);
+ 
+ #include <linux/init.h>
+ extern void ipt_init(void) __init;
+===== include/linux/netfilter_ipv6/ip6_tables.h 1.6 vs edited =====
+--- 1.6/include/linux/netfilter_ipv6/ip6_tables.h	2004-06-07 12:15:04 +09:00
++++ edited/include/linux/netfilter_ipv6/ip6_tables.h	2004-06-19 02:09:29 +09:00
+@@ -22,6 +22,7 @@
+ #include <linux/ipv6.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/compiler.h>
+ #include <linux/netfilter_ipv6.h>
+ 
+ #define IP6T_FUNCTION_MAXNAMELEN 30
+@@ -106,7 +107,9 @@
+ 	u_int64_t pcnt, bcnt;			/* Packet and byte counters */
+ };
+ 
++#ifdef __KERNEL__
+ static DECLARE_MUTEX(ip6t_mutex);
++#endif
+ 
+ /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
+ #define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 
+