packages (Titanium): kernel-bare-grsecurity/linux-2.6-grsecurity.patch - ht...

hawk hawk at pld-linux.org
Sat Oct 24 12:35:26 CEST 2009


Author: hawk                         Date: Sat Oct 24 10:35:26 2009 GMT
Module: packages                      Tag: Titanium
---- Log message:
- http://www.grsecurity.com/~spender/grsecurity-2.1.14-2.6.31.5-200910232000.patch
  with localversion killed

---- Files affected:
packages/kernel-bare-grsecurity:
   linux-2.6-grsecurity.patch (1.1.2.47 -> 1.1.2.48) 

---- Diffs:

================================================================
Index: packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch
diff -u packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.47 packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.48
--- packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch:1.1.2.47	Fri Oct 23 19:34:13 2009
+++ packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch	Sat Oct 24 12:35:15 2009
@@ -1,9 +1,6 @@
-               )\._.,--....,'``.      
- .b--.        /;   _.. \   _\  (`._ ,.
-`=,-,-'~~~   `----(,_..'--(,_..'`-.;.'
-diff -urNp linux-2.6.31.4/arch/alpha/include/asm/atomic.h linux-2.6.31.4/arch/alpha/include/asm/atomic.h
---- linux-2.6.31.4/arch/alpha/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/include/asm/atomic.h	2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/include/asm/atomic.h linux-2.6.31.5/arch/alpha/include/asm/atomic.h
+--- linux-2.6.31.5/arch/alpha/include/asm/atomic.h	2009-10-20 20:42:58.966109165 -0400
++++ linux-2.6.31.5/arch/alpha/include/asm/atomic.h	2009-10-20 20:32:11.013671975 -0400
 @@ -18,9 +18,11 @@
  #define ATOMIC64_INIT(i)	( (atomic64_t) { (i) } )
  
@@ -48,9 +45,9 @@
  #define atomic64_inc(v) atomic64_add(1,(v))
  
  #define atomic_dec(v) atomic_sub(1,(v))
-diff -urNp linux-2.6.31.4/arch/alpha/include/asm/elf.h linux-2.6.31.4/arch/alpha/include/asm/elf.h
---- linux-2.6.31.4/arch/alpha/include/asm/elf.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/include/asm/elf.h	2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/include/asm/elf.h linux-2.6.31.5/arch/alpha/include/asm/elf.h
+--- linux-2.6.31.5/arch/alpha/include/asm/elf.h	2009-10-20 20:42:58.966109165 -0400
++++ linux-2.6.31.5/arch/alpha/include/asm/elf.h	2009-10-20 20:32:11.013671975 -0400
 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -65,9 +62,9 @@
  /* $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 -urNp linux-2.6.31.4/arch/alpha/include/asm/pgtable.h linux-2.6.31.4/arch/alpha/include/asm/pgtable.h
---- linux-2.6.31.4/arch/alpha/include/asm/pgtable.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/include/asm/pgtable.h	2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/include/asm/pgtable.h linux-2.6.31.5/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.31.5/arch/alpha/include/asm/pgtable.h	2009-10-20 20:42:58.966109165 -0400
++++ linux-2.6.31.5/arch/alpha/include/asm/pgtable.h	2009-10-20 20:32:11.013671975 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -86,9 +83,9 @@
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.31.4/arch/alpha/kernel/module.c linux-2.6.31.4/arch/alpha/kernel/module.c
---- linux-2.6.31.4/arch/alpha/kernel/module.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/kernel/module.c	2009-10-20 20:32:11.013671975 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/kernel/module.c linux-2.6.31.5/arch/alpha/kernel/module.c
+--- linux-2.6.31.5/arch/alpha/kernel/module.c	2009-10-20 20:42:58.966109165 -0400
++++ linux-2.6.31.5/arch/alpha/kernel/module.c	2009-10-20 20:32:11.013671975 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -98,9 +95,9 @@
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.31.4/arch/alpha/kernel/osf_sys.c linux-2.6.31.4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.31.4/arch/alpha/kernel/osf_sys.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/kernel/osf_sys.c	2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/kernel/osf_sys.c linux-2.6.31.5/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.31.5/arch/alpha/kernel/osf_sys.c	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/alpha/kernel/osf_sys.c	2009-10-20 20:32:11.015085037 -0400
 @@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
@@ -123,9 +120,9 @@
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.31.4/arch/alpha/mm/fault.c linux-2.6.31.4/arch/alpha/mm/fault.c
---- linux-2.6.31.4/arch/alpha/mm/fault.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/alpha/mm/fault.c	2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.5/arch/alpha/mm/fault.c linux-2.6.31.5/arch/alpha/mm/fault.c
+--- linux-2.6.31.5/arch/alpha/mm/fault.c	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/alpha/mm/fault.c	2009-10-20 20:32:11.015085037 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -282,9 +279,9 @@
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.31.4/arch/arm/include/asm/atomic.h linux-2.6.31.4/arch/arm/include/asm/atomic.h
---- linux-2.6.31.4/arch/arm/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/include/asm/atomic.h	2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.5/arch/arm/include/asm/atomic.h linux-2.6.31.5/arch/arm/include/asm/atomic.h
+--- linux-2.6.31.5/arch/arm/include/asm/atomic.h	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/arm/include/asm/atomic.h	2009-10-20 20:32:11.015085037 -0400
 @@ -20,6 +20,7 @@
  #ifdef __KERNEL__
  
@@ -345,9 +342,9 @@
  #define atomic_dec(v)		atomic_sub(1, v)
  
  #define atomic_inc_and_test(v)	(atomic_add_return(1, v) == 0)
-diff -urNp linux-2.6.31.4/arch/arm/include/asm/elf.h linux-2.6.31.4/arch/arm/include/asm/elf.h
---- linux-2.6.31.4/arch/arm/include/asm/elf.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/include/asm/elf.h	2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.5/arch/arm/include/asm/elf.h linux-2.6.31.5/arch/arm/include/asm/elf.h
+--- linux-2.6.31.5/arch/arm/include/asm/elf.h	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/arm/include/asm/elf.h	2009-10-20 20:32:11.015085037 -0400
 @@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -364,9 +361,9 @@
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.31.4/arch/arm/include/asm/kmap_types.h linux-2.6.31.4/arch/arm/include/asm/kmap_types.h
---- linux-2.6.31.4/arch/arm/include/asm/kmap_types.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/include/asm/kmap_types.h	2009-10-20 20:32:11.015085037 -0400
+diff -urNp linux-2.6.31.5/arch/arm/include/asm/kmap_types.h linux-2.6.31.5/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.31.5/arch/arm/include/asm/kmap_types.h	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/arm/include/asm/kmap_types.h	2009-10-20 20:32:11.015085037 -0400
 @@ -19,6 +19,7 @@ enum km_type {
  	KM_SOFTIRQ0,
  	KM_SOFTIRQ1,
@@ -375,9 +372,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.31.4/arch/arm/include/asm/uaccess.h linux-2.6.31.4/arch/arm/include/asm/uaccess.h
---- linux-2.6.31.4/arch/arm/include/asm/uaccess.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/include/asm/uaccess.h	2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.5/arch/arm/include/asm/uaccess.h linux-2.6.31.5/arch/arm/include/asm/uaccess.h
+--- linux-2.6.31.5/arch/arm/include/asm/uaccess.h	2009-10-20 20:42:58.967083785 -0400
++++ linux-2.6.31.5/arch/arm/include/asm/uaccess.h	2009-10-20 20:32:11.016200356 -0400
 @@ -400,6 +400,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -398,9 +395,9 @@
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c
---- linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c	2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c
+--- linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c	2009-10-20 20:32:11.016200356 -0400
 @@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode
  	return single_open(file, clk_debugfs_show, NULL);
  }
@@ -410,9 +407,9 @@
  	.open = clk_debugfs_open,
  	.read = seq_read,
  	.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/arch/arm/mm/mmap.c linux-2.6.31.4/arch/arm/mm/mmap.c
---- linux-2.6.31.4/arch/arm/mm/mmap.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/arm/mm/mmap.c	2009-10-20 20:32:11.016200356 -0400
+diff -urNp linux-2.6.31.5/arch/arm/mm/mmap.c linux-2.6.31.5/arch/arm/mm/mmap.c
+--- linux-2.6.31.5/arch/arm/mm/mmap.c	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/arm/mm/mmap.c	2009-10-20 20:32:11.016200356 -0400
 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -449,9 +446,9 @@
  				mm->cached_hole_size = 0;
  				goto full_search;
  			}
-diff -urNp linux-2.6.31.4/arch/avr32/include/asm/atomic.h linux-2.6.31.4/arch/avr32/include/asm/atomic.h
---- linux-2.6.31.4/arch/avr32/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/avr32/include/asm/atomic.h	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/avr32/include/asm/atomic.h linux-2.6.31.5/arch/avr32/include/asm/atomic.h
+--- linux-2.6.31.5/arch/avr32/include/asm/atomic.h	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/avr32/include/asm/atomic.h	2009-10-20 20:32:11.026942899 -0400
 @@ -20,7 +20,9 @@
  #define ATOMIC_INIT(i)  { (i) }
  
@@ -513,9 +510,9 @@
  
  #define atomic_dec_return(v)	atomic_sub_return(1, v)
  #define atomic_inc_return(v)	atomic_add_return(1, v)
-diff -urNp linux-2.6.31.4/arch/avr32/include/asm/elf.h linux-2.6.31.4/arch/avr32/include/asm/elf.h
---- linux-2.6.31.4/arch/avr32/include/asm/elf.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/avr32/include/asm/elf.h	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/avr32/include/asm/elf.h linux-2.6.31.5/arch/avr32/include/asm/elf.h
+--- linux-2.6.31.5/arch/avr32/include/asm/elf.h	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/avr32/include/asm/elf.h	2009-10-20 20:32:11.026942899 -0400
 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -532,9 +529,9 @@
  
  /* 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,
-diff -urNp linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h	2009-10-20 20:32:11.026942899 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -545,9 +542,9 @@
  };
  
  #undef D
-diff -urNp linux-2.6.31.4/arch/avr32/mm/fault.c linux-2.6.31.4/arch/avr32/mm/fault.c
---- linux-2.6.31.4/arch/avr32/mm/fault.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/avr32/mm/fault.c	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/avr32/mm/fault.c linux-2.6.31.5/arch/avr32/mm/fault.c
+--- linux-2.6.31.5/arch/avr32/mm/fault.c	2009-10-20 20:42:58.968069565 -0400
++++ linux-2.6.31.5/arch/avr32/mm/fault.c	2009-10-20 20:32:11.026942899 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -589,9 +586,9 @@
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.31.4/arch/blackfin/include/asm/atomic.h linux-2.6.31.4/arch/blackfin/include/asm/atomic.h
---- linux-2.6.31.4/arch/blackfin/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/blackfin/include/asm/atomic.h	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/blackfin/include/asm/atomic.h linux-2.6.31.5/arch/blackfin/include/asm/atomic.h
+--- linux-2.6.31.5/arch/blackfin/include/asm/atomic.h	2009-10-20 20:42:58.969037301 -0400
++++ linux-2.6.31.5/arch/blackfin/include/asm/atomic.h	2009-10-20 20:32:11.026942899 -0400
 @@ -15,8 +15,10 @@
  
  #define ATOMIC_INIT(i)	{ (i) }
@@ -637,9 +634,9 @@
  static inline void atomic_dec(volatile atomic_t *v)
  {
  	__raw_atomic_update_asm(&v->counter, -1);
-diff -urNp linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c
---- linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c	2009-10-20 20:32:11.026942899 -0400
+diff -urNp linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c
+--- linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c	2009-10-20 20:42:58.969037301 -0400
++++ linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c	2009-10-20 20:32:11.026942899 -0400
 @@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct 
  	return ret;
  }
@@ -649,9 +646,9 @@
  	.owner   = THIS_MODULE,
  	.ioctl   = coreb_ioctl,
  };
-diff -urNp linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c
---- linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c	2009-10-20 20:32:11.027918282 -0400
+diff -urNp linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c
+--- linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c	2009-10-20 20:42:58.969037301 -0400
++++ linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c	2009-10-20 20:32:11.027918282 -0400
 @@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha
  
  #define NUMBER_OF_PORTS 2
@@ -661,9 +658,9 @@
  	.owner   = THIS_MODULE,
  	.write   = sync_serial_write,
  	.read    = sync_serial_read,
-diff -urNp linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c
---- linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-10-20 20:32:11.027918282 -0400
+diff -urNp linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+--- linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-10-20 20:42:58.969037301 -0400
++++ linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c	2009-10-20 20:32:11.027918282 -0400
 @@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign
  	return 0;
  }
@@ -673,9 +670,9 @@
  	.owner       = THIS_MODULE,
  	.poll        = gpio_poll,
  	.ioctl       = gpio_ioctl,
-diff -urNp linux-2.6.31.4/arch/cris/include/asm/atomic.h linux-2.6.31.4/arch/cris/include/asm/atomic.h
---- linux-2.6.31.4/arch/cris/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/cris/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/cris/include/asm/atomic.h linux-2.6.31.5/arch/cris/include/asm/atomic.h
+--- linux-2.6.31.5/arch/cris/include/asm/atomic.h	2009-10-20 20:42:58.969037301 -0400
++++ linux-2.6.31.5/arch/cris/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
 @@ -16,7 +16,9 @@
  #define ATOMIC_INIT(i)  { (i) }
  
@@ -722,9 +719,9 @@
  static inline void atomic_dec(volatile atomic_t *v)
  {
  	unsigned long flags;
-diff -urNp linux-2.6.31.4/arch/frv/include/asm/atomic.h linux-2.6.31.4/arch/frv/include/asm/atomic.h
---- linux-2.6.31.4/arch/frv/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/frv/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/frv/include/asm/atomic.h linux-2.6.31.5/arch/frv/include/asm/atomic.h
+--- linux-2.6.31.5/arch/frv/include/asm/atomic.h	2009-10-20 20:42:58.970005584 -0400
++++ linux-2.6.31.5/arch/frv/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
 @@ -37,7 +37,9 @@
  
  #define ATOMIC_INIT(i)		{ (i) }
@@ -767,9 +764,9 @@
  static inline void atomic_dec(atomic_t *v)
  {
  	atomic_sub_return(1, v);
-diff -urNp linux-2.6.31.4/arch/frv/include/asm/kmap_types.h linux-2.6.31.4/arch/frv/include/asm/kmap_types.h
---- linux-2.6.31.4/arch/frv/include/asm/kmap_types.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/frv/include/asm/kmap_types.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/frv/include/asm/kmap_types.h linux-2.6.31.5/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.31.5/arch/frv/include/asm/kmap_types.h	2009-10-20 20:42:58.970005584 -0400
++++ linux-2.6.31.5/arch/frv/include/asm/kmap_types.h	2009-10-20 20:32:11.028889957 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -778,9 +775,9 @@
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.31.4/arch/h8300/include/asm/atomic.h linux-2.6.31.4/arch/h8300/include/asm/atomic.h
---- linux-2.6.31.4/arch/h8300/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/h8300/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/h8300/include/asm/atomic.h linux-2.6.31.5/arch/h8300/include/asm/atomic.h
+--- linux-2.6.31.5/arch/h8300/include/asm/atomic.h	2009-10-20 20:42:58.970005584 -0400
++++ linux-2.6.31.5/arch/h8300/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
 @@ -11,7 +11,9 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -833,9 +830,9 @@
  
  /*
   * atomic_inc_and_test - increment and test
-diff -urNp linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c	2009-10-20 20:42:58.970005584 -0400
++++ linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c	2009-10-20 20:32:11.028889957 -0400
 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
  
  #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
@@ -864,9 +861,9 @@
  	.fault = ia32_install_gate_page
  };
  
-diff -urNp linux-2.6.31.4/arch/ia64/ia32/ia32priv.h linux-2.6.31.4/arch/ia64/ia32/ia32priv.h
---- linux-2.6.31.4/arch/ia64/ia32/ia32priv.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/ia32/ia32priv.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/ia32/ia32priv.h linux-2.6.31.5/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.31.5/arch/ia64/ia32/ia32priv.h	2009-10-20 20:42:58.970005584 -0400
++++ linux-2.6.31.5/arch/ia64/ia32/ia32priv.h	2009-10-20 20:32:11.028889957 -0400
 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
  #define ELF_DATA	ELFDATA2LSB
  #define ELF_ARCH	EM_386
@@ -883,9 +880,9 @@
  #define IA32_GATE_OFFSET	IA32_PAGE_OFFSET
  #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
  
-diff -urNp linux-2.6.31.4/arch/ia64/include/asm/atomic.h linux-2.6.31.4/arch/ia64/include/asm/atomic.h
---- linux-2.6.31.4/arch/ia64/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/include/asm/atomic.h linux-2.6.31.5/arch/ia64/include/asm/atomic.h
+--- linux-2.6.31.5/arch/ia64/include/asm/atomic.h	2009-10-20 20:42:58.970997131 -0400
++++ linux-2.6.31.5/arch/ia64/include/asm/atomic.h	2009-10-20 20:32:11.028889957 -0400
 @@ -22,9 +22,11 @@
  #define ATOMIC64_INIT(i)	((atomic64_t) { (i) })
  
@@ -910,9 +907,9 @@
  #define atomic_dec(v)			atomic_sub(1, (v))
  
  #define atomic64_add(i,v)		atomic64_add_return((i), (v))
-diff -urNp linux-2.6.31.4/arch/ia64/include/asm/elf.h linux-2.6.31.4/arch/ia64/include/asm/elf.h
---- linux-2.6.31.4/arch/ia64/include/asm/elf.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/include/asm/elf.h	2009-10-20 20:32:11.028889957 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/include/asm/elf.h linux-2.6.31.5/arch/ia64/include/asm/elf.h
+--- linux-2.6.31.5/arch/ia64/include/asm/elf.h	2009-10-20 20:42:58.970997131 -0400
++++ linux-2.6.31.5/arch/ia64/include/asm/elf.h	2009-10-20 20:32:11.028889957 -0400
 @@ -43,6 +43,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -927,9 +924,9 @@
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.31.4/arch/ia64/include/asm/pgtable.h linux-2.6.31.4/arch/ia64/include/asm/pgtable.h
---- linux-2.6.31.4/arch/ia64/include/asm/pgtable.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/include/asm/pgtable.h	2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/include/asm/pgtable.h linux-2.6.31.5/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.31.5/arch/ia64/include/asm/pgtable.h	2009-10-20 20:42:58.970997131 -0400
++++ linux-2.6.31.5/arch/ia64/include/asm/pgtable.h	2009-10-20 20:32:11.030364852 -0400
 @@ -143,6 +143,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)
@@ -948,9 +945,9 @@
  #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 -urNp linux-2.6.31.4/arch/ia64/include/asm/uaccess.h linux-2.6.31.4/arch/ia64/include/asm/uaccess.h
---- linux-2.6.31.4/arch/ia64/include/asm/uaccess.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/include/asm/uaccess.h	2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/include/asm/uaccess.h linux-2.6.31.5/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.31.5/arch/ia64/include/asm/uaccess.h	2009-10-20 20:42:58.970997131 -0400
++++ linux-2.6.31.5/arch/ia64/include/asm/uaccess.h	2009-10-20 20:32:11.030364852 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -969,9 +966,9 @@
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.31.4/arch/ia64/kernel/module.c linux-2.6.31.4/arch/ia64/kernel/module.c
---- linux-2.6.31.4/arch/ia64/kernel/module.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/kernel/module.c	2009-10-20 20:32:11.030364852 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/kernel/module.c linux-2.6.31.5/arch/ia64/kernel/module.c
+--- linux-2.6.31.5/arch/ia64/kernel/module.c	2009-10-20 20:42:58.970997131 -0400
++++ linux-2.6.31.5/arch/ia64/kernel/module.c	2009-10-20 20:32:11.030364852 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1060,9 +1057,9 @@
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c	2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c	2009-10-20 20:42:58.971967718 -0400
++++ linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c	2009-10-20 20:32:11.031345603 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1089,9 +1086,9 @@
  				goto full_search;
  			}
  			return -ENOMEM;
-diff -urNp linux-2.6.31.4/arch/ia64/kernel/topology.c linux-2.6.31.4/arch/ia64/kernel/topology.c
---- linux-2.6.31.4/arch/ia64/kernel/topology.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/kernel/topology.c	2009-10-20 20:33:11.013917396 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/kernel/topology.c linux-2.6.31.5/arch/ia64/kernel/topology.c
+--- linux-2.6.31.5/arch/ia64/kernel/topology.c	2009-10-20 20:42:58.971967718 -0400
++++ linux-2.6.31.5/arch/ia64/kernel/topology.c	2009-10-20 20:33:11.013917396 -0400
 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
  	return ret;
  }
@@ -1101,9 +1098,9 @@
  	.show   = cache_show
  };
  
-diff -urNp linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S	2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S	2009-10-20 20:42:58.971967718 -0400
++++ linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S	2009-10-20 20:32:11.031345603 -0400
 @@ -245,7 +245,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1113,9 +1110,9 @@
    . = __phys_per_cpu_start + PERCPU_PAGE_SIZE;	/* ensure percpu data fits
    						 * into percpu page size
  						 */
-diff -urNp linux-2.6.31.4/arch/ia64/mm/fault.c linux-2.6.31.4/arch/ia64/mm/fault.c
---- linux-2.6.31.4/arch/ia64/mm/fault.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/mm/fault.c	2009-10-20 20:32:11.031345603 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/mm/fault.c linux-2.6.31.5/arch/ia64/mm/fault.c
+--- linux-2.6.31.5/arch/ia64/mm/fault.c	2009-10-20 20:42:58.971967718 -0400
++++ linux-2.6.31.5/arch/ia64/mm/fault.c	2009-10-20 20:32:11.031345603 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1165,9 +1162,9 @@
    survive:
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.31.4/arch/ia64/mm/init.c linux-2.6.31.4/arch/ia64/mm/init.c
---- linux-2.6.31.4/arch/ia64/mm/init.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/mm/init.c	2009-10-20 20:32:11.032216822 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/mm/init.c linux-2.6.31.5/arch/ia64/mm/init.c
+--- linux-2.6.31.5/arch/ia64/mm/init.c	2009-10-20 20:42:58.971967718 -0400
++++ linux-2.6.31.5/arch/ia64/mm/init.c	2009-10-20 20:32:11.032216822 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1188,9 +1185,9 @@
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.31.4/arch/ia64/pci/pci.c linux-2.6.31.4/arch/ia64/pci/pci.c
---- linux-2.6.31.4/arch/ia64/pci/pci.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/ia64/pci/pci.c	2009-10-20 20:32:11.032216822 -0400
+diff -urNp linux-2.6.31.5/arch/ia64/pci/pci.c linux-2.6.31.5/arch/ia64/pci/pci.c
+--- linux-2.6.31.5/arch/ia64/pci/pci.c	2009-10-20 20:42:58.972952757 -0400
++++ linux-2.6.31.5/arch/ia64/pci/pci.c	2009-10-20 20:32:11.032216822 -0400
 @@ -56,10 +56,13 @@ int raw_pci_read(unsigned int seg, unsig
  	if ((seg | reg) <= 255) {
  		addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg);
@@ -1221,9 +1218,9 @@
  	result = ia64_sal_pci_config_write(addr, mode, len, value);
  	if (result != 0)
  		return -EINVAL;
-diff -urNp linux-2.6.31.4/arch/m32r/include/asm/atomic.h linux-2.6.31.4/arch/m32r/include/asm/atomic.h
---- linux-2.6.31.4/arch/m32r/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/m32r/include/asm/atomic.h	2009-10-20 20:32:11.032906662 -0400
+diff -urNp linux-2.6.31.5/arch/m32r/include/asm/atomic.h linux-2.6.31.5/arch/m32r/include/asm/atomic.h
+--- linux-2.6.31.5/arch/m32r/include/asm/atomic.h	2009-10-20 20:42:58.972952757 -0400
++++ linux-2.6.31.5/arch/m32r/include/asm/atomic.h	2009-10-20 20:32:11.032906662 -0400
 @@ -29,6 +29,14 @@
  #define atomic_read(v)	((v)->counter)
  
@@ -1266,9 +1263,9 @@
  /* Atomic operations are already serializing on m32r */
  #define smp_mb__before_atomic_dec()	barrier()
  #define smp_mb__after_atomic_dec()	barrier()
-diff -urNp linux-2.6.31.4/arch/m32r/lib/usercopy.c linux-2.6.31.4/arch/m32r/lib/usercopy.c
---- linux-2.6.31.4/arch/m32r/lib/usercopy.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/m32r/lib/usercopy.c	2009-10-20 20:32:11.032906662 -0400
+diff -urNp linux-2.6.31.5/arch/m32r/lib/usercopy.c linux-2.6.31.5/arch/m32r/lib/usercopy.c
+--- linux-2.6.31.5/arch/m32r/lib/usercopy.c	2009-10-20 20:42:58.973931661 -0400
++++ linux-2.6.31.5/arch/m32r/lib/usercopy.c	2009-10-20 20:32:11.032906662 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1289,9 +1286,9 @@
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h
---- linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h	2009-10-20 20:32:11.032906662 -0400
+diff -urNp linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h
+--- linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h	2009-10-20 20:42:58.974905064 -0400
++++ linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h	2009-10-20 20:32:11.032906662 -0400
 @@ -16,23 +16,40 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -1333,9 +1330,9 @@
  static inline void atomic_dec(atomic_t *v)
  {
  	__asm__ __volatile__("subql #1,%0" : "+m" (*v));
-diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h
---- linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h	2009-10-20 20:32:11.032906662 -0400
+diff -urNp linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h
+--- linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h	2009-10-20 20:42:58.974905064 -0400
++++ linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h	2009-10-20 20:32:11.032906662 -0400
 @@ -16,7 +16,9 @@
  #define ATOMIC_INIT(i)	{ (i) }
  
@@ -1382,9 +1379,9 @@
  /*
   * atomic_inc_and_test - increment and test
   * @v: pointer of type atomic_t
-diff -urNp linux-2.6.31.4/arch/mips/include/asm/atomic.h linux-2.6.31.4/arch/mips/include/asm/atomic.h
---- linux-2.6.31.4/arch/mips/include/asm/atomic.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/mips/include/asm/atomic.h	2009-10-20 20:32:11.033977911 -0400
+diff -urNp linux-2.6.31.5/arch/mips/include/asm/atomic.h linux-2.6.31.5/arch/mips/include/asm/atomic.h
+--- linux-2.6.31.5/arch/mips/include/asm/atomic.h	2009-10-20 20:42:58.974905064 -0400
++++ linux-2.6.31.5/arch/mips/include/asm/atomic.h	2009-10-20 20:32:11.033977911 -0400
 @@ -32,6 +32,14 @@
  #define atomic_read(v)		((v)->counter)
  
@@ -1426,9 +1423,9 @@
  
  /*
   * atomic_dec - decrement and test
-diff -urNp linux-2.6.31.4/arch/mips/include/asm/elf.h linux-2.6.31.4/arch/mips/include/asm/elf.h
---- linux-2.6.31.4/arch/mips/include/asm/elf.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/mips/include/asm/elf.h	2009-10-20 20:32:11.033977911 -0400
+diff -urNp linux-2.6.31.5/arch/mips/include/asm/elf.h linux-2.6.31.5/arch/mips/include/asm/elf.h
+--- linux-2.6.31.5/arch/mips/include/asm/elf.h	2009-10-20 20:42:58.974905064 -0400
++++ linux-2.6.31.5/arch/mips/include/asm/elf.h	2009-10-20 20:32:11.033977911 -0400
 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1441,9 +1438,9 @@
 +#endif
 +
  #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.31.4/arch/mips/include/asm/page.h linux-2.6.31.4/arch/mips/include/asm/page.h
---- linux-2.6.31.4/arch/mips/include/asm/page.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/mips/include/asm/page.h	2009-10-20 20:32:11.033977911 -0400
+diff -urNp linux-2.6.31.5/arch/mips/include/asm/page.h linux-2.6.31.5/arch/mips/include/asm/page.h
+--- linux-2.6.31.5/arch/mips/include/asm/page.h	2009-10-20 20:42:58.974905064 -0400
++++ linux-2.6.31.5/arch/mips/include/asm/page.h	2009-10-20 20:32:11.033977911 -0400
 @@ -92,7 +92,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1453,9 +1450,9 @@
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.31.4/arch/mips/include/asm/system.h linux-2.6.31.4/arch/mips/include/asm/system.h
---- linux-2.6.31.4/arch/mips/include/asm/system.h	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/mips/include/asm/system.h	2009-10-20 20:32:11.033977911 -0400
+diff -urNp linux-2.6.31.5/arch/mips/include/asm/system.h linux-2.6.31.5/arch/mips/include/asm/system.h
+--- linux-2.6.31.5/arch/mips/include/asm/system.h	2009-10-20 20:42:58.975887238 -0400
++++ linux-2.6.31.5/arch/mips/include/asm/system.h	2009-10-20 20:32:11.033977911 -0400
 @@ -217,6 +217,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1464,9 +1461,9 @@
 +#define arch_align_stack(x) ((x) & ALMASK)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c	2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c	2009-10-20 20:32:11.033977911 -0400
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-grsecurity/linux-2.6-grsecurity.patch?r1=1.1.2.47&r2=1.1.2.48&f=u



More information about the pld-cvs-commit mailing list