diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-20 08:39:34 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-20 08:39:34 +0000 |
| commit | cd951f164256fd464d614905757cd366c5684b2e (patch) | |
| tree | bf13d68c70d54987b8d4b6b81e446193e14bffeb /core | |
| parent | daea04bdcad391612700258b9057fda4b61c2c2e (diff) | |
| download | aports-cd951f164256fd464d614905757cd366c5684b2e.tar.bz2 aports-cd951f164256fd464d614905757cd366c5684b2e.tar.xz | |
core/linux-grsec: updated grsecurity patch
grsecurity-2.1.14-2.6.29.6-200907122214.patch
Diffstat (limited to 'core')
| -rw-r--r-- | core/linux-grsec/APKBUILD | 6 | ||||
| -rw-r--r-- | core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch (renamed from core/linux-grsec/grsecurity-2.1.14-2.6.29.5-200906152045.patch) | 4060 |
2 files changed, 2105 insertions, 1961 deletions
diff --git a/core/linux-grsec/APKBUILD b/core/linux-grsec/APKBUILD index 8b9043f4b..dc1a47858 100644 --- a/core/linux-grsec/APKBUILD +++ b/core/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.29.6 _kernver=2.6.29 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -13,7 +13,7 @@ _config=${config:-kernelconfig} install="$pkgname.post-install $pkgname.post-upgrade" source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.1.14-2.6.29.5-200906152045.patch + grsecurity-2.1.14-2.6.29.6-200907122214.patch 0001-linux-2.6.28.5-ipgre-strict-binding.patch 0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch @@ -114,7 +114,7 @@ dev() { md5sums="64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 0317760b52c9ac7a11de997da19a366e patch-2.6.29.6.bz2 -e2e49a250303720b31c4371905c105e3 grsecurity-2.1.14-2.6.29.5-200906152045.patch +b08fb058667e8d5846cd4085de71eff2 grsecurity-2.1.14-2.6.29.6-200907122214.patch 7673b4521283ad41434a18ca18b16ad8 0001-linux-2.6.28.5-ipgre-strict-binding.patch 8f405c738b150c532c46eaad5390cca2 0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch diff --git a/core/linux-grsec/grsecurity-2.1.14-2.6.29.5-200906152045.patch b/core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch index 275bbfe7c..5206a9e47 100644 --- a/core/linux-grsec/grsecurity-2.1.14-2.6.29.5-200906152045.patch +++ b/core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.29.5/arch/alpha/include/asm/atomic.h linux-2.6.29.5/arch/alpha/include/asm/atomic.h ---- linux-2.6.29.5/arch/alpha/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/include/asm/atomic.h linux-2.6.29.6/arch/alpha/include/asm/atomic.h +--- linux-2.6.29.6/arch/alpha/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -246,6 +246,9 @@ static __inline__ int atomic64_add_unles #define atomic64_dec_and_test(v) (atomic64_sub_return(1, (v)) == 0) @@ -11,9 +11,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/include/asm/atomic.h linux-2.6.29.5/arch/al #define atomic64_inc(v) atomic64_add(1,(v)) #define atomic_dec(v) atomic_sub(1,(v)) -diff -urNp linux-2.6.29.5/arch/alpha/include/asm/elf.h linux-2.6.29.5/arch/alpha/include/asm/elf.h ---- linux-2.6.29.5/arch/alpha/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/include/asm/elf.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/include/asm/elf.h linux-2.6.29.6/arch/alpha/include/asm/elf.h +--- linux-2.6.29.6/arch/alpha/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -28,9 +28,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/include/asm/elf.h linux-2.6.29.5/arch/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 -urNp linux-2.6.29.5/arch/alpha/include/asm/kmap_types.h linux-2.6.29.5/arch/alpha/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/alpha/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -24,7 +24,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -41,9 +41,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/include/asm/kmap_types.h linux-2.6.29.5/arc }; #undef D -diff -urNp linux-2.6.29.5/arch/alpha/include/asm/pgtable.h linux-2.6.29.5/arch/alpha/include/asm/pgtable.h ---- linux-2.6.29.5/arch/alpha/include/asm/pgtable.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/include/asm/pgtable.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/include/asm/pgtable.h linux-2.6.29.6/arch/alpha/include/asm/pgtable.h +--- linux-2.6.29.6/arch/alpha/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/include/asm/pgtable.h 2009-07-09 22:13:39.000000000 -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) @@ -62,9 +62,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/include/asm/pgtable.h linux-2.6.29.5/arch/a #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.29.5/arch/alpha/kernel/module.c linux-2.6.29.5/arch/alpha/kernel/module.c ---- linux-2.6.29.5/arch/alpha/kernel/module.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/kernel/module.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/kernel/module.c linux-2.6.29.6/arch/alpha/kernel/module.c +--- linux-2.6.29.6/arch/alpha/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/kernel/module.c 2009-07-09 22:13:39.000000000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -74,9 +74,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/kernel/module.c linux-2.6.29.5/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.29.5/arch/alpha/kernel/osf_sys.c linux-2.6.29.5/arch/alpha/kernel/osf_sys.c ---- linux-2.6.29.5/arch/alpha/kernel/osf_sys.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/kernel/osf_sys.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/kernel/osf_sys.c linux-2.6.29.6/arch/alpha/kernel/osf_sys.c +--- linux-2.6.29.6/arch/alpha/kernel/osf_sys.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/kernel/osf_sys.c 2009-07-09 22:13:39.000000000 -0400 @@ -1217,6 +1217,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -99,9 +99,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/kernel/osf_sys.c linux-2.6.29.5/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.29.5/arch/alpha/mm/fault.c linux-2.6.29.5/arch/alpha/mm/fault.c ---- linux-2.6.29.5/arch/alpha/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/alpha/mm/fault.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/alpha/mm/fault.c linux-2.6.29.6/arch/alpha/mm/fault.c +--- linux-2.6.29.6/arch/alpha/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/alpha/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -258,9 +258,9 @@ diff -urNp linux-2.6.29.5/arch/alpha/mm/fault.c linux-2.6.29.5/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.29.5/arch/arm/include/asm/atomic.h linux-2.6.29.5/arch/arm/include/asm/atomic.h ---- linux-2.6.29.5/arch/arm/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/arm/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/arm/include/asm/atomic.h linux-2.6.29.6/arch/arm/include/asm/atomic.h +--- linux-2.6.29.6/arch/arm/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/arm/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -191,6 +191,9 @@ static inline int atomic_add_unless(atom #define atomic_inc(v) (void) atomic_add_return(1, v) #define atomic_sub(i, v) (void) atomic_sub_return(i, v) @@ -271,9 +271,9 @@ diff -urNp linux-2.6.29.5/arch/arm/include/asm/atomic.h linux-2.6.29.5/arch/arm/ #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) -diff -urNp linux-2.6.29.5/arch/arm/include/asm/elf.h linux-2.6.29.5/arch/arm/include/asm/elf.h ---- linux-2.6.29.5/arch/arm/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/arm/include/asm/elf.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/arm/include/asm/elf.h linux-2.6.29.6/arch/arm/include/asm/elf.h +--- linux-2.6.29.6/arch/arm/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/arm/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -100,7 +100,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. */ @@ -290,9 +290,9 @@ diff -urNp linux-2.6.29.5/arch/arm/include/asm/elf.h linux-2.6.29.5/arch/arm/inc /* 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.29.5/arch/arm/include/asm/kmap_types.h linux-2.6.29.5/arch/arm/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/arm/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/arm/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/arm/include/asm/kmap_types.h linux-2.6.29.6/arch/arm/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/arm/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/arm/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -18,6 +18,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -301,9 +301,9 @@ diff -urNp linux-2.6.29.5/arch/arm/include/asm/kmap_types.h linux-2.6.29.5/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/arm/include/asm/uaccess.h linux-2.6.29.5/arch/arm/include/asm/uaccess.h ---- linux-2.6.29.5/arch/arm/include/asm/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/arm/include/asm/uaccess.h 2009-06-13 00:30:48.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/arm/include/asm/uaccess.h linux-2.6.29.6/arch/arm/include/asm/uaccess.h +--- linux-2.6.29.6/arch/arm/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/arm/include/asm/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -400,7 +400,7 @@ static inline unsigned long __must_check { if (access_ok(VERIFY_READ, from, n)) @@ -313,9 +313,9 @@ diff -urNp linux-2.6.29.5/arch/arm/include/asm/uaccess.h linux-2.6.29.5/arch/arm memset(to, 0, n); return n; } -diff -urNp linux-2.6.29.5/arch/arm/mm/mmap.c linux-2.6.29.5/arch/arm/mm/mmap.c ---- linux-2.6.29.5/arch/arm/mm/mmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/arm/mm/mmap.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/arm/mm/mmap.c linux-2.6.29.6/arch/arm/mm/mmap.c +--- linux-2.6.29.6/arch/arm/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/arm/mm/mmap.c 2009-07-09 22:13:39.000000000 -0400 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -352,9 +352,9 @@ diff -urNp linux-2.6.29.5/arch/arm/mm/mmap.c linux-2.6.29.5/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.29.5/arch/avr32/include/asm/atomic.h linux-2.6.29.5/arch/avr32/include/asm/atomic.h ---- linux-2.6.29.5/arch/avr32/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/avr32/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/avr32/include/asm/atomic.h linux-2.6.29.6/arch/avr32/include/asm/atomic.h +--- linux-2.6.29.6/arch/avr32/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/avr32/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -176,9 +176,12 @@ static inline int atomic_sub_if_positive #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n))) @@ -368,9 +368,9 @@ diff -urNp linux-2.6.29.5/arch/avr32/include/asm/atomic.h linux-2.6.29.5/arch/av #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.29.5/arch/avr32/include/asm/elf.h linux-2.6.29.5/arch/avr32/include/asm/elf.h ---- linux-2.6.29.5/arch/avr32/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/avr32/include/asm/elf.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/avr32/include/asm/elf.h linux-2.6.29.6/arch/avr32/include/asm/elf.h +--- linux-2.6.29.6/arch/avr32/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/avr32/include/asm/elf.h 2009-07-09 22:13:39.000000000 -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. */ @@ -387,9 +387,9 @@ diff -urNp linux-2.6.29.5/arch/avr32/include/asm/elf.h linux-2.6.29.5/arch/avr32 /* 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.29.5/arch/avr32/include/asm/kmap_types.h linux-2.6.29.5/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/avr32/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/avr32/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -400,9 +400,9 @@ diff -urNp linux-2.6.29.5/arch/avr32/include/asm/kmap_types.h linux-2.6.29.5/arc }; #undef D -diff -urNp linux-2.6.29.5/arch/avr32/mm/fault.c linux-2.6.29.5/arch/avr32/mm/fault.c ---- linux-2.6.29.5/arch/avr32/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/avr32/mm/fault.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/avr32/mm/fault.c linux-2.6.29.6/arch/avr32/mm/fault.c +--- linux-2.6.29.6/arch/avr32/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/avr32/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -444,9 +444,9 @@ diff -urNp linux-2.6.29.5/arch/avr32/mm/fault.c linux-2.6.29.5/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.29.5/arch/blackfin/include/asm/atomic.h linux-2.6.29.5/arch/blackfin/include/asm/atomic.h ---- linux-2.6.29.5/arch/blackfin/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/blackfin/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/atomic.h linux-2.6.29.6/arch/blackfin/include/asm/atomic.h +--- linux-2.6.29.6/arch/blackfin/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/blackfin/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -178,6 +178,9 @@ static inline void atomic_set_mask(unsig #endif /* !CONFIG_SMP */ @@ -457,9 +457,9 @@ diff -urNp linux-2.6.29.5/arch/blackfin/include/asm/atomic.h linux-2.6.29.5/arch #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0) #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.29.5/arch/blackfin/include/asm/kmap_types.h linux-2.6.29.5/arch/blackfin/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/blackfin/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/blackfin/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -468,9 +468,9 @@ diff -urNp linux-2.6.29.5/arch/blackfin/include/asm/kmap_types.h linux-2.6.29.5/ KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/cris/include/asm/atomic.h linux-2.6.29.5/arch/cris/include/asm/atomic.h ---- linux-2.6.29.5/arch/cris/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/cris/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/cris/include/asm/atomic.h linux-2.6.29.6/arch/cris/include/asm/atomic.h +--- linux-2.6.29.6/arch/cris/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/cris/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -152,6 +152,10 @@ static inline int atomic_add_unless(atom } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) @@ -482,9 +482,9 @@ diff -urNp linux-2.6.29.5/arch/cris/include/asm/atomic.h linux-2.6.29.5/arch/cri /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.5/arch/cris/include/asm/kmap_types.h linux-2.6.29.5/arch/cris/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/cris/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/cris/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/cris/include/asm/kmap_types.h linux-2.6.29.6/arch/cris/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/cris/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/cris/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -493,9 +493,9 @@ diff -urNp linux-2.6.29.5/arch/cris/include/asm/kmap_types.h linux-2.6.29.5/arch KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/h8300/include/asm/atomic.h linux-2.6.29.5/arch/h8300/include/asm/atomic.h ---- linux-2.6.29.5/arch/h8300/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/h8300/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/h8300/include/asm/atomic.h linux-2.6.29.6/arch/h8300/include/asm/atomic.h +--- linux-2.6.29.6/arch/h8300/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/h8300/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -26,6 +26,7 @@ static __inline__ int atomic_add_return( } @@ -520,9 +520,9 @@ diff -urNp linux-2.6.29.5/arch/h8300/include/asm/atomic.h linux-2.6.29.5/arch/h8 /* * atomic_inc_and_test - increment and test -diff -urNp linux-2.6.29.5/arch/h8300/include/asm/kmap_types.h linux-2.6.29.5/arch/h8300/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/h8300/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/h8300/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -531,9 +531,9 @@ diff -urNp linux-2.6.29.5/arch/h8300/include/asm/kmap_types.h linux-2.6.29.5/arc KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.29.5/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.29.5/arch/ia64/ia32/binfmt_elf32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/ia32/binfmt_elf32.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c 2009-07-09 22:13:39.000000000 -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)) @@ -548,9 +548,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.29.5/arch/ia64 /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.29.5/arch/ia64/ia32/ia32priv.h linux-2.6.29.5/arch/ia64/ia32/ia32priv.h ---- linux-2.6.29.5/arch/ia64/ia32/ia32priv.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/ia32/ia32priv.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/ia32/ia32priv.h linux-2.6.29.6/arch/ia64/ia32/ia32priv.h +--- linux-2.6.29.6/arch/ia64/ia32/ia32priv.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/ia32/ia32priv.h 2009-07-09 22:13:39.000000000 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -567,9 +567,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/ia32/ia32priv.h linux-2.6.29.5/arch/ia64/ia3 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.29.5/arch/ia64/include/asm/atomic.h linux-2.6.29.5/arch/ia64/include/asm/atomic.h ---- linux-2.6.29.5/arch/ia64/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/include/asm/atomic.h linux-2.6.29.6/arch/ia64/include/asm/atomic.h +--- linux-2.6.29.6/arch/ia64/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -201,8 +201,11 @@ atomic64_add_negative (__s64 i, atomic64 #define atomic64_inc_and_test(v) (atomic64_add_return(1, (v)) == 0) @@ -582,9 +582,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/include/asm/atomic.h linux-2.6.29.5/arch/ia6 #define atomic_dec(v) atomic_sub(1, (v)) #define atomic64_add(i,v) atomic64_add_return((i), (v)) -diff -urNp linux-2.6.29.5/arch/ia64/include/asm/elf.h linux-2.6.29.5/arch/ia64/include/asm/elf.h ---- linux-2.6.29.5/arch/ia64/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/include/asm/elf.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/include/asm/elf.h linux-2.6.29.6/arch/ia64/include/asm/elf.h +--- linux-2.6.29.6/arch/ia64/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -599,9 +599,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/include/asm/elf.h linux-2.6.29.5/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.29.5/arch/ia64/include/asm/kmap_types.h linux-2.6.29.5/arch/ia64/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/ia64/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -612,9 +612,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/include/asm/kmap_types.h linux-2.6.29.5/arch }; #undef D -diff -urNp linux-2.6.29.5/arch/ia64/include/asm/pgtable.h linux-2.6.29.5/arch/ia64/include/asm/pgtable.h ---- linux-2.6.29.5/arch/ia64/include/asm/pgtable.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/include/asm/pgtable.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/include/asm/pgtable.h linux-2.6.29.6/arch/ia64/include/asm/pgtable.h +--- linux-2.6.29.6/arch/ia64/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/include/asm/pgtable.h 2009-07-09 22:13:39.000000000 -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) @@ -633,9 +633,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/include/asm/pgtable.h linux-2.6.29.5/arch/ia #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.29.5/arch/ia64/include/asm/uaccess.h linux-2.6.29.5/arch/ia64/include/asm/uaccess.h ---- linux-2.6.29.5/arch/ia64/include/asm/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/include/asm/uaccess.h 2009-06-13 00:25:18.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/include/asm/uaccess.h linux-2.6.29.6/arch/ia64/include/asm/uaccess.h +--- linux-2.6.29.6/arch/ia64/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/include/asm/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -654,9 +654,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/include/asm/uaccess.h linux-2.6.29.5/arch/ia __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.29.5/arch/ia64/kernel/module.c linux-2.6.29.5/arch/ia64/kernel/module.c ---- linux-2.6.29.5/arch/ia64/kernel/module.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/kernel/module.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/kernel/module.c +--- linux-2.6.29.6/arch/ia64/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/kernel/module.c 2009-07-09 22:13:39.000000000 -0400 @@ -312,8 +312,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -745,9 +745,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/kernel/module.c linux-2.6.29.5/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.29.5/arch/ia64/kernel/sys_ia64.c linux-2.6.29.5/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.29.5/arch/ia64/kernel/sys_ia64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/kernel/sys_ia64.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c 2009-07-09 22:13:39.000000000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -774,9 +774,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/kernel/sys_ia64.c linux-2.6.29.5/arch/ia64/k goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.29.5/arch/ia64/mm/fault.c linux-2.6.29.5/arch/ia64/mm/fault.c ---- linux-2.6.29.5/arch/ia64/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/mm/fault.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/mm/fault.c linux-2.6.29.6/arch/ia64/mm/fault.c +--- linux-2.6.29.6/arch/ia64/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -826,9 +826,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/mm/fault.c linux-2.6.29.5/arch/ia64/mm/fault survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.29.5/arch/ia64/mm/init.c linux-2.6.29.5/arch/ia64/mm/init.c ---- linux-2.6.29.5/arch/ia64/mm/init.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/ia64/mm/init.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/ia64/mm/init.c linux-2.6.29.6/arch/ia64/mm/init.c +--- linux-2.6.29.6/arch/ia64/mm/init.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/ia64/mm/init.c 2009-07-09 22:13:39.000000000 -0400 @@ -121,6 +121,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -849,9 +849,9 @@ diff -urNp linux-2.6.29.5/arch/ia64/mm/init.c linux-2.6.29.5/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.29.5/arch/m32r/lib/usercopy.c linux-2.6.29.5/arch/m32r/lib/usercopy.c ---- linux-2.6.29.5/arch/m32r/lib/usercopy.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/m32r/lib/usercopy.c 2009-06-13 00:52:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/m32r/lib/usercopy.c linux-2.6.29.6/arch/m32r/lib/usercopy.c +--- linux-2.6.29.6/arch/m32r/lib/usercopy.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/m32r/lib/usercopy.c 2009-07-09 22:13:39.000000000 -0400 @@ -26,7 +26,7 @@ __generic_copy_from_user(void *to, const prefetchw(to); if (access_ok(VERIFY_READ, from, n)) @@ -861,9 +861,23 @@ diff -urNp linux-2.6.29.5/arch/m32r/lib/usercopy.c linux-2.6.29.5/arch/m32r/lib/ memset(to, 0, n); return n; } -diff -urNp linux-2.6.29.5/arch/m68k/include/asm/atomic_no.h linux-2.6.29.5/arch/m68k/include/asm/atomic_no.h ---- linux-2.6.29.5/arch/m68k/include/asm/atomic_no.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/m68k/include/asm/atomic_no.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h +--- linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h 2009-07-09 22:20:50.000000000 -0400 +@@ -186,6 +186,10 @@ static __inline__ int atomic_add_unless( + + #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) + ++#define atomic_inc_unchecked(v) atomic_inc((v)) ++#define atomic_add_unchecked(i,v) atomic_add((i),(v)) ++#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) ++ + /* Atomic operations are already serializing */ + #define smp_mb__before_atomic_dec() barrier() + #define smp_mb__after_atomic_dec() barrier() +diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h +--- linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h 2009-07-09 22:13:39.000000000 -0400 @@ -151,5 +151,9 @@ static __inline__ int atomic_add_unless( #define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1,(v)) @@ -874,9 +888,9 @@ diff -urNp linux-2.6.29.5/arch/m68k/include/asm/atomic_no.h linux-2.6.29.5/arch/ + #include <asm-generic/atomic.h> #endif /* __ARCH_M68KNOMMU_ATOMIC __ */ -diff -urNp linux-2.6.29.5/arch/m68k/include/asm/kmap_types_mm.h linux-2.6.29.5/arch/m68k/include/asm/kmap_types_mm.h ---- linux-2.6.29.5/arch/m68k/include/asm/kmap_types_mm.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/m68k/include/asm/kmap_types_mm.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h +--- linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -885,9 +899,9 @@ diff -urNp linux-2.6.29.5/arch/m68k/include/asm/kmap_types_mm.h linux-2.6.29.5/a KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/m68k/include/asm/kmap_types_no.h linux-2.6.29.5/arch/m68k/include/asm/kmap_types_no.h ---- linux-2.6.29.5/arch/m68k/include/asm/kmap_types_no.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/m68k/include/asm/kmap_types_no.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h +--- linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -896,9 +910,9 @@ diff -urNp linux-2.6.29.5/arch/m68k/include/asm/kmap_types_no.h linux-2.6.29.5/a KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/mips/include/asm/atomic.h linux-2.6.29.5/arch/mips/include/asm/atomic.h ---- linux-2.6.29.5/arch/mips/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/include/asm/atomic.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/include/asm/atomic.h linux-2.6.29.6/arch/mips/include/asm/atomic.h +--- linux-2.6.29.6/arch/mips/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -381,6 +381,9 @@ static __inline__ int atomic_add_unless( * Atomically increments @v by 1. */ @@ -909,9 +923,9 @@ diff -urNp linux-2.6.29.5/arch/mips/include/asm/atomic.h linux-2.6.29.5/arch/mip /* * atomic_dec - decrement and test -diff -urNp linux-2.6.29.5/arch/mips/include/asm/elf.h linux-2.6.29.5/arch/mips/include/asm/elf.h ---- linux-2.6.29.5/arch/mips/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/include/asm/elf.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/include/asm/elf.h linux-2.6.29.6/arch/mips/include/asm/elf.h +--- linux-2.6.29.6/arch/mips/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -364,4 +364,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -924,9 +938,9 @@ diff -urNp linux-2.6.29.5/arch/mips/include/asm/elf.h linux-2.6.29.5/arch/mips/i +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.29.5/arch/mips/include/asm/kmap_types.h linux-2.6.29.5/arch/mips/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/mips/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/include/asm/kmap_types.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/include/asm/kmap_types.h linux-2.6.29.6/arch/mips/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/mips/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -937,9 +951,9 @@ diff -urNp linux-2.6.29.5/arch/mips/include/asm/kmap_types.h linux-2.6.29.5/arch }; #undef D -diff -urNp linux-2.6.29.5/arch/mips/include/asm/page.h linux-2.6.29.5/arch/mips/include/asm/page.h ---- linux-2.6.29.5/arch/mips/include/asm/page.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/include/asm/page.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/include/asm/page.h linux-2.6.29.6/arch/mips/include/asm/page.h +--- linux-2.6.29.6/arch/mips/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/include/asm/page.h 2009-07-09 22:13:39.000000000 -0400 @@ -82,7 +82,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -949,9 +963,9 @@ diff -urNp linux-2.6.29.5/arch/mips/include/asm/page.h linux-2.6.29.5/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.29.5/arch/mips/include/asm/system.h linux-2.6.29.5/arch/mips/include/asm/system.h ---- linux-2.6.29.5/arch/mips/include/asm/system.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/include/asm/system.h 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/include/asm/system.h linux-2.6.29.6/arch/mips/include/asm/system.h +--- linux-2.6.29.6/arch/mips/include/asm/system.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/include/asm/system.h 2009-07-09 22:13:39.000000000 -0400 @@ -217,6 +217,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -960,9 +974,9 @@ diff -urNp linux-2.6.29.5/arch/mips/include/asm/system.h linux-2.6.29.5/arch/mip +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.29.5/arch/mips/kernel/binfmt_elfn32.c linux-2.6.29.5/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.29.5/arch/mips/kernel/binfmt_elfn32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/kernel/binfmt_elfn32.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c 2009-07-09 22:13:39.000000000 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -977,9 +991,9 @@ diff -urNp linux-2.6.29.5/arch/mips/kernel/binfmt_elfn32.c linux-2.6.29.5/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.29.5/arch/mips/kernel/binfmt_elfo32.c linux-2.6.29.5/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.29.5/arch/mips/kernel/binfmt_elfo32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/kernel/binfmt_elfo32.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c 2009-07-09 22:13:39.000000000 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -994,9 +1008,9 @@ diff -urNp linux-2.6.29.5/arch/mips/kernel/binfmt_elfo32.c linux-2.6.29.5/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.29.5/arch/mips/kernel/process.c linux-2.6.29.5/arch/mips/kernel/process.c ---- linux-2.6.29.5/arch/mips/kernel/process.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/kernel/process.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/kernel/process.c linux-2.6.29.6/arch/mips/kernel/process.c +--- linux-2.6.29.6/arch/mips/kernel/process.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/kernel/process.c 2009-07-09 22:13:39.000000000 -0400 @@ -457,15 +457,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1013,9 +1027,9 @@ diff -urNp linux-2.6.29.5/arch/mips/kernel/process.c linux-2.6.29.5/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.29.5/arch/mips/kernel/syscall.c linux-2.6.29.5/arch/mips/kernel/syscall.c ---- linux-2.6.29.5/arch/mips/kernel/syscall.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/kernel/syscall.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/kernel/syscall.c linux-2.6.29.6/arch/mips/kernel/syscall.c +--- linux-2.6.29.6/arch/mips/kernel/syscall.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/kernel/syscall.c 2009-07-09 22:13:39.000000000 -0400 @@ -99,6 +99,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1037,9 +1051,9 @@ diff -urNp linux-2.6.29.5/arch/mips/kernel/syscall.c linux-2.6.29.5/arch/mips/ke if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.29.5/arch/mips/mm/fault.c linux-2.6.29.5/arch/mips/mm/fault.c ---- linux-2.6.29.5/arch/mips/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/mips/mm/fault.c 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/mips/mm/fault.c linux-2.6.29.6/arch/mips/mm/fault.c +--- linux-2.6.29.6/arch/mips/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/mips/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1064,9 +1078,9 @@ diff -urNp linux-2.6.29.5/arch/mips/mm/fault.c linux-2.6.29.5/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.29.5/arch/parisc/include/asm/atomic.h linux-2.6.29.5/arch/parisc/include/asm/atomic.h ---- linux-2.6.29.5/arch/parisc/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/include/asm/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/include/asm/atomic.h linux-2.6.29.6/arch/parisc/include/asm/atomic.h +--- linux-2.6.29.6/arch/parisc/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -223,8 +223,11 @@ static __inline__ int atomic_add_unless( #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) @@ -1079,9 +1093,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/include/asm/atomic.h linux-2.6.29.5/arch/p #define atomic_dec(v) ((void)(__atomic_add_return( -1,(v)))) #define atomic_add_return(i,v) (__atomic_add_return( ((int)i),(v))) -diff -urNp linux-2.6.29.5/arch/parisc/include/asm/elf.h linux-2.6.29.5/arch/parisc/include/asm/elf.h ---- linux-2.6.29.5/arch/parisc/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/include/asm/elf.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/include/asm/elf.h linux-2.6.29.6/arch/parisc/include/asm/elf.h +--- linux-2.6.29.6/arch/parisc/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -333,6 +333,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1096,9 +1110,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/include/asm/elf.h linux-2.6.29.5/arch/pari /* 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 -urNp linux-2.6.29.5/arch/parisc/include/asm/kmap_types.h linux-2.6.29.5/arch/parisc/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/parisc/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -1109,9 +1123,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/include/asm/kmap_types.h linux-2.6.29.5/ar }; #undef D -diff -urNp linux-2.6.29.5/arch/parisc/include/asm/pgtable.h linux-2.6.29.5/arch/parisc/include/asm/pgtable.h ---- linux-2.6.29.5/arch/parisc/include/asm/pgtable.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/include/asm/pgtable.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/include/asm/pgtable.h linux-2.6.29.6/arch/parisc/include/asm/pgtable.h +--- linux-2.6.29.6/arch/parisc/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/include/asm/pgtable.h 2009-07-09 22:13:39.000000000 -0400 @@ -202,6 +202,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1130,9 +1144,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/include/asm/pgtable.h linux-2.6.29.5/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.29.5/arch/parisc/kernel/module.c linux-2.6.29.5/arch/parisc/kernel/module.c ---- linux-2.6.29.5/arch/parisc/kernel/module.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/kernel/module.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc/kernel/module.c +--- linux-2.6.29.6/arch/parisc/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/kernel/module.c 2009-07-09 22:13:39.000000000 -0400 @@ -93,16 +93,38 @@ /* three functions to determine where in the module core @@ -1233,9 +1247,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/kernel/module.c linux-2.6.29.5/arch/parisc DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.29.5/arch/parisc/kernel/sys_parisc.c linux-2.6.29.5/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.29.5/arch/parisc/kernel/sys_parisc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/kernel/sys_parisc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c 2009-07-09 22:13:39.000000000 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1245,9 +1259,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/kernel/sys_parisc.c linux-2.6.29.5/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.29.5/arch/parisc/kernel/traps.c linux-2.6.29.5/arch/parisc/kernel/traps.c ---- linux-2.6.29.5/arch/parisc/kernel/traps.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/kernel/traps.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/kernel/traps.c linux-2.6.29.6/arch/parisc/kernel/traps.c +--- linux-2.6.29.6/arch/parisc/kernel/traps.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/kernel/traps.c 2009-07-09 22:13:39.000000000 -0400 @@ -731,9 +731,7 @@ void handle_interruption(int code, struc down_read(¤t->mm->mmap_sem); @@ -1259,9 +1273,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/kernel/traps.c linux-2.6.29.5/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.29.5/arch/parisc/mm/fault.c linux-2.6.29.5/arch/parisc/mm/fault.c ---- linux-2.6.29.5/arch/parisc/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/parisc/mm/fault.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/parisc/mm/fault.c linux-2.6.29.6/arch/parisc/mm/fault.c +--- linux-2.6.29.6/arch/parisc/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/parisc/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1431,9 +1445,9 @@ diff -urNp linux-2.6.29.5/arch/parisc/mm/fault.c linux-2.6.29.5/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/atomic.h linux-2.6.29.5/arch/powerpc/include/asm/atomic.h ---- linux-2.6.29.5/arch/powerpc/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/atomic.h linux-2.6.29.6/arch/powerpc/include/asm/atomic.h +--- linux-2.6.29.6/arch/powerpc/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -244,6 +244,10 @@ static __inline__ int atomic_dec_if_posi return t; } @@ -1445,9 +1459,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/atomic.h linux-2.6.29.5/arch/ #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() #define smp_mb__before_atomic_inc() smp_mb() -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/elf.h linux-2.6.29.5/arch/powerpc/include/asm/elf.h ---- linux-2.6.29.5/arch/powerpc/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/elf.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/elf.h linux-2.6.29.6/arch/powerpc/include/asm/elf.h +--- linux-2.6.29.6/arch/powerpc/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -180,6 +180,18 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E #define ELF_ET_DYN_BASE (0x20000000) @@ -1467,9 +1481,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/elf.h linux-2.6.29.5/arch/pow /* * Our registers are always unsigned longs, whether we're a 32 bit * process or 64 bit, on either a 64 bit or 32 bit kernel. -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/kmap_types.h linux-2.6.29.5/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/powerpc/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1478,9 +1492,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/kmap_types.h linux-2.6.29.5/a KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/page_64.h linux-2.6.29.5/arch/powerpc/include/asm/page_64.h ---- linux-2.6.29.5/arch/powerpc/include/asm/page_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/page_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page_64.h linux-2.6.29.6/arch/powerpc/include/asm/page_64.h +--- linux-2.6.29.6/arch/powerpc/include/asm/page_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/page_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -170,15 +170,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1502,9 +1516,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/page_64.h linux-2.6.29.5/arch #include <asm-generic/page.h> -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/page.h linux-2.6.29.5/arch/powerpc/include/asm/page.h ---- linux-2.6.29.5/arch/powerpc/include/asm/page.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/page.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page.h linux-2.6.29.6/arch/powerpc/include/asm/page.h +--- linux-2.6.29.6/arch/powerpc/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/page.h 2009-07-09 22:13:39.000000000 -0400 @@ -114,8 +114,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1517,9 +1531,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/page.h linux-2.6.29.5/arch/po #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/uaccess.h linux-2.6.29.5/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.29.5/arch/powerpc/include/asm/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/include/asm/uaccess.h 2009-06-13 00:48:06.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -334,6 +334,9 @@ static inline unsigned long copy_from_us { unsigned long over; @@ -1540,9 +1554,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/include/asm/uaccess.h linux-2.6.29.5/arch if (access_ok(VERIFY_WRITE, to, n)) return __copy_tofrom_user(to, (__force void __user *)from, n); if ((unsigned long)to < TASK_SIZE) { -diff -urNp linux-2.6.29.5/arch/powerpc/kernel/module_32.c linux-2.6.29.5/arch/powerpc/kernel/module_32.c ---- linux-2.6.29.5/arch/powerpc/kernel/module_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/kernel/module_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/kernel/module_32.c linux-2.6.29.6/arch/powerpc/kernel/module_32.c +--- linux-2.6.29.6/arch/powerpc/kernel/module_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/kernel/module_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -1572,9 +1586,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/kernel/module_32.c linux-2.6.29.5/arch/po /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.29.5/arch/powerpc/kernel/signal_32.c linux-2.6.29.5/arch/powerpc/kernel/signal_32.c ---- linux-2.6.29.5/arch/powerpc/kernel/signal_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/kernel/signal_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_32.c linux-2.6.29.6/arch/powerpc/kernel/signal_32.c +--- linux-2.6.29.6/arch/powerpc/kernel/signal_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/kernel/signal_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -1584,9 +1598,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/kernel/signal_32.c linux-2.6.29.5/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.29.5/arch/powerpc/kernel/signal_64.c linux-2.6.29.5/arch/powerpc/kernel/signal_64.c ---- linux-2.6.29.5/arch/powerpc/kernel/signal_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/kernel/signal_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_64.c linux-2.6.29.6/arch/powerpc/kernel/signal_64.c +--- linux-2.6.29.6/arch/powerpc/kernel/signal_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/kernel/signal_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -1596,9 +1610,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/kernel/signal_64.c linux-2.6.29.5/arch/po regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.29.5/arch/powerpc/kernel/vdso.c linux-2.6.29.5/arch/powerpc/kernel/vdso.c ---- linux-2.6.29.5/arch/powerpc/kernel/vdso.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/kernel/vdso.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/kernel/vdso.c linux-2.6.29.6/arch/powerpc/kernel/vdso.c +--- linux-2.6.29.6/arch/powerpc/kernel/vdso.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/kernel/vdso.c 2009-07-09 22:13:39.000000000 -0400 @@ -211,7 +211,7 @@ int arch_setup_additional_pages(struct l vdso_base = VDSO32_MBASE; #endif @@ -1617,9 +1631,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/kernel/vdso.c linux-2.6.29.5/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.29.5/arch/powerpc/lib/usercopy_64.c linux-2.6.29.5/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.29.5/arch/powerpc/lib/usercopy_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/lib/usercopy_64.c 2009-06-13 00:43:03.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -11,6 +11,9 @@ unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) @@ -1640,9 +1654,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/lib/usercopy_64.c linux-2.6.29.5/arch/pow if (likely(access_ok(VERIFY_WRITE, to, n))) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.29.5/arch/powerpc/mm/fault.c linux-2.6.29.5/arch/powerpc/mm/fault.c ---- linux-2.6.29.5/arch/powerpc/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/mm/fault.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/mm/fault.c linux-2.6.29.6/arch/powerpc/mm/fault.c +--- linux-2.6.29.6/arch/powerpc/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -29,6 +29,10 @@ #include <linux/module.h> #include <linux/kprobes.h> @@ -2065,9 +2079,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/mm/fault.c linux-2.6.29.5/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.29.5/arch/powerpc/mm/mmap.c linux-2.6.29.5/arch/powerpc/mm/mmap.c ---- linux-2.6.29.5/arch/powerpc/mm/mmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/powerpc/mm/mmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/powerpc/mm/mmap.c linux-2.6.29.6/arch/powerpc/mm/mmap.c +--- linux-2.6.29.6/arch/powerpc/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/powerpc/mm/mmap.c 2009-07-09 22:13:39.000000000 -0400 @@ -75,10 +75,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2091,9 +2105,9 @@ diff -urNp linux-2.6.29.5/arch/powerpc/mm/mmap.c linux-2.6.29.5/arch/powerpc/mm/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.5/arch/s390/include/asm/atomic.h linux-2.6.29.5/arch/s390/include/asm/atomic.h ---- linux-2.6.29.5/arch/s390/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/s390/include/asm/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/s390/include/asm/atomic.h linux-2.6.29.6/arch/s390/include/asm/atomic.h +--- linux-2.6.29.6/arch/s390/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/s390/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -82,8 +82,10 @@ static __inline__ int atomic_add_return( return __CS_LOOP(v, i, "ar"); } @@ -2113,9 +2127,9 @@ diff -urNp linux-2.6.29.5/arch/s390/include/asm/atomic.h linux-2.6.29.5/arch/s39 #define atomic_sub_and_test(_i, _v) (atomic_sub_return(_i, _v) == 0) #define atomic_dec(_v) atomic_sub_return(1, _v) #define atomic_dec_return(_v) atomic_sub_return(1, _v) -diff -urNp linux-2.6.29.5/arch/s390/include/asm/kmap_types.h linux-2.6.29.5/arch/s390/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/s390/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/s390/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/s390/include/asm/kmap_types.h linux-2.6.29.6/arch/s390/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/s390/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/s390/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -2124,9 +2138,9 @@ diff -urNp linux-2.6.29.5/arch/s390/include/asm/kmap_types.h linux-2.6.29.5/arch KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/s390/include/asm/uaccess.h linux-2.6.29.5/arch/s390/include/asm/uaccess.h ---- linux-2.6.29.5/arch/s390/include/asm/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/s390/include/asm/uaccess.h 2009-06-13 00:54:08.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/s390/include/asm/uaccess.h linux-2.6.29.6/arch/s390/include/asm/uaccess.h +--- linux-2.6.29.6/arch/s390/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/s390/include/asm/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -285,7 +285,7 @@ copy_from_user(void *to, const void __us might_sleep(); if (access_ok(VERIFY_READ, from, n)) @@ -2136,9 +2150,9 @@ diff -urNp linux-2.6.29.5/arch/s390/include/asm/uaccess.h linux-2.6.29.5/arch/s3 memset(to, 0, n); return n; } -diff -urNp linux-2.6.29.5/arch/s390/kernel/module.c linux-2.6.29.5/arch/s390/kernel/module.c ---- linux-2.6.29.5/arch/s390/kernel/module.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/s390/kernel/module.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/s390/kernel/module.c linux-2.6.29.6/arch/s390/kernel/module.c +--- linux-2.6.29.6/arch/s390/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/s390/kernel/module.c 2009-07-09 22:13:39.000000000 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2210,9 +2224,9 @@ diff -urNp linux-2.6.29.5/arch/s390/kernel/module.c linux-2.6.29.5/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.29.5/arch/sh/include/asm/atomic.h linux-2.6.29.5/arch/sh/include/asm/atomic.h ---- linux-2.6.29.5/arch/sh/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sh/include/asm/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sh/include/asm/atomic.h linux-2.6.29.6/arch/sh/include/asm/atomic.h +--- linux-2.6.29.6/arch/sh/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sh/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -43,6 +43,9 @@ #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) @@ -2223,9 +2237,9 @@ diff -urNp linux-2.6.29.5/arch/sh/include/asm/atomic.h linux-2.6.29.5/arch/sh/in #define atomic_dec(v) atomic_sub(1,(v)) #ifndef CONFIG_GUSA_RB -diff -urNp linux-2.6.29.5/arch/sh/include/asm/kmap_types.h linux-2.6.29.5/arch/sh/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/sh/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sh/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sh/include/asm/kmap_types.h linux-2.6.29.6/arch/sh/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/sh/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sh/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -24,7 +24,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -2236,9 +2250,9 @@ diff -urNp linux-2.6.29.5/arch/sh/include/asm/kmap_types.h linux-2.6.29.5/arch/s }; #undef D -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/atomic_32.h linux-2.6.29.5/arch/sparc/include/asm/atomic_32.h ---- linux-2.6.29.5/arch/sparc/include/asm/atomic_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/atomic_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h +--- linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -26,8 +26,11 @@ extern void atomic_set(atomic_t *, int); #define atomic_read(v) ((v)->counter) @@ -2251,9 +2265,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/atomic_32.h linux-2.6.29.5/arch #define atomic_dec(v) ((void)__atomic_add_return( -1, (v))) #define atomic_add_return(i, v) (__atomic_add_return( (int)(i), (v))) -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/atomic_64.h linux-2.6.29.5/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.29.5/arch/sparc/include/asm/atomic_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/atomic_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -20,8 +20,10 @@ #define atomic64_set(v, i) (((v)->counter) = i) @@ -2273,9 +2287,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/atomic_64.h linux-2.6.29.5/arch #define atomic64_inc(v) atomic64_add(1, v) #define atomic_dec(v) atomic_sub(1, v) -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/elf_32.h linux-2.6.29.5/arch/sparc/include/asm/elf_32.h ---- linux-2.6.29.5/arch/sparc/include/asm/elf_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/elf_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_32.h linux-2.6.29.6/arch/sparc/include/asm/elf_32.h +--- linux-2.6.29.6/arch/sparc/include/asm/elf_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/elf_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -2290,9 +2304,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/elf_32.h linux-2.6.29.5/arch/sp /* 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 -urNp linux-2.6.29.5/arch/sparc/include/asm/elf_64.h linux-2.6.29.5/arch/sparc/include/asm/elf_64.h ---- linux-2.6.29.5/arch/sparc/include/asm/elf_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/elf_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_64.h linux-2.6.29.6/arch/sparc/include/asm/elf_64.h +--- linux-2.6.29.6/arch/sparc/include/asm/elf_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/elf_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -2306,9 +2320,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/elf_64.h linux-2.6.29.5/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/kmap_types.h linux-2.6.29.5/arch/sparc/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/sparc/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -2317,9 +2331,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/kmap_types.h linux-2.6.29.5/arc KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/pgtable_32.h linux-2.6.29.5/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.29.5/arch/sparc/include/asm/pgtable_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/pgtable_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -2351,9 +2365,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/pgtable_32.h linux-2.6.29.5/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.29.5/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.29.5/arch/sparc/include/asm/pgtsrmmu.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/pgtsrmmu.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h 2009-07-09 22:13:39.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -2368,9 +2382,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.29.5/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/uaccess_32.h linux-2.6.29.5/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.29.5/arch/sparc/include/asm/uaccess_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/uaccess_32.h 2009-06-13 00:16:38.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -246,7 +246,7 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) @@ -2389,9 +2403,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/uaccess_32.h linux-2.6.29.5/arc return __copy_user((__force void __user *) to, from, n); else return n; -diff -urNp linux-2.6.29.5/arch/sparc/include/asm/uaccess_64.h linux-2.6.29.5/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.29.5/arch/sparc/include/asm/uaccess_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/include/asm/uaccess_64.h 2009-06-13 00:22:27.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -212,7 +212,12 @@ extern unsigned long copy_from_user_fixu static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) @@ -2420,9 +2434,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/include/asm/uaccess_64.h linux-2.6.29.5/arc if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); -diff -urNp linux-2.6.29.5/arch/sparc/kernel/Makefile linux-2.6.29.5/arch/sparc/kernel/Makefile ---- linux-2.6.29.5/arch/sparc/kernel/Makefile 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/kernel/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/kernel/Makefile linux-2.6.29.6/arch/sparc/kernel/Makefile +--- linux-2.6.29.6/arch/sparc/kernel/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/kernel/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -3,7 +3,7 @@ # @@ -2432,9 +2446,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/kernel/Makefile linux-2.6.29.5/arch/sparc/k extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.29.5/arch/sparc/kernel/sys_sparc_32.c linux-2.6.29.5/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.29.5/arch/sparc/kernel/sys_sparc_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/kernel/sys_sparc_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -2444,9 +2458,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/kernel/sys_sparc_32.c linux-2.6.29.5/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.29.5/arch/sparc/kernel/sys_sparc_64.c linux-2.6.29.5/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.29.5/arch/sparc/kernel/sys_sparc_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/kernel/sys_sparc_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -2525,9 +2539,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/kernel/sys_sparc_64.c linux-2.6.29.5/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.5/arch/sparc/Makefile linux-2.6.29.5/arch/sparc/Makefile ---- linux-2.6.29.5/arch/sparc/Makefile 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/Makefile linux-2.6.29.6/arch/sparc/Makefile +--- linux-2.6.29.6/arch/sparc/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -81,7 +81,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -2537,9 +2551,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/Makefile linux-2.6.29.5/arch/sparc/Makefile VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.29.5/arch/sparc/mm/fault_32.c linux-2.6.29.5/arch/sparc/mm/fault_32.c ---- linux-2.6.29.5/arch/sparc/mm/fault_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/mm/fault_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_32.c linux-2.6.29.6/arch/sparc/mm/fault_32.c +--- linux-2.6.29.6/arch/sparc/mm/fault_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/mm/fault_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -2825,9 +2839,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/mm/fault_32.c linux-2.6.29.5/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.29.5/arch/sparc/mm/fault_64.c linux-2.6.29.5/arch/sparc/mm/fault_64.c ---- linux-2.6.29.5/arch/sparc/mm/fault_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/mm/fault_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_64.c linux-2.6.29.6/arch/sparc/mm/fault_64.c +--- linux-2.6.29.6/arch/sparc/mm/fault_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/mm/fault_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -3236,9 +3250,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/mm/fault_64.c linux-2.6.29.5/arch/sparc/mm/ /* 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 -urNp linux-2.6.29.5/arch/sparc/mm/init_32.c linux-2.6.29.5/arch/sparc/mm/init_32.c ---- linux-2.6.29.5/arch/sparc/mm/init_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/mm/init_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/mm/init_32.c linux-2.6.29.6/arch/sparc/mm/init_32.c +--- linux-2.6.29.6/arch/sparc/mm/init_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/mm/init_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -316,6 +316,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -3273,9 +3287,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/mm/init_32.c linux-2.6.29.5/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.29.5/arch/sparc/mm/Makefile linux-2.6.29.5/arch/sparc/mm/Makefile ---- linux-2.6.29.5/arch/sparc/mm/Makefile 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/mm/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/mm/Makefile linux-2.6.29.6/arch/sparc/mm/Makefile +--- linux-2.6.29.6/arch/sparc/mm/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/mm/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -2,7 +2,7 @@ # @@ -3285,9 +3299,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/mm/Makefile linux-2.6.29.5/arch/sparc/mm/Ma obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.29.5/arch/sparc/mm/srmmu.c linux-2.6.29.5/arch/sparc/mm/srmmu.c ---- linux-2.6.29.5/arch/sparc/mm/srmmu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/sparc/mm/srmmu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/sparc/mm/srmmu.c linux-2.6.29.6/arch/sparc/mm/srmmu.c +--- linux-2.6.29.6/arch/sparc/mm/srmmu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/sparc/mm/srmmu.c 2009-07-09 22:13:39.000000000 -0400 @@ -2148,6 +2148,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -3302,9 +3316,9 @@ diff -urNp linux-2.6.29.5/arch/sparc/mm/srmmu.c linux-2.6.29.5/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.29.5/arch/um/include/asm/kmap_types.h linux-2.6.29.5/arch/um/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/um/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/um/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/um/include/asm/kmap_types.h linux-2.6.29.6/arch/um/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/um/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/um/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -3313,9 +3327,9 @@ diff -urNp linux-2.6.29.5/arch/um/include/asm/kmap_types.h linux-2.6.29.5/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/arch/um/include/asm/page.h linux-2.6.29.5/arch/um/include/asm/page.h ---- linux-2.6.29.5/arch/um/include/asm/page.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/um/include/asm/page.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/um/include/asm/page.h linux-2.6.29.6/arch/um/include/asm/page.h +--- linux-2.6.29.6/arch/um/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/um/include/asm/page.h 2009-07-09 22:13:39.000000000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -3326,9 +3340,9 @@ diff -urNp linux-2.6.29.5/arch/um/include/asm/page.h linux-2.6.29.5/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.29.5/arch/um/sys-i386/syscalls.c linux-2.6.29.5/arch/um/sys-i386/syscalls.c ---- linux-2.6.29.5/arch/um/sys-i386/syscalls.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/um/sys-i386/syscalls.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/um/sys-i386/syscalls.c linux-2.6.29.6/arch/um/sys-i386/syscalls.c +--- linux-2.6.29.6/arch/um/sys-i386/syscalls.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/um/sys-i386/syscalls.c 2009-07-09 22:13:39.000000000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -3351,9 +3365,9 @@ diff -urNp linux-2.6.29.5/arch/um/sys-i386/syscalls.c linux-2.6.29.5/arch/um/sys /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.29.5/arch/x86/boot/bitops.h linux-2.6.29.5/arch/x86/boot/bitops.h ---- linux-2.6.29.5/arch/x86/boot/bitops.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/bitops.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/bitops.h linux-2.6.29.6/arch/x86/boot/bitops.h +--- linux-2.6.29.6/arch/x86/boot/bitops.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/bitops.h 2009-07-09 22:13:39.000000000 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -3372,9 +3386,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/bitops.h linux-2.6.29.5/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.29.5/arch/x86/boot/boot.h linux-2.6.29.5/arch/x86/boot/boot.h ---- linux-2.6.29.5/arch/x86/boot/boot.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/boot.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/boot.h linux-2.6.29.6/arch/x86/boot/boot.h +--- linux-2.6.29.6/arch/x86/boot/boot.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/boot.h 2009-07-09 22:13:39.000000000 -0400 @@ -80,7 +80,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -3393,9 +3407,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/boot.h linux-2.6.29.5/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/head_32.S linux-2.6.29.5/arch/x86/boot/compressed/head_32.S ---- linux-2.6.29.5/arch/x86/boot/compressed/head_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/compressed/head_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/head_32.S linux-2.6.29.6/arch/x86/boot/compressed/head_32.S +--- linux-2.6.29.6/arch/x86/boot/compressed/head_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/compressed/head_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -70,7 +70,7 @@ startup_32: addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebx andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx @@ -3445,9 +3459,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/head_32.S linux-2.6.29.5/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/misc.c linux-2.6.29.5/arch/x86/boot/compressed/misc.c ---- linux-2.6.29.5/arch/x86/boot/compressed/misc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/compressed/misc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/misc.c linux-2.6.29.6/arch/x86/boot/compressed/misc.c +--- linux-2.6.29.6/arch/x86/boot/compressed/misc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/compressed/misc.c 2009-07-09 22:13:39.000000000 -0400 @@ -373,7 +373,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -3466,9 +3480,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/misc.c linux-2.6.29.5/arch/x8 error("Wrong destination address"); #endif #endif -diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/relocs.c linux-2.6.29.5/arch/x86/boot/compressed/relocs.c ---- linux-2.6.29.5/arch/x86/boot/compressed/relocs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/compressed/relocs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/relocs.c linux-2.6.29.6/arch/x86/boot/compressed/relocs.c +--- linux-2.6.29.6/arch/x86/boot/compressed/relocs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/compressed/relocs.c 2009-07-09 22:13:39.000000000 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -3579,9 +3593,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/compressed/relocs.c linux-2.6.29.5/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.29.5/arch/x86/boot/cpucheck.c linux-2.6.29.5/arch/x86/boot/cpucheck.c ---- linux-2.6.29.5/arch/x86/boot/cpucheck.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/cpucheck.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/cpucheck.c linux-2.6.29.6/arch/x86/boot/cpucheck.c +--- linux-2.6.29.6/arch/x86/boot/cpucheck.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/cpucheck.c 2009-07-09 22:13:39.000000000 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -3677,9 +3691,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/cpucheck.c linux-2.6.29.5/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.29.5/arch/x86/boot/edd.c linux-2.6.29.5/arch/x86/boot/edd.c ---- linux-2.6.29.5/arch/x86/boot/edd.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/edd.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/edd.c linux-2.6.29.6/arch/x86/boot/edd.c +--- linux-2.6.29.6/arch/x86/boot/edd.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/edd.c 2009-07-09 22:13:39.000000000 -0400 @@ -81,7 +81,7 @@ static int get_edd_info(u8 devno, struct ax = 0x4100; bx = EDDMAGIC1; @@ -3707,9 +3721,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/edd.c linux-2.6.29.5/arch/x86/boot/edd.c "movw %%di,%%es; " "pushfl; stc; int $0x13; setc %%al; popfl; " "popw %%es" -diff -urNp linux-2.6.29.5/arch/x86/boot/main.c linux-2.6.29.5/arch/x86/boot/main.c ---- linux-2.6.29.5/arch/x86/boot/main.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/main.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/main.c linux-2.6.29.6/arch/x86/boot/main.c +--- linux-2.6.29.6/arch/x86/boot/main.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/main.c 2009-07-09 22:13:39.000000000 -0400 @@ -78,7 +78,7 @@ static void query_ist(void) if (cpu.level < 6) return; @@ -3719,9 +3733,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/main.c linux-2.6.29.5/arch/x86/boot/main : "=a" (boot_params.ist_info.signature), "=b" (boot_params.ist_info.command), "=c" (boot_params.ist_info.event), -diff -urNp linux-2.6.29.5/arch/x86/boot/mca.c linux-2.6.29.5/arch/x86/boot/mca.c ---- linux-2.6.29.5/arch/x86/boot/mca.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/mca.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/mca.c linux-2.6.29.6/arch/x86/boot/mca.c +--- linux-2.6.29.6/arch/x86/boot/mca.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/mca.c 2009-07-09 22:13:39.000000000 -0400 @@ -19,7 +19,7 @@ int query_mca(void) u8 err; u16 es, bx, len; @@ -3731,9 +3745,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/mca.c linux-2.6.29.5/arch/x86/boot/mca.c "int $0x15 ; " "setc %0 ; " "movw %%es, %1 ; " -diff -urNp linux-2.6.29.5/arch/x86/boot/memory.c linux-2.6.29.5/arch/x86/boot/memory.c ---- linux-2.6.29.5/arch/x86/boot/memory.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/memory.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/memory.c linux-2.6.29.6/arch/x86/boot/memory.c +--- linux-2.6.29.6/arch/x86/boot/memory.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/memory.c 2009-07-09 22:13:39.000000000 -0400 @@ -30,7 +30,7 @@ static int detect_memory_e820(void) /* Important: %edx and %esi are clobbered by some BIOSes, so they must be either used for the error output @@ -3761,9 +3775,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/memory.c linux-2.6.29.5/arch/x86/boot/me boot_params.screen_info.ext_mem_k = ax; -diff -urNp linux-2.6.29.5/arch/x86/boot/video.c linux-2.6.29.5/arch/x86/boot/video.c ---- linux-2.6.29.5/arch/x86/boot/video.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/video.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/video.c linux-2.6.29.6/arch/x86/boot/video.c +--- linux-2.6.29.6/arch/x86/boot/video.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/video.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,7 +23,7 @@ static void store_cursor_position(void) ax = 0x0300; @@ -3782,9 +3796,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/video.c linux-2.6.29.5/arch/x86/boot/vid : "+a" (ax), "=b" (page) : : "ecx", "edx", "esi", "edi"); -diff -urNp linux-2.6.29.5/arch/x86/boot/video-vesa.c linux-2.6.29.5/arch/x86/boot/video-vesa.c ---- linux-2.6.29.5/arch/x86/boot/video-vesa.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/video-vesa.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/video-vesa.c linux-2.6.29.6/arch/x86/boot/video-vesa.c +--- linux-2.6.29.6/arch/x86/boot/video-vesa.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/video-vesa.c 2009-07-09 22:13:39.000000000 -0400 @@ -41,7 +41,7 @@ static int vesa_probe(void) ax = 0x4f00; @@ -3856,9 +3870,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/video-vesa.c linux-2.6.29.5/arch/x86/boo : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info), "+c" (cx), "+D" (di) : : "esi"); -diff -urNp linux-2.6.29.5/arch/x86/boot/video-vga.c linux-2.6.29.5/arch/x86/boot/video-vga.c ---- linux-2.6.29.5/arch/x86/boot/video-vga.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/video-vga.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/video-vga.c linux-2.6.29.6/arch/x86/boot/video-vga.c +--- linux-2.6.29.6/arch/x86/boot/video-vga.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/video-vga.c 2009-07-09 22:13:39.000000000 -0400 @@ -225,7 +225,7 @@ static int vga_probe(void) }; u8 vga_flag; @@ -3877,9 +3891,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/video-vga.c linux-2.6.29.5/arch/x86/boot : "=a" (vga_flag) : "a" (0x1a00) : "ebx", "ecx", "edx", "esi", "edi"); -diff -urNp linux-2.6.29.5/arch/x86/boot/voyager.c linux-2.6.29.5/arch/x86/boot/voyager.c ---- linux-2.6.29.5/arch/x86/boot/voyager.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/boot/voyager.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/boot/voyager.c linux-2.6.29.6/arch/x86/boot/voyager.c +--- linux-2.6.29.6/arch/x86/boot/voyager.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/boot/voyager.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,7 +23,7 @@ int query_voyager(void) data_ptr[0] = 0xff; /* Flag on config not found(?) */ @@ -3889,9 +3903,9 @@ diff -urNp linux-2.6.29.5/arch/x86/boot/voyager.c linux-2.6.29.5/arch/x86/boot/v "int $0x15 ; " "setc %0 ; " "movw %%es, %1 ; " -diff -urNp linux-2.6.29.5/arch/x86/ia32/ia32_signal.c linux-2.6.29.5/arch/x86/ia32/ia32_signal.c ---- linux-2.6.29.5/arch/x86/ia32/ia32_signal.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/ia32/ia32_signal.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/ia32/ia32_signal.c linux-2.6.29.6/arch/x86/ia32/ia32_signal.c +--- linux-2.6.29.6/arch/x86/ia32/ia32_signal.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/ia32/ia32_signal.c 2009-07-09 22:13:39.000000000 -0400 @@ -387,7 +387,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -3928,9 +3942,9 @@ diff -urNp linux-2.6.29.5/arch/x86/ia32/ia32_signal.c linux-2.6.29.5/arch/x86/ia #endif return 0; -diff -urNp linux-2.6.29.5/arch/x86/include/asm/alternative.h linux-2.6.29.5/arch/x86/include/asm/alternative.h ---- linux-2.6.29.5/arch/x86/include/asm/alternative.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/alternative.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/alternative.h linux-2.6.29.6/arch/x86/include/asm/alternative.h +--- linux-2.6.29.6/arch/x86/include/asm/alternative.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/alternative.h 2009-07-09 22:13:39.000000000 -0400 @@ -96,7 +96,7 @@ const unsigned char *const *find_nop_tab " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -3958,9 +3972,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/alternative.h linux-2.6.29.5/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" : output : [feat] "i" (feature), ##input) -diff -urNp linux-2.6.29.5/arch/x86/include/asm/atomic_32.h linux-2.6.29.5/arch/x86/include/asm/atomic_32.h ---- linux-2.6.29.5/arch/x86/include/asm/atomic_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/atomic_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_32.h linux-2.6.29.6/arch/x86/include/asm/atomic_32.h +--- linux-2.6.29.6/arch/x86/include/asm/atomic_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/atomic_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -39,7 +39,29 @@ */ static inline void atomic_add(int i, atomic_t *v) @@ -4203,9 +4217,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/atomic_32.h linux-2.6.29.5/arch/x } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -diff -urNp linux-2.6.29.5/arch/x86/include/asm/atomic_64.h linux-2.6.29.5/arch/x86/include/asm/atomic_64.h ---- linux-2.6.29.5/arch/x86/include/asm/atomic_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/atomic_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_64.h linux-2.6.29.6/arch/x86/include/asm/atomic_64.h +--- linux-2.6.29.6/arch/x86/include/asm/atomic_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/atomic_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -38,7 +38,29 @@ */ static inline void atomic_add(int i, atomic_t *v) @@ -4661,9 +4675,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/atomic_64.h linux-2.6.29.5/arch/x } /** -diff -urNp linux-2.6.29.5/arch/x86/include/asm/boot.h linux-2.6.29.5/arch/x86/include/asm/boot.h ---- linux-2.6.29.5/arch/x86/include/asm/boot.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/boot.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/boot.h linux-2.6.29.6/arch/x86/include/asm/boot.h +--- linux-2.6.29.6/arch/x86/include/asm/boot.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/boot.h 2009-07-09 22:13:39.000000000 -0400 @@ -11,10 +11,15 @@ #define ASK_VGA 0xfffd /* ask for it at bootup */ @@ -4681,9 +4695,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/boot.h linux-2.6.29.5/arch/x86/in #ifdef CONFIG_X86_64 #define BOOT_HEAP_SIZE 0x7000 #define BOOT_STACK_SIZE 0x4000 -diff -urNp linux-2.6.29.5/arch/x86/include/asm/cache.h linux-2.6.29.5/arch/x86/include/asm/cache.h ---- linux-2.6.29.5/arch/x86/include/asm/cache.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/cache.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/cache.h linux-2.6.29.6/arch/x86/include/asm/cache.h +--- linux-2.6.29.6/arch/x86/include/asm/cache.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/cache.h 2009-07-09 22:13:39.000000000 -0400 @@ -6,6 +6,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -4692,9 +4706,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/cache.h linux-2.6.29.5/arch/x86/i #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/checksum_32.h linux-2.6.29.5/arch/x86/include/asm/checksum_32.h ---- linux-2.6.29.5/arch/x86/include/asm/checksum_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/checksum_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/checksum_32.h linux-2.6.29.6/arch/x86/include/asm/checksum_32.h +--- linux-2.6.29.6/arch/x86/include/asm/checksum_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/checksum_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -4728,9 +4742,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/checksum_32.h linux-2.6.29.5/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.29.5/arch/x86/include/asm/desc.h linux-2.6.29.5/arch/x86/include/asm/desc.h ---- linux-2.6.29.5/arch/x86/include/asm/desc.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/desc.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/include/asm/desc.h +--- linux-2.6.29.6/arch/x86/include/asm/desc.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/desc.h 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,7 @@ static inline void fill_ldt(struct desc_ desc->base1 = (info->base_addr & 0x00ff0000) >> 16; desc->type = (info->read_exec_only ^ 1) << 1; @@ -4885,9 +4899,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/desc.h linux-2.6.29.5/arch/x86/in #else /* * GET_DESC_BASE reads the descriptor base of the specified segment. -diff -urNp linux-2.6.29.5/arch/x86/include/asm/e820.h linux-2.6.29.5/arch/x86/include/asm/e820.h ---- linux-2.6.29.5/arch/x86/include/asm/e820.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/e820.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/e820.h linux-2.6.29.6/arch/x86/include/asm/e820.h +--- linux-2.6.29.6/arch/x86/include/asm/e820.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/e820.h 2009-07-09 22:13:39.000000000 -0400 @@ -135,7 +135,7 @@ extern char *memory_setup(void); #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -4897,9 +4911,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/e820.h linux-2.6.29.5/arch/x86/in #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/elf.h linux-2.6.29.5/arch/x86/include/asm/elf.h ---- linux-2.6.29.5/arch/x86/include/asm/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/elf.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/include/asm/elf.h +--- linux-2.6.29.6/arch/x86/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -252,7 +252,25 @@ extern int force_personality32; 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. */ @@ -4953,9 +4967,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/elf.h linux-2.6.29.5/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/futex.h linux-2.6.29.5/arch/x86/include/asm/futex.h ---- linux-2.6.29.5/arch/x86/include/asm/futex.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/futex.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/futex.h linux-2.6.29.6/arch/x86/include/asm/futex.h +--- linux-2.6.29.6/arch/x86/include/asm/futex.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/futex.h 2009-07-09 22:13:39.000000000 -0400 @@ -11,6 +11,40 @@ #include <asm/processor.h> #include <asm/system.h> @@ -5067,9 +5081,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/futex.h linux-2.6.29.5/arch/x86/i : "memory" ); -diff -urNp linux-2.6.29.5/arch/x86/include/asm/i387.h linux-2.6.29.5/arch/x86/include/asm/i387.h ---- linux-2.6.29.5/arch/x86/include/asm/i387.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/i387.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/i387.h linux-2.6.29.6/arch/x86/include/asm/i387.h +--- linux-2.6.29.6/arch/x86/include/asm/i387.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/i387.h 2009-07-09 22:13:39.000000000 -0400 @@ -203,13 +203,8 @@ static inline void restore_fpu(struct ta } @@ -5086,9 +5100,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/i387.h linux-2.6.29.5/arch/x86/in /* * These must be called with preempt disabled -diff -urNp linux-2.6.29.5/arch/x86/include/asm/io_64.h linux-2.6.29.5/arch/x86/include/asm/io_64.h ---- linux-2.6.29.5/arch/x86/include/asm/io_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/io_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/io_64.h linux-2.6.29.6/arch/x86/include/asm/io_64.h +--- linux-2.6.29.6/arch/x86/include/asm/io_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/io_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -158,6 +158,17 @@ static inline void *phys_to_virt(unsigne } #endif @@ -5107,9 +5121,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/io_64.h linux-2.6.29.5/arch/x86/i /* * Change "struct page" to physical address. */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/irqflags.h linux-2.6.29.5/arch/x86/include/asm/irqflags.h ---- linux-2.6.29.5/arch/x86/include/asm/irqflags.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/irqflags.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/irqflags.h linux-2.6.29.6/arch/x86/include/asm/irqflags.h +--- linux-2.6.29.6/arch/x86/include/asm/irqflags.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/irqflags.h 2009-07-09 22:13:39.000000000 -0400 @@ -141,6 +141,8 @@ static inline unsigned long __raw_local_ #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit @@ -5119,9 +5133,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/irqflags.h linux-2.6.29.5/arch/x8 #endif -diff -urNp linux-2.6.29.5/arch/x86/include/asm/kmap_types.h linux-2.6.29.5/arch/x86/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/x86/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/kmap_types.h linux-2.6.29.6/arch/x86/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/x86/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -21,7 +21,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -5132,9 +5146,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/kmap_types.h linux-2.6.29.5/arch/ }; #undef D -diff -urNp linux-2.6.29.5/arch/x86/include/asm/kvm_host.h linux-2.6.29.5/arch/x86/include/asm/kvm_host.h ---- linux-2.6.29.5/arch/x86/include/asm/kvm_host.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/kvm_host.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/kvm_host.h linux-2.6.29.6/arch/x86/include/asm/kvm_host.h +--- linux-2.6.29.6/arch/x86/include/asm/kvm_host.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/kvm_host.h 2009-07-09 22:13:39.000000000 -0400 @@ -494,7 +494,7 @@ struct kvm_x86_ops { int (*get_mt_mask_shift)(void); }; @@ -5144,9 +5158,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/kvm_host.h linux-2.6.29.5/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.29.5/arch/x86/include/asm/linkage.h linux-2.6.29.5/arch/x86/include/asm/linkage.h ---- linux-2.6.29.5/arch/x86/include/asm/linkage.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/linkage.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/linkage.h linux-2.6.29.6/arch/x86/include/asm/linkage.h +--- linux-2.6.29.6/arch/x86/include/asm/linkage.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/linkage.h 2009-07-09 22:13:39.000000000 -0400 @@ -7,6 +7,11 @@ #ifdef CONFIG_X86_64 #define __ALIGN .p2align 4,,15 @@ -5171,9 +5185,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/linkage.h linux-2.6.29.5/arch/x86 /* * to check ENTRY_X86/END_X86 and * KPROBE_ENTRY_X86/KPROBE_END_X86 -diff -urNp linux-2.6.29.5/arch/x86/include/asm/local.h linux-2.6.29.5/arch/x86/include/asm/local.h ---- linux-2.6.29.5/arch/x86/include/asm/local.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/local.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/local.h linux-2.6.29.6/arch/x86/include/asm/local.h +--- linux-2.6.29.6/arch/x86/include/asm/local.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/local.h 2009-07-09 22:13:39.000000000 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -5398,9 +5412,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/local.h linux-2.6.29.5/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.29.5/arch/x86/include/asm/mach-default/apm.h linux-2.6.29.5/arch/x86/include/asm/mach-default/apm.h ---- linux-2.6.29.5/arch/x86/include/asm/mach-default/apm.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/mach-default/apm.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h +--- linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h 2009-07-09 22:13:39.000000000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5419,9 +5433,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/mach-default/apm.h linux-2.6.29.5 "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.29.5/arch/x86/include/asm/mman.h linux-2.6.29.5/arch/x86/include/asm/mman.h ---- linux-2.6.29.5/arch/x86/include/asm/mman.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/mman.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/mman.h linux-2.6.29.6/arch/x86/include/asm/mman.h +--- linux-2.6.29.6/arch/x86/include/asm/mman.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/mman.h 2009-07-09 22:13:39.000000000 -0400 @@ -17,4 +17,14 @@ #define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_FUTURE 2 /* lock all future mappings */ @@ -5437,9 +5451,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/mman.h linux-2.6.29.5/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.5/arch/x86/include/asm/mmu_context_32.h ---- linux-2.6.29.5/arch/x86/include/asm/mmu_context_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/mmu_context_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h +--- linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -14,11 +14,15 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { @@ -5503,9 +5517,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.5/a } } #endif -diff -urNp linux-2.6.29.5/arch/x86/include/asm/mmu.h linux-2.6.29.5/arch/x86/include/asm/mmu.h ---- linux-2.6.29.5/arch/x86/include/asm/mmu.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/mmu.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu.h linux-2.6.29.6/arch/x86/include/asm/mmu.h +--- linux-2.6.29.6/arch/x86/include/asm/mmu.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/mmu.h 2009-07-09 22:13:39.000000000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -5532,9 +5546,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/mmu.h linux-2.6.29.5/arch/x86/inc } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.29.5/arch/x86/include/asm/module.h linux-2.6.29.5/arch/x86/include/asm/module.h ---- linux-2.6.29.5/arch/x86/include/asm/module.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/module.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/module.h linux-2.6.29.6/arch/x86/include/asm/module.h +--- linux-2.6.29.6/arch/x86/include/asm/module.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/module.h 2009-07-09 22:13:39.000000000 -0400 @@ -74,7 +74,12 @@ struct mod_arch_specific {}; # else # define MODULE_STACKSIZE "" @@ -5549,9 +5563,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/module.h linux-2.6.29.5/arch/x86/ #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/page_32.h linux-2.6.29.5/arch/x86/include/asm/page_32.h ---- linux-2.6.29.5/arch/x86/include/asm/page_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/page_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_32.h linux-2.6.29.6/arch/x86/include/asm/page_32.h +--- linux-2.6.29.6/arch/x86/include/asm/page_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/page_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -13,6 +13,23 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -5576,9 +5590,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/page_32.h linux-2.6.29.5/arch/x86 #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.29.5/arch/x86/include/asm/page_64.h linux-2.6.29.5/arch/x86/include/asm/page_64.h ---- linux-2.6.29.5/arch/x86/include/asm/page_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/page_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_64.h linux-2.6.29.6/arch/x86/include/asm/page_64.h +--- linux-2.6.29.6/arch/x86/include/asm/page_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/page_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -49,6 +49,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -5596,9 +5610,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/page_64.h linux-2.6.29.5/arch/x86 +#define nx_enabled (1) #endif /* _ASM_X86_PAGE_64_H */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/paravirt.h linux-2.6.29.5/arch/x86/include/asm/paravirt.h ---- linux-2.6.29.5/arch/x86/include/asm/paravirt.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/paravirt.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/paravirt.h linux-2.6.29.6/arch/x86/include/asm/paravirt.h +--- linux-2.6.29.6/arch/x86/include/asm/paravirt.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/paravirt.h 2009-07-09 22:13:39.000000000 -0400 @@ -1558,7 +1558,7 @@ static inline unsigned long __raw_local_ #define PV_RESTORE_REGS popl %edx; popl %ecx; popl %edi; popl %eax #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) @@ -5608,9 +5622,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/paravirt.h linux-2.6.29.5/arch/x8 #endif #define INTERRUPT_RETURN \ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pda.h linux-2.6.29.5/arch/x86/include/asm/pda.h ---- linux-2.6.29.5/arch/x86/include/asm/pda.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pda.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pda.h linux-2.6.29.6/arch/x86/include/asm/pda.h +--- linux-2.6.29.6/arch/x86/include/asm/pda.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pda.h 2009-07-09 22:13:39.000000000 -0400 @@ -16,11 +16,9 @@ struct x8664_pda { unsigned long oldrsp; /* 24 user rsp for system call */ int irqcount; /* 32 Irq nesting counter. Starts -1 */ @@ -5623,9 +5637,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pda.h linux-2.6.29.5/arch/x86/inc char *irqstackptr; short nodenumber; /* number of current node (32k max) */ short in_bootmem; /* pda lives in bootmem */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/percpu.h linux-2.6.29.5/arch/x86/include/asm/percpu.h ---- linux-2.6.29.5/arch/x86/include/asm/percpu.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/percpu.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/percpu.h linux-2.6.29.6/arch/x86/include/asm/percpu.h +--- linux-2.6.29.6/arch/x86/include/asm/percpu.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/percpu.h 2009-07-09 22:13:39.000000000 -0400 @@ -93,6 +93,12 @@ DECLARE_PER_CPU(struct x8664_pda, pda); #define __my_cpu_offset x86_read_percpu(this_cpu_off) @@ -5639,9 +5653,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/percpu.h linux-2.6.29.5/arch/x86/ /* fs segment starts at (positive) offset == __per_cpu_offset[cpu] */ #define __percpu_seg "%%fs:" -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgalloc.h linux-2.6.29.5/arch/x86/include/asm/pgalloc.h ---- linux-2.6.29.5/arch/x86/include/asm/pgalloc.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgalloc.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgalloc.h linux-2.6.29.6/arch/x86/include/asm/pgalloc.h +--- linux-2.6.29.6/arch/x86/include/asm/pgalloc.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgalloc.h 2009-07-09 22:13:39.000000000 -0400 @@ -52,7 +52,7 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -5651,9 +5665,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgalloc.h linux-2.6.29.5/arch/x86 } static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable-2level.h linux-2.6.29.5/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.29.5/arch/x86/include/asm/pgtable-2level.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgtable-2level.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h 2009-07-09 22:13:39.000000000 -0400 @@ -18,7 +18,19 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -5674,9 +5688,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable-2level.h linux-2.6.29.5/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable_32.h linux-2.6.29.5/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.29.5/arch/x86/include/asm/pgtable_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgtable_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -25,8 +25,6 @@ struct mm_struct; struct vm_area_struct; @@ -5717,9 +5731,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable_32.h linux-2.6.29.5/arch/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable-3level.h linux-2.6.29.5/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.29.5/arch/x86/include/asm/pgtable-3level.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgtable-3level.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h 2009-07-09 22:13:39.000000000 -0400 @@ -70,12 +70,36 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -5757,9 +5771,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable-3level.h linux-2.6.29.5/a } /* -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable_64.h linux-2.6.29.5/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.29.5/arch/x86/include/asm/pgtable_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgtable_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,9 +15,12 @@ extern pud_t level3_kernel_pgt[512]; @@ -5815,9 +5829,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable_64.h linux-2.6.29.5/arch/ } #define pte_none(x) (!pte_val((x))) -diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86/include/asm/pgtable.h ---- linux-2.6.29.5/arch/x86/include/asm/pgtable.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/pgtable.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86/include/asm/pgtable.h +--- linux-2.6.29.6/arch/x86/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/pgtable.h 2009-07-10 07:20:51.000000000 -0400 @@ -13,12 +13,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -5860,18 +5874,21 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 #define __PAGE_KERNEL_EXEC \ (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL) #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) -@@ -95,8 +96,8 @@ +@@ -95,8 +96,13 @@ #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC) #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) --#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) --#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT) ++#ifdef CONFIG_PAX_SECURE_VSYSCALL +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER) +#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER) ++#else + #define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) + #define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT) ++#endif #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE) -@@ -155,7 +156,7 @@ +@@ -155,7 +161,7 @@ * bits are combined, this will alow user to access the high address mapped * VDSO in the presence of CONFIG_COMPAT_VDSO */ @@ -5880,7 +5897,7 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 #define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */ #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -183,10 +184,17 @@ extern unsigned long empty_zero_page[PAG +@@ -183,10 +189,17 @@ extern unsigned long empty_zero_page[PAG extern spinlock_t pgd_lock; extern struct list_head pgd_list; @@ -5898,7 +5915,7 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; -@@ -255,9 +263,29 @@ static inline pte_t pte_wrprotect(pte_t +@@ -255,9 +268,29 @@ static inline pte_t pte_wrprotect(pte_t return __pte(pte_val(pte) & ~_PAGE_RW); } @@ -5929,7 +5946,7 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -300,8 +328,6 @@ static inline pte_t pte_mkspecial(pte_t +@@ -300,8 +333,6 @@ static inline pte_t pte_mkspecial(pte_t return __pte(pte_val(pte) | _PAGE_SPECIAL); } @@ -5938,7 +5955,7 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 /* * Mask out unsupported bits in a present pgprot. Non-present pgprots * can use those bits for other purposes, so leave them be. -@@ -601,7 +627,19 @@ static inline void ptep_set_wrprotect(st +@@ -601,7 +632,19 @@ static inline void ptep_set_wrprotect(st */ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) { @@ -5959,9 +5976,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/pgtable.h linux-2.6.29.5/arch/x86 } -diff -urNp linux-2.6.29.5/arch/x86/include/asm/processor.h linux-2.6.29.5/arch/x86/include/asm/processor.h ---- linux-2.6.29.5/arch/x86/include/asm/processor.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/processor.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x86/include/asm/processor.h +--- linux-2.6.29.6/arch/x86/include/asm/processor.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/processor.h 2009-07-09 22:13:39.000000000 -0400 @@ -275,7 +275,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -6045,9 +6062,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/processor.h linux-2.6.29.5/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/ptrace.h linux-2.6.29.5/arch/x86/include/asm/ptrace.h ---- linux-2.6.29.5/arch/x86/include/asm/ptrace.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/ptrace.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/ptrace.h linux-2.6.29.6/arch/x86/include/asm/ptrace.h +--- linux-2.6.29.6/arch/x86/include/asm/ptrace.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/ptrace.h 2009-07-09 22:13:39.000000000 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -6084,9 +6101,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/ptrace.h linux-2.6.29.5/arch/x86/ #endif } -diff -urNp linux-2.6.29.5/arch/x86/include/asm/reboot.h linux-2.6.29.5/arch/x86/include/asm/reboot.h ---- linux-2.6.29.5/arch/x86/include/asm/reboot.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/reboot.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/reboot.h linux-2.6.29.6/arch/x86/include/asm/reboot.h +--- linux-2.6.29.6/arch/x86/include/asm/reboot.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/reboot.h 2009-07-09 22:13:39.000000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -6096,9 +6113,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/reboot.h linux-2.6.29.5/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.29.5/arch/x86/include/asm/rwsem.h linux-2.6.29.5/arch/x86/include/asm/rwsem.h ---- linux-2.6.29.5/arch/x86/include/asm/rwsem.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/rwsem.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/rwsem.h linux-2.6.29.6/arch/x86/include/asm/rwsem.h +--- linux-2.6.29.6/arch/x86/include/asm/rwsem.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/rwsem.h 2009-07-09 22:13:39.000000000 -0400 @@ -106,10 +106,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -6331,9 +6348,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/rwsem.h linux-2.6.29.5/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.29.5/arch/x86/include/asm/segment.h linux-2.6.29.5/arch/x86/include/asm/segment.h ---- linux-2.6.29.5/arch/x86/include/asm/segment.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/segment.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/segment.h linux-2.6.29.6/arch/x86/include/asm/segment.h +--- linux-2.6.29.6/arch/x86/include/asm/segment.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/segment.h 2009-07-09 22:13:39.000000000 -0400 @@ -88,13 +88,19 @@ #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) @@ -6364,9 +6381,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/segment.h linux-2.6.29.5/arch/x86 #else -diff -urNp linux-2.6.29.5/arch/x86/include/asm/spinlock.h linux-2.6.29.5/arch/x86/include/asm/spinlock.h ---- linux-2.6.29.5/arch/x86/include/asm/spinlock.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/spinlock.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/spinlock.h linux-2.6.29.6/arch/x86/include/asm/spinlock.h +--- linux-2.6.29.6/arch/x86/include/asm/spinlock.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/spinlock.h 2009-07-09 22:13:39.000000000 -0400 @@ -311,18 +311,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -6470,9 +6487,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/spinlock.h linux-2.6.29.5/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.29.5/arch/x86/include/asm/system.h linux-2.6.29.5/arch/x86/include/asm/system.h ---- linux-2.6.29.5/arch/x86/include/asm/system.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/system.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/system.h linux-2.6.29.6/arch/x86/include/asm/system.h +--- linux-2.6.29.6/arch/x86/include/asm/system.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/system.h 2009-07-09 22:13:39.000000000 -0400 @@ -95,6 +95,8 @@ do { \ ".globl thread_return\n" \ "thread_return:\n\t" \ @@ -6533,9 +6550,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/system.h linux-2.6.29.5/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess_32.h linux-2.6.29.5/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.29.5/arch/x86/include/asm/uaccess_32.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/uaccess_32.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h 2009-07-09 22:13:39.000000000 -0400 @@ -62,6 +62,8 @@ __copy_to_user_inatomic(void __user *to, return ret; } @@ -6616,9 +6633,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess_32.h linux-2.6.29.5/arch/ long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h 2009-07-09 22:20:50.000000000 -0400 @@ -10,6 +10,8 @@ #include <linux/lockdep.h> #include <asm/page.h> @@ -6718,7 +6735,7 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h linux-2.6.29.5/arch/ } -extern long __copy_user_nocache(void *dst, const void __user *src, -+extern unsigned __copy_user_nocache(void *dst, const void __user *src, ++extern unsigned long __copy_user_nocache(void *dst, const void __user *src, unsigned size, int zerorest); -static inline int __copy_from_user_nocache(void *dst, const void __user *src, @@ -6742,9 +6759,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess_64.h linux-2.6.29.5/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess.h linux-2.6.29.5/arch/x86/include/asm/uaccess.h ---- linux-2.6.29.5/arch/x86/include/asm/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/uaccess.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86/include/asm/uaccess.h +--- linux-2.6.29.6/arch/x86/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -8,8 +8,10 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -6864,9 +6881,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/uaccess.h linux-2.6.29.5/arch/x86 #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.29.5/arch/x86/include/asm/vgtod.h linux-2.6.29.5/arch/x86/include/asm/vgtod.h ---- linux-2.6.29.5/arch/x86/include/asm/vgtod.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/vgtod.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/vgtod.h linux-2.6.29.6/arch/x86/include/asm/vgtod.h +--- linux-2.6.29.6/arch/x86/include/asm/vgtod.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/vgtod.h 2009-07-09 22:13:39.000000000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -6875,9 +6892,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/vgtod.h linux-2.6.29.5/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.29.5/arch/x86/include/asm/vsyscall.h linux-2.6.29.5/arch/x86/include/asm/vsyscall.h ---- linux-2.6.29.5/arch/x86/include/asm/vsyscall.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/include/asm/vsyscall.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/include/asm/vsyscall.h linux-2.6.29.6/arch/x86/include/asm/vsyscall.h +--- linux-2.6.29.6/arch/x86/include/asm/vsyscall.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/include/asm/vsyscall.h 2009-07-09 22:13:39.000000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -6908,9 +6925,9 @@ diff -urNp linux-2.6.29.5/arch/x86/include/asm/vsyscall.h linux-2.6.29.5/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.29.5/arch/x86/Kconfig linux-2.6.29.5/arch/x86/Kconfig ---- linux-2.6.29.5/arch/x86/Kconfig 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/Kconfig 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/Kconfig linux-2.6.29.6/arch/x86/Kconfig +--- linux-2.6.29.6/arch/x86/Kconfig 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/Kconfig 2009-07-09 22:13:39.000000000 -0400 @@ -993,7 +993,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT @@ -6942,9 +6959,9 @@ diff -urNp linux-2.6.29.5/arch/x86/Kconfig linux-2.6.29.5/arch/x86/Kconfig help Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.29.5/arch/x86/Kconfig.cpu linux-2.6.29.5/arch/x86/Kconfig.cpu ---- linux-2.6.29.5/arch/x86/Kconfig.cpu 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/Kconfig.cpu 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/Kconfig.cpu linux-2.6.29.6/arch/x86/Kconfig.cpu +--- linux-2.6.29.6/arch/x86/Kconfig.cpu 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/Kconfig.cpu 2009-07-09 22:13:39.000000000 -0400 @@ -333,7 +333,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -6972,9 +6989,9 @@ diff -urNp linux-2.6.29.5/arch/x86/Kconfig.cpu linux-2.6.29.5/arch/x86/Kconfig.c config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.29.5/arch/x86/Kconfig.debug linux-2.6.29.5/arch/x86/Kconfig.debug ---- linux-2.6.29.5/arch/x86/Kconfig.debug 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/Kconfig.debug 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/Kconfig.debug linux-2.6.29.6/arch/x86/Kconfig.debug +--- linux-2.6.29.6/arch/x86/Kconfig.debug 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/Kconfig.debug 2009-07-09 22:13:39.000000000 -0400 @@ -107,7 +107,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -6984,9 +7001,9 @@ diff -urNp linux-2.6.29.5/arch/x86/Kconfig.debug linux-2.6.29.5/arch/x86/Kconfig help Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/boot.c linux-2.6.29.5/arch/x86/kernel/acpi/boot.c ---- linux-2.6.29.5/arch/x86/kernel/acpi/boot.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/acpi/boot.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/boot.c linux-2.6.29.6/arch/x86/kernel/acpi/boot.c +--- linux-2.6.29.6/arch/x86/kernel/acpi/boot.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/acpi/boot.c 2009-07-09 22:13:39.000000000 -0400 @@ -1705,7 +1705,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -6996,9 +7013,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/boot.c linux-2.6.29.5/arch/x86/ke }; /* -diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.29.5/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.29.5/arch/x86/kernel/acpi/realmode/wakeup.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/acpi/realmode/wakeup.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-09 22:13:39.000000000 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -7008,9 +7025,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.29.5/ wrmsr 1: -diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/sleep.c linux-2.6.29.5/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.29.5/arch/x86/kernel/acpi/sleep.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/acpi/sleep.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c 2009-07-09 22:13:39.000000000 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -7072,9 +7089,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/sleep.c linux-2.6.29.5/arch/x86/k } -diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.29.5/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.29.5/arch/x86/kernel/acpi/wakeup_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/acpi/wakeup_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -7091,9 +7108,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.29.5/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.29.5/arch/x86/kernel/alternative.c linux-2.6.29.5/arch/x86/kernel/alternative.c ---- linux-2.6.29.5/arch/x86/kernel/alternative.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/alternative.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/alternative.c linux-2.6.29.6/arch/x86/kernel/alternative.c +--- linux-2.6.29.6/arch/x86/kernel/alternative.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/alternative.c 2009-07-09 22:13:39.000000000 -0400 @@ -393,7 +393,7 @@ void apply_paravirt(struct paravirt_patc BUG_ON(p->len > MAX_PATCH_LEN); @@ -7181,9 +7198,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/alternative.c linux-2.6.29.5/arch/x86/ + BUG_ON((vaddr)[i] != ((unsigned char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.29.5/arch/x86/kernel/apm_32.c linux-2.6.29.5/arch/x86/kernel/apm_32.c ---- linux-2.6.29.5/arch/x86/kernel/apm_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/apm_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kernel/apm_32.c +--- linux-2.6.29.6/arch/x86/kernel/apm_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/apm_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -403,7 +403,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitq static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue); static struct apm_user *user_list; @@ -7362,9 +7379,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/apm_32.c linux-2.6.29.5/arch/x86/kerne proc_create("apm", 0, NULL, &apm_file_ops); kapmd_task = kthread_create(apm, NULL, "kapmd"); -diff -urNp linux-2.6.29.5/arch/x86/kernel/asm-offsets_32.c linux-2.6.29.5/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.29.5/arch/x86/kernel/asm-offsets_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/asm-offsets_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -100,6 +100,7 @@ void foo(void) DEFINE(PTRS_PER_PTE, PTRS_PER_PTE); DEFINE(PTRS_PER_PMD, PTRS_PER_PMD); @@ -7381,9 +7398,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/asm-offsets_32.c linux-2.6.29.5/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.29.5/arch/x86/kernel/asm-offsets_64.c linux-2.6.29.5/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.29.5/arch/x86/kernel/asm-offsets_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/asm-offsets_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -124,6 +124,7 @@ int main(void) ENTRY(cr8); BLANK(); @@ -7392,9 +7409,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/asm-offsets_64.c linux-2.6.29.5/arch/x DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/common.c linux-2.6.29.5/arch/x86/kernel/cpu/common.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/common.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/common.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/common.c linux-2.6.29.6/arch/x86/kernel/cpu/common.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/common.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/common.c 2009-07-09 22:13:39.000000000 -0400 @@ -2,7 +2,6 @@ #include <linux/kernel.h> #include <linux/sched.h> @@ -7510,9 +7527,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/common.c linux-2.6.29.5/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-09 22:13:39.000000000 -0400 @@ -581,7 +581,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -7522,9 +7539,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.2 }; #endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-09 22:13:39.000000000 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -7534,9 +7551,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/intel.c linux-2.6.29.5/arch/x86/kernel/cpu/intel.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/intel.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/intel.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/intel.c linux-2.6.29.6/arch/x86/kernel/cpu/intel.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/intel.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/intel.c 2009-07-09 22:13:39.000000000 -0400 @@ -94,7 +94,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -7546,9 +7563,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/intel.c linux-2.6.29.5/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.29.5/arch/x86/kernel/cpu/mcheck/mce_64.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -678,6 +678,7 @@ static struct miscdevice mce_log_device MISC_MCELOG_MINOR, "mcelog", @@ -7557,9 +7574,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.29.5/arc }; static unsigned long old_cr4 __initdata; -diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.29.5/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.29.5/arch/x86/kernel/cpu/mtrr/generic.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/cpu/mtrr/generic.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,14 +23,14 @@ static struct fixed_range_block fixed_ra { MTRRfix64K_00000_MSR, 1 }, /* one 64k MTRR */ { MTRRfix16K_80000_MSR, 2 }, /* two 16k MTRRs */ @@ -7577,9 +7594,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.29.5/arch EXPORT_SYMBOL_GPL(mtrr_state); static int __initdata mtrr_show; -diff -urNp linux-2.6.29.5/arch/x86/kernel/crash.c linux-2.6.29.5/arch/x86/kernel/crash.c ---- linux-2.6.29.5/arch/x86/kernel/crash.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/crash.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/crash.c linux-2.6.29.6/arch/x86/kernel/crash.c +--- linux-2.6.29.6/arch/x86/kernel/crash.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/crash.c 2009-07-09 22:13:39.000000000 -0400 @@ -43,7 +43,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -7589,9 +7606,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/crash.c linux-2.6.29.5/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.29.5/arch/x86/kernel/doublefault_32.c linux-2.6.29.5/arch/x86/kernel/doublefault_32.c ---- linux-2.6.29.5/arch/x86/kernel/doublefault_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/doublefault_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/doublefault_32.c linux-2.6.29.6/arch/x86/kernel/doublefault_32.c +--- linux-2.6.29.6/arch/x86/kernel/doublefault_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/doublefault_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -7623,9 +7640,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/doublefault_32.c linux-2.6.29.5/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.29.5/arch/x86/kernel/dumpstack_32.c linux-2.6.29.5/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.29.5/arch/x86/kernel/dumpstack_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/dumpstack_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -7670,9 +7687,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/dumpstack_32.c linux-2.6.29.5/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.29.5/arch/x86/kernel/dumpstack.c linux-2.6.29.5/arch/x86/kernel/dumpstack.c ---- linux-2.6.29.5/arch/x86/kernel/dumpstack.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/dumpstack.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack.c linux-2.6.29.6/arch/x86/kernel/dumpstack.c +--- linux-2.6.29.6/arch/x86/kernel/dumpstack.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/dumpstack.c 2009-07-09 22:13:39.000000000 -0400 @@ -178,7 +178,7 @@ void dump_stack(void) #endif @@ -7691,9 +7708,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/dumpstack.c linux-2.6.29.5/arch/x86/ke report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.29.5/arch/x86/kernel/e820.c linux-2.6.29.5/arch/x86/kernel/e820.c ---- linux-2.6.29.5/arch/x86/kernel/e820.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/e820.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/e820.c linux-2.6.29.6/arch/x86/kernel/e820.c +--- linux-2.6.29.6/arch/x86/kernel/e820.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/e820.c 2009-07-09 22:13:39.000000000 -0400 @@ -698,7 +698,10 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -7706,9 +7723,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/e820.c linux-2.6.29.5/arch/x86/kernel/ }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.29.5/arch/x86/kernel/efi_32.c linux-2.6.29.5/arch/x86/kernel/efi_32.c ---- linux-2.6.29.5/arch/x86/kernel/efi_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/efi_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_32.c linux-2.6.29.6/arch/x86/kernel/efi_32.c +--- linux-2.6.29.6/arch/x86/kernel/efi_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/efi_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -38,70 +38,38 @@ */ @@ -7789,9 +7806,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/efi_32.c linux-2.6.29.5/arch/x86/kerne /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.29.5/arch/x86/kernel/efi_stub_32.S linux-2.6.29.5/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.29.5/arch/x86/kernel/efi_stub_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/efi_stub_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -6,6 +6,7 @@ */ @@ -7889,9 +7906,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/efi_stub_32.S linux-2.6.29.5/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.29.5/arch/x86/kernel/entry_32.S linux-2.6.29.5/arch/x86/kernel/entry_32.S ---- linux-2.6.29.5/arch/x86/kernel/entry_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/entry_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/kernel/entry_32.S +--- linux-2.6.29.6/arch/x86/kernel/entry_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/entry_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -101,7 +101,7 @@ #define resume_userspace_sig resume_userspace #endif @@ -8181,9 +8198,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/entry_32.S linux-2.6.29.5/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.29.5/arch/x86/kernel/entry_64.S linux-2.6.29.5/arch/x86/kernel/entry_64.S ---- linux-2.6.29.5/arch/x86/kernel/entry_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/entry_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_64.S linux-2.6.29.6/arch/x86/kernel/entry_64.S +--- linux-2.6.29.6/arch/x86/kernel/entry_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/entry_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -1073,10 +1073,11 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ @@ -8199,9 +8216,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/entry_64.S linux-2.6.29.5/arch/x86/ker jmp paranoid_exit /* %ebx: no swapgs flag */ CFI_ENDPROC END(\sym) -diff -urNp linux-2.6.29.5/arch/x86/kernel/ftrace.c linux-2.6.29.5/arch/x86/kernel/ftrace.c ---- linux-2.6.29.5/arch/x86/kernel/ftrace.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/ftrace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/ftrace.c linux-2.6.29.6/arch/x86/kernel/ftrace.c +--- linux-2.6.29.6/arch/x86/kernel/ftrace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/ftrace.c 2009-07-09 22:13:39.000000000 -0400 @@ -250,9 +250,9 @@ int ftrace_update_ftrace_func(ftrace_fun unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; @@ -8214,9 +8231,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/ftrace.c linux-2.6.29.5/arch/x86/kerne return ret; } -diff -urNp linux-2.6.29.5/arch/x86/kernel/head32.c linux-2.6.29.5/arch/x86/kernel/head32.c ---- linux-2.6.29.5/arch/x86/kernel/head32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/head32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/head32.c linux-2.6.29.6/arch/x86/kernel/head32.c +--- linux-2.6.29.6/arch/x86/kernel/head32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/head32.c 2009-07-09 22:13:39.000000000 -0400 @@ -13,12 +13,13 @@ #include <asm/e820.h> #include <asm/bios_ebda.h> @@ -8232,9 +8249,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/head32.c linux-2.6.29.5/arch/x86/kerne #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.29.5/arch/x86/kernel/head_32.S linux-2.6.29.5/arch/x86/kernel/head_32.S ---- linux-2.6.29.5/arch/x86/kernel/head_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/head_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kernel/head_32.S +--- linux-2.6.29.6/arch/x86/kernel/head_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/head_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/asm-offsets.h> #include <asm/setup.h> @@ -8644,9 +8661,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/head_32.S linux-2.6.29.5/arch/x86/kern + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.29.5/arch/x86/kernel/head64.c linux-2.6.29.5/arch/x86/kernel/head64.c ---- linux-2.6.29.5/arch/x86/kernel/head64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/head64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/head64.c linux-2.6.29.6/arch/x86/kernel/head64.c +--- linux-2.6.29.6/arch/x86/kernel/head64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/head64.c 2009-07-09 22:13:39.000000000 -0400 @@ -94,6 +94,8 @@ void __init x86_64_start_kernel(char * r /* clear bss before set_intr_gate with early_idt_handler */ clear_bss(); @@ -8665,9 +8682,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/head64.c linux-2.6.29.5/arch/x86/kerne x86_64_start_reservations(real_mode_data); } -diff -urNp linux-2.6.29.5/arch/x86/kernel/head_64.S linux-2.6.29.5/arch/x86/kernel/head_64.S ---- linux-2.6.29.5/arch/x86/kernel/head_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/head_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kernel/head_64.S +--- linux-2.6.29.6/arch/x86/kernel/head_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/head_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) @@ -8901,9 +8918,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/head_64.S linux-2.6.29.5/arch/x86/kern .section .bss.page_aligned, "aw", @nobits .align PAGE_SIZE -diff -urNp linux-2.6.29.5/arch/x86/kernel/i386_ksyms_32.c linux-2.6.29.5/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.29.5/arch/x86/kernel/i386_ksyms_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/i386_ksyms_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -10,8 +10,12 @@ EXPORT_SYMBOL(mcount); #endif @@ -8925,9 +8942,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/i386_ksyms_32.c linux-2.6.29.5/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(KERNEL_TEXT_OFFSET); +#endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/init_task.c linux-2.6.29.5/arch/x86/kernel/init_task.c ---- linux-2.6.29.5/arch/x86/kernel/init_task.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/init_task.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/init_task.c linux-2.6.29.6/arch/x86/kernel/init_task.c +--- linux-2.6.29.6/arch/x86/kernel/init_task.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/init_task.c 2009-07-09 22:13:39.000000000 -0400 @@ -40,5 +40,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. @@ -8936,9 +8953,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/init_task.c linux-2.6.29.5/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.29.5/arch/x86/kernel/ioport.c linux-2.6.29.5/arch/x86/kernel/ioport.c ---- linux-2.6.29.5/arch/x86/kernel/ioport.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/ioport.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/ioport.c linux-2.6.29.6/arch/x86/kernel/ioport.c +--- linux-2.6.29.6/arch/x86/kernel/ioport.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/ioport.c 2009-07-09 22:13:39.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -8983,9 +9000,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/ioport.c linux-2.6.29.5/arch/x86/kerne } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.29.5/arch/x86/kernel/irq_32.c linux-2.6.29.5/arch/x86/kernel/irq_32.c ---- linux-2.6.29.5/arch/x86/kernel/irq_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/irq_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/irq_32.c linux-2.6.29.6/arch/x86/kernel/irq_32.c +--- linux-2.6.29.6/arch/x86/kernel/irq_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/irq_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -93,7 +93,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -9004,9 +9021,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/irq_32.c linux-2.6.29.5/arch/x86/kerne call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.29.5/arch/x86/kernel/kprobes.c linux-2.6.29.5/arch/x86/kernel/kprobes.c ---- linux-2.6.29.5/arch/x86/kernel/kprobes.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/kprobes.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/kprobes.c linux-2.6.29.6/arch/x86/kernel/kprobes.c +--- linux-2.6.29.6/arch/x86/kernel/kprobes.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/kprobes.c 2009-07-09 22:13:39.000000000 -0400 @@ -166,9 +166,24 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -9111,9 +9128,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/kprobes.c linux-2.6.29.5/arch/x86/kern return ret; switch (val) { -diff -urNp linux-2.6.29.5/arch/x86/kernel/ldt.c linux-2.6.29.5/arch/x86/kernel/ldt.c ---- linux-2.6.29.5/arch/x86/kernel/ldt.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/ldt.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/ldt.c linux-2.6.29.6/arch/x86/kernel/ldt.c +--- linux-2.6.29.6/arch/x86/kernel/ldt.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/ldt.c 2009-07-09 22:13:39.000000000 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -9178,9 +9195,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/ldt.c linux-2.6.29.5/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.29.5/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.5/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.29.5/arch/x86/kernel/machine_kexec_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/machine_kexec_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -9208,9 +9225,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.5/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.29.5/arch/x86/kernel/module_32.c linux-2.6.29.5/arch/x86/kernel/module_32.c ---- linux-2.6.29.5/arch/x86/kernel/module_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/module_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/kernel/module_32.c +--- linux-2.6.29.6/arch/x86/kernel/module_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/module_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,6 +23,9 @@ #include <linux/kernel.h> #include <linux/bug.h> @@ -9358,9 +9375,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/module_32.c linux-2.6.29.5/arch/x86/ke break; default: printk(KERN_ERR "module %s: Unknown relocation: %u\n", -diff -urNp linux-2.6.29.5/arch/x86/kernel/module_64.c linux-2.6.29.5/arch/x86/kernel/module_64.c ---- linux-2.6.29.5/arch/x86/kernel/module_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/module_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/kernel/module_64.c +--- linux-2.6.29.6/arch/x86/kernel/module_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/module_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -40,7 +40,7 @@ void module_free(struct module *mod, voi table entries. */ } @@ -9478,9 +9495,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/module_64.c linux-2.6.29.5/arch/x86/ke #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.29.5/arch/x86/kernel/paravirt.c linux-2.6.29.5/arch/x86/kernel/paravirt.c ---- linux-2.6.29.5/arch/x86/kernel/paravirt.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/paravirt.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/kernel/paravirt.c +--- linux-2.6.29.6/arch/x86/kernel/paravirt.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/paravirt.c 2009-07-09 22:13:39.000000000 -0400 @@ -44,7 +44,7 @@ void _paravirt_nop(void) { } @@ -9560,9 +9577,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/paravirt.c linux-2.6.29.5/arch/x86/ker #ifndef CONFIG_X86_64 .pagetable_setup_start = native_pagetable_setup_start, .pagetable_setup_done = native_pagetable_setup_done, -diff -urNp linux-2.6.29.5/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.29.5/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.29.5/arch/x86/kernel/paravirt-spinlocks.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/paravirt-spinlocks.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c 2009-07-09 22:13:39.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -9572,9 +9589,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.29.5/ar #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.29.5/arch/x86/kernel/process_32.c linux-2.6.29.5/arch/x86/kernel/process_32.c ---- linux-2.6.29.5/arch/x86/kernel/process_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/process_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/kernel/process_32.c +--- linux-2.6.29.6/arch/x86/kernel/process_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/process_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -66,8 +66,10 @@ asmlinkage void ret_from_fork(void) __as DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; EXPORT_PER_CPU_SYMBOL(current_task); @@ -9706,9 +9723,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/process_32.c linux-2.6.29.5/arch/x86/k + load_sp0(init_tss + smp_processor_id(), thread); } +#endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/process_64.c linux-2.6.29.5/arch/x86/kernel/process_64.c ---- linux-2.6.29.5/arch/x86/kernel/process_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/process_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/kernel/process_64.c +--- linux-2.6.29.6/arch/x86/kernel/process_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/process_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -9794,9 +9811,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/process_64.c linux-2.6.29.5/arch/x86/k - unsigned long range_end = mm->brk + 0x02000000; - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} -diff -urNp linux-2.6.29.5/arch/x86/kernel/ptrace.c linux-2.6.29.5/arch/x86/kernel/ptrace.c ---- linux-2.6.29.5/arch/x86/kernel/ptrace.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/ptrace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/ptrace.c linux-2.6.29.6/arch/x86/kernel/ptrace.c +--- linux-2.6.29.6/arch/x86/kernel/ptrace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/ptrace.c 2009-07-09 22:13:39.000000000 -0400 @@ -1377,7 +1377,7 @@ void send_sigtrap(struct task_struct *ts info.si_code = si_code; @@ -9806,9 +9823,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/ptrace.c linux-2.6.29.5/arch/x86/kerne /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kernel/reboot.c ---- linux-2.6.29.5/arch/x86/kernel/reboot.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/reboot.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kernel/reboot.c +--- linux-2.6.29.6/arch/x86/kernel/reboot.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/reboot.c 2009-07-09 22:13:39.000000000 -0400 @@ -32,7 +32,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -9818,7 +9835,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne enum reboot_type reboot_type = BOOT_KBD; int reboot_force; -@@ -225,7 +225,7 @@ static struct dmi_system_id __initdata r +@@ -234,7 +234,7 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"), }, }, @@ -9827,7 +9844,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne }; static int __init reboot_init(void) -@@ -241,12 +241,12 @@ core_initcall(reboot_init); +@@ -250,12 +250,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ @@ -9845,7 +9862,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne }; static const struct desc_ptr -@@ -295,7 +295,7 @@ static const unsigned char jump_to_bios +@@ -304,7 +304,7 @@ static const unsigned char jump_to_bios * specified by the code and length parameters. * We assume that length will aways be less that 100! */ @@ -9854,7 +9871,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne { local_irq_disable(); -@@ -315,8 +315,8 @@ void machine_real_restart(const unsigned +@@ -324,8 +324,8 @@ void machine_real_restart(const unsigned /* Remap the kernel at virtual address zero, as well as offset zero from the kernel segment. This assumes the kernel segment starts at virtual address PAGE_OFFSET. */ @@ -9865,7 +9882,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne /* * Use `swapper_pg_dir' as our page directory. -@@ -328,16 +328,15 @@ void machine_real_restart(const unsigned +@@ -337,16 +337,15 @@ void machine_real_restart(const unsigned boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -9885,10 +9902,10 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/reboot.c linux-2.6.29.5/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.29.5/arch/x86/kernel/setup.c linux-2.6.29.5/arch/x86/kernel/setup.c ---- linux-2.6.29.5/arch/x86/kernel/setup.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/setup.c 2009-06-12 23:57:32.000000000 -0400 -@@ -712,8 +712,8 @@ void __init setup_arch(char **cmdline_p) +diff -urNp linux-2.6.29.6/arch/x86/kernel/setup.c linux-2.6.29.6/arch/x86/kernel/setup.c +--- linux-2.6.29.6/arch/x86/kernel/setup.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/setup.c 2009-07-09 22:13:39.000000000 -0400 +@@ -703,8 +703,8 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY; @@ -9899,7 +9916,7 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/setup.c linux-2.6.29.5/arch/x86/kernel init_mm.end_data = (unsigned long) _edata; #ifdef CONFIG_X86_32 init_mm.brk = init_pg_tables_end + PAGE_OFFSET; -@@ -721,9 +721,9 @@ void __init setup_arch(char **cmdline_p) +@@ -712,9 +712,9 @@ void __init setup_arch(char **cmdline_p) init_mm.brk = (unsigned long) &_end; #endif @@ -9912,9 +9929,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/setup.c linux-2.6.29.5/arch/x86/kernel data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.29.5/arch/x86/kernel/setup_percpu.c linux-2.6.29.5/arch/x86/kernel/setup_percpu.c ---- linux-2.6.29.5/arch/x86/kernel/setup_percpu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/setup_percpu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/setup_percpu.c linux-2.6.29.6/arch/x86/kernel/setup_percpu.c +--- linux-2.6.29.6/arch/x86/kernel/setup_percpu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/setup_percpu.c 2009-07-09 22:13:39.000000000 -0400 @@ -197,7 +197,11 @@ void __init setup_per_cpu_areas(void) cpu, node, __pa(ptr)); } @@ -9927,9 +9944,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/setup_percpu.c linux-2.6.29.5/arch/x86 memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start); } -diff -urNp linux-2.6.29.5/arch/x86/kernel/signal.c linux-2.6.29.5/arch/x86/kernel/signal.c ---- linux-2.6.29.5/arch/x86/kernel/signal.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/signal.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/signal.c linux-2.6.29.6/arch/x86/kernel/signal.c +--- linux-2.6.29.6/arch/x86/kernel/signal.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/signal.c 2009-07-09 22:13:39.000000000 -0400 @@ -255,7 +255,7 @@ get_sigframe(struct k_sigaction *ka, str * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. @@ -9969,9 +9986,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/signal.c linux-2.6.29.5/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.29.5/arch/x86/kernel/smpboot.c linux-2.6.29.5/arch/x86/kernel/smpboot.c ---- linux-2.6.29.5/arch/x86/kernel/smpboot.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/smpboot.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/smpboot.c linux-2.6.29.6/arch/x86/kernel/smpboot.c +--- linux-2.6.29.6/arch/x86/kernel/smpboot.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/smpboot.c 2009-07-09 22:13:39.000000000 -0400 @@ -806,6 +806,11 @@ static int __cpuinit do_boot_cpu(int api .cpu = cpu, .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), @@ -10002,9 +10019,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/smpboot.c linux-2.6.29.5/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start.sp = (void *) c_idle.idle->thread.sp; -diff -urNp linux-2.6.29.5/arch/x86/kernel/smpcommon.c linux-2.6.29.5/arch/x86/kernel/smpcommon.c ---- linux-2.6.29.5/arch/x86/kernel/smpcommon.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/smpcommon.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/smpcommon.c linux-2.6.29.6/arch/x86/kernel/smpcommon.c +--- linux-2.6.29.6/arch/x86/kernel/smpcommon.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/smpcommon.c 2009-07-09 22:13:39.000000000 -0400 @@ -3,9 +3,10 @@ */ #include <linux/module.h> @@ -10044,9 +10061,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/smpcommon.c linux-2.6.29.5/arch/x86/ke per_cpu(cpu_number, cpu) = cpu; } #endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/step.c linux-2.6.29.5/arch/x86/kernel/step.c ---- linux-2.6.29.5/arch/x86/kernel/step.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/step.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/step.c linux-2.6.29.6/arch/x86/kernel/step.c +--- linux-2.6.29.6/arch/x86/kernel/step.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/step.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,22 +23,20 @@ unsigned long convert_ip_to_linear(struc * and APM bios ones we just ignore here. */ @@ -10096,17 +10113,17 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/step.c linux-2.6.29.5/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.29.5/arch/x86/kernel/syscall_table_32.S linux-2.6.29.5/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.29.5/arch/x86/kernel/syscall_table_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/syscall_table_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-2.6.29.5/arch/x86/kernel/sys_i386_32.c linux-2.6.29.5/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.29.5/arch/x86/kernel/sys_i386_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/sys_i386_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -10335,9 +10352,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/sys_i386_32.c linux-2.6.29.5/arch/x86/ struct sel_arg_struct { unsigned long n; -diff -urNp linux-2.6.29.5/arch/x86/kernel/sys_x86_64.c linux-2.6.29.5/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.29.5/arch/x86/kernel/sys_x86_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/sys_x86_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -47,8 +47,8 @@ out: return error; } @@ -10419,9 +10436,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/sys_x86_64.c linux-2.6.29.5/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.29.5/arch/x86/kernel/time_32.c linux-2.6.29.5/arch/x86/kernel/time_32.c ---- linux-2.6.29.5/arch/x86/kernel/time_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/time_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/time_32.c linux-2.6.29.6/arch/x86/kernel/time_32.c +--- linux-2.6.29.6/arch/x86/kernel/time_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/time_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -47,22 +47,32 @@ unsigned long profile_pc(struct pt_regs unsigned long pc = instruction_pointer(regs); @@ -10457,9 +10474,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/time_32.c linux-2.6.29.5/arch/x86/kern return pc; } EXPORT_SYMBOL(profile_pc); -diff -urNp linux-2.6.29.5/arch/x86/kernel/time_64.c linux-2.6.29.5/arch/x86/kernel/time_64.c ---- linux-2.6.29.5/arch/x86/kernel/time_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/time_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/time_64.c linux-2.6.29.6/arch/x86/kernel/time_64.c +--- linux-2.6.29.6/arch/x86/kernel/time_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/time_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -25,8 +25,6 @@ #include <asm/time.h> #include <asm/timer.h> @@ -10478,9 +10495,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/time_64.c linux-2.6.29.5/arch/x86/kern #ifdef CONFIG_FRAME_POINTER return *(unsigned long *)(regs->bp + sizeof(long)); #else -diff -urNp linux-2.6.29.5/arch/x86/kernel/tlb_32.c linux-2.6.29.5/arch/x86/kernel/tlb_32.c ---- linux-2.6.29.5/arch/x86/kernel/tlb_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/tlb_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/tlb_32.c linux-2.6.29.6/arch/x86/kernel/tlb_32.c +--- linux-2.6.29.6/arch/x86/kernel/tlb_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/tlb_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -5,7 +5,7 @@ #include <asm/tlbflush.h> @@ -10490,9 +10507,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/tlb_32.c linux-2.6.29.5/arch/x86/kerne /* must come after the send_IPI functions above for inlining */ #include <mach_ipi.h> -diff -urNp linux-2.6.29.5/arch/x86/kernel/tls.c linux-2.6.29.5/arch/x86/kernel/tls.c ---- linux-2.6.29.5/arch/x86/kernel/tls.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/tls.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/tls.c linux-2.6.29.6/arch/x86/kernel/tls.c +--- linux-2.6.29.6/arch/x86/kernel/tls.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/tls.c 2009-07-09 22:13:39.000000000 -0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -10505,9 +10522,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/tls.c linux-2.6.29.5/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.29.5/arch/x86/kernel/traps.c linux-2.6.29.5/arch/x86/kernel/traps.c ---- linux-2.6.29.5/arch/x86/kernel/traps.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/traps.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel/traps.c +--- linux-2.6.29.6/arch/x86/kernel/traps.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/traps.c 2009-07-09 22:13:39.000000000 -0400 @@ -71,14 +71,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -10678,9 +10695,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/traps.c linux-2.6.29.5/arch/x86/kernel return new_kesp; } -diff -urNp linux-2.6.29.5/arch/x86/kernel/tsc.c linux-2.6.29.5/arch/x86/kernel/tsc.c ---- linux-2.6.29.5/arch/x86/kernel/tsc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/tsc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/tsc.c linux-2.6.29.6/arch/x86/kernel/tsc.c +--- linux-2.6.29.6/arch/x86/kernel/tsc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/tsc.c 2009-07-09 22:13:39.000000000 -0400 @@ -765,7 +765,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -10690,9 +10707,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/tsc.c linux-2.6.29.5/arch/x86/kernel/t }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.29.5/arch/x86/kernel/vm86_32.c linux-2.6.29.5/arch/x86/kernel/vm86_32.c ---- linux-2.6.29.5/arch/x86/kernel/vm86_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/vm86_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/vm86_32.c linux-2.6.29.6/arch/x86/kernel/vm86_32.c +--- linux-2.6.29.6/arch/x86/kernel/vm86_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/vm86_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -148,7 +148,7 @@ struct pt_regs *save_v86_state(struct ke do_exit(SIGSEGV); } @@ -10711,9 +10728,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/vm86_32.c linux-2.6.29.5/arch/x86/kern tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; if (cpu_has_sep) tsk->thread.sysenter_cs = 0; -diff -urNp linux-2.6.29.5/arch/x86/kernel/vmi_32.c linux-2.6.29.5/arch/x86/kernel/vmi_32.c ---- linux-2.6.29.5/arch/x86/kernel/vmi_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/vmi_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kernel/vmi_32.c +--- linux-2.6.29.6/arch/x86/kernel/vmi_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/vmi_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -102,18 +102,43 @@ static unsigned patch_internal(int call, { u64 reloc; @@ -10817,9 +10834,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/vmi_32.c linux-2.6.29.5/arch/x86/kerne /* * Alternative instruction rewriting doesn't happen soon enough * to convert VMI_IRET to a call instead of a jump; so we have -diff -urNp linux-2.6.29.5/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.5/arch/x86/kernel/vmlinux_32.lds.S ---- linux-2.6.29.5/arch/x86/kernel/vmlinux_32.lds.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/vmlinux_32.lds.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S +--- linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,20 @@ #include <asm/page.h> #include <asm/cache.h> @@ -11111,9 +11128,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.5/arch/x __bss_start = .; /* BSS */ *(.bss.page_aligned) *(.bss) -diff -urNp linux-2.6.29.5/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.5/arch/x86/kernel/vmlinux_64.lds.S ---- linux-2.6.29.5/arch/x86/kernel/vmlinux_64.lds.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/vmlinux_64.lds.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S +--- linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S 2009-07-09 22:13:39.000000000 -0400 @@ -12,12 +12,12 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) @@ -11214,9 +11231,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.5/arch/x } __bss_stop = .; -diff -urNp linux-2.6.29.5/arch/x86/kernel/vsyscall_64.c linux-2.6.29.5/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.29.5/arch/x86/kernel/vsyscall_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/vsyscall_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -11250,9 +11267,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/vsyscall_64.c linux-2.6.29.5/arch/x86/ }; #endif -diff -urNp linux-2.6.29.5/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.29.5/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.29.5/arch/x86/kernel/x8664_ksyms_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kernel/x8664_ksyms_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -11262,9 +11279,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.29.5/arch/x EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.29.5/arch/x86/kvm/svm.c linux-2.6.29.5/arch/x86/kvm/svm.c ---- linux-2.6.29.5/arch/x86/kvm/svm.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kvm/svm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kvm/svm.c linux-2.6.29.6/arch/x86/kvm/svm.c +--- linux-2.6.29.6/arch/x86/kvm/svm.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kvm/svm.c 2009-07-09 22:13:39.000000000 -0400 @@ -1525,7 +1525,19 @@ static void reload_tss(struct kvm_vcpu * int cpu = raw_smp_processor_id(); @@ -11294,9 +11311,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kvm/svm.c linux-2.6.29.5/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.29.5/arch/x86/kvm/vmx.c linux-2.6.29.5/arch/x86/kvm/vmx.c ---- linux-2.6.29.5/arch/x86/kvm/vmx.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kvm/vmx.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c +--- linux-2.6.29.6/arch/x86/kvm/vmx.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kvm/vmx.c 2009-07-09 22:13:39.000000000 -0400 @@ -497,9 +497,23 @@ static void reload_tss(void) struct descriptor_table gdt; struct desc_struct *descs; @@ -11373,9 +11390,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kvm/vmx.c linux-2.6.29.5/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.29.5/arch/x86/kvm/x86.c linux-2.6.29.5/arch/x86/kvm/x86.c ---- linux-2.6.29.5/arch/x86/kvm/x86.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/kvm/x86.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/kvm/x86.c linux-2.6.29.6/arch/x86/kvm/x86.c +--- linux-2.6.29.6/arch/x86/kvm/x86.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/kvm/x86.c 2009-07-09 22:13:39.000000000 -0400 @@ -70,44 +70,44 @@ static u64 __read_mostly efer_reserved_b static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -11478,9 +11495,9 @@ diff -urNp linux-2.6.29.5/arch/x86/kvm/x86.c linux-2.6.29.5/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.29.5/arch/x86/lib/checksum_32.S linux-2.6.29.5/arch/x86/lib/checksum_32.S ---- linux-2.6.29.5/arch/x86/lib/checksum_32.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/checksum_32.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/checksum_32.S linux-2.6.29.6/arch/x86/lib/checksum_32.S +--- linux-2.6.29.6/arch/x86/lib/checksum_32.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/checksum_32.S 2009-07-09 22:13:39.000000000 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -11726,9 +11743,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/checksum_32.S linux-2.6.29.5/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.29.5/arch/x86/lib/clear_page_64.S linux-2.6.29.5/arch/x86/lib/clear_page_64.S ---- linux-2.6.29.5/arch/x86/lib/clear_page_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/clear_page_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/clear_page_64.S linux-2.6.29.6/arch/x86/lib/clear_page_64.S +--- linux-2.6.29.6/arch/x86/lib/clear_page_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/clear_page_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -44,7 +44,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -11738,9 +11755,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/clear_page_64.S linux-2.6.29.5/arch/x86/l 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.5/arch/x86/lib/copy_page_64.S linux-2.6.29.5/arch/x86/lib/copy_page_64.S ---- linux-2.6.29.5/arch/x86/lib/copy_page_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/copy_page_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/copy_page_64.S linux-2.6.29.6/arch/x86/lib/copy_page_64.S +--- linux-2.6.29.6/arch/x86/lib/copy_page_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/copy_page_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -11750,9 +11767,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/copy_page_64.S linux-2.6.29.5/arch/x86/li 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.5/arch/x86/lib/copy_user_64.S linux-2.6.29.5/arch/x86/lib/copy_user_64.S ---- linux-2.6.29.5/arch/x86/lib/copy_user_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/copy_user_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/copy_user_64.S linux-2.6.29.6/arch/x86/lib/copy_user_64.S +--- linux-2.6.29.6/arch/x86/lib/copy_user_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/copy_user_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -21,7 +21,7 @@ .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ @@ -11803,9 +11820,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/copy_user_64.S linux-2.6.29.5/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.29.5/arch/x86/lib/getuser.S linux-2.6.29.5/arch/x86/lib/getuser.S ---- linux-2.6.29.5/arch/x86/lib/getuser.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/getuser.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/getuser.S linux-2.6.29.6/arch/x86/lib/getuser.S +--- linux-2.6.29.6/arch/x86/lib/getuser.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/getuser.S 2009-07-09 22:13:39.000000000 -0400 @@ -33,6 +33,7 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -11887,9 +11904,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/getuser.S linux-2.6.29.5/arch/x86/lib/get xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.29.5/arch/x86/lib/memcpy_64.S linux-2.6.29.5/arch/x86/lib/memcpy_64.S ---- linux-2.6.29.5/arch/x86/lib/memcpy_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/memcpy_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/memcpy_64.S linux-2.6.29.6/arch/x86/lib/memcpy_64.S +--- linux-2.6.29.6/arch/x86/lib/memcpy_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/memcpy_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -114,7 +114,7 @@ ENDPROC(__memcpy) /* Some CPUs run faster using the string copy instructions. It is also a lot simpler. Use this when possible */ @@ -11899,9 +11916,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/memcpy_64.S linux-2.6.29.5/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.5/arch/x86/lib/memset_64.S linux-2.6.29.5/arch/x86/lib/memset_64.S ---- linux-2.6.29.5/arch/x86/lib/memset_64.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/memset_64.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/memset_64.S linux-2.6.29.6/arch/x86/lib/memset_64.S +--- linux-2.6.29.6/arch/x86/lib/memset_64.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/memset_64.S 2009-07-09 22:13:39.000000000 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -11911,9 +11928,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/memset_64.S linux-2.6.29.5/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.5/arch/x86/lib/mmx_32.c linux-2.6.29.5/arch/x86/lib/mmx_32.c ---- linux-2.6.29.5/arch/x86/lib/mmx_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/mmx_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/mmx_32.c linux-2.6.29.6/arch/x86/lib/mmx_32.c +--- linux-2.6.29.6/arch/x86/lib/mmx_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/mmx_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -12229,9 +12246,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/mmx_32.c linux-2.6.29.5/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.29.5/arch/x86/lib/putuser.S linux-2.6.29.5/arch/x86/lib/putuser.S ---- linux-2.6.29.5/arch/x86/lib/putuser.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/putuser.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/putuser.S linux-2.6.29.6/arch/x86/lib/putuser.S +--- linux-2.6.29.6/arch/x86/lib/putuser.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/putuser.S 2009-07-09 22:13:39.000000000 -0400 @@ -15,6 +15,7 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -12335,9 +12352,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/putuser.S linux-2.6.29.5/arch/x86/lib/put movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.29.5/arch/x86/lib/usercopy_32.c linux-2.6.29.5/arch/x86/lib/usercopy_32.c ---- linux-2.6.29.5/arch/x86/lib/usercopy_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/lib/usercopy_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/lib/usercopy_32.c linux-2.6.29.6/arch/x86/lib/usercopy_32.c +--- linux-2.6.29.6/arch/x86/lib/usercopy_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/lib/usercopy_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -13303,9 +13320,9 @@ diff -urNp linux-2.6.29.5/arch/x86/lib/usercopy_32.c linux-2.6.29.5/arch/x86/lib +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.29.5/arch/x86/mach-voyager/voyager_basic.c linux-2.6.29.5/arch/x86/mach-voyager/voyager_basic.c ---- linux-2.6.29.5/arch/x86/mach-voyager/voyager_basic.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mach-voyager/voyager_basic.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c +--- linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c 2009-07-09 22:13:39.000000000 -0400 @@ -123,7 +123,7 @@ int __init voyager_memory_detect(int reg __u8 cmos[4]; ClickMap_t *map; @@ -13324,9 +13341,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mach-voyager/voyager_basic.c linux-2.6.29.5/a local_flush_tlb(); /* now clear everything out but page 0 */ map = (ClickMap_t *) (map_addr & (~PAGE_MASK)); -diff -urNp linux-2.6.29.5/arch/x86/mach-voyager/voyager_smp.c linux-2.6.29.5/arch/x86/mach-voyager/voyager_smp.c ---- linux-2.6.29.5/arch/x86/mach-voyager/voyager_smp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mach-voyager/voyager_smp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c +--- linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c 2009-07-09 22:13:39.000000000 -0400 @@ -511,6 +511,10 @@ static void __init do_boot_cpu(__u8 cpu) __u32 *hijack_vector; __u32 start_phys_address = setup_trampoline(); @@ -13366,9 +13383,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mach-voyager/voyager_smp.c linux-2.6.29.5/arc } if (((1 << cpu) & voyager_extended_vic_processors) == 0) -diff -urNp linux-2.6.29.5/arch/x86/Makefile linux-2.6.29.5/arch/x86/Makefile ---- linux-2.6.29.5/arch/x86/Makefile 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/Makefile linux-2.6.29.6/arch/x86/Makefile +--- linux-2.6.29.6/arch/x86/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -232,3 +232,12 @@ endef CLEAN_FILES += arch/x86/boot/fdimage \ arch/x86/boot/image.iso \ @@ -13382,9 +13399,9 @@ diff -urNp linux-2.6.29.5/arch/x86/Makefile linux-2.6.29.5/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.29.5/arch/x86/mm/extable.c linux-2.6.29.5/arch/x86/mm/extable.c ---- linux-2.6.29.5/arch/x86/mm/extable.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/extable.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/extable.c linux-2.6.29.6/arch/x86/mm/extable.c +--- linux-2.6.29.6/arch/x86/mm/extable.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/extable.c 2009-07-09 22:13:39.000000000 -0400 @@ -1,14 +1,62 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -13449,9 +13466,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/extable.c linux-2.6.29.5/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.29.5/arch/x86/mm/fault.c linux-2.6.29.5/arch/x86/mm/fault.c ---- linux-2.6.29.5/arch/x86/mm/fault.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/fault.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c +--- linux-2.6.29.6/arch/x86/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/fault.c 2009-07-09 22:13:39.000000000 -0400 @@ -26,6 +26,8 @@ #include <linux/kprobes.h> #include <linux/uaccess.h> @@ -13994,9 +14011,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/fault.c linux-2.6.29.5/arch/x86/mm/fault.c + printk("\n"); +} +#endif -diff -urNp linux-2.6.29.5/arch/x86/mm/highmem_32.c linux-2.6.29.5/arch/x86/mm/highmem_32.c ---- linux-2.6.29.5/arch/x86/mm/highmem_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/highmem_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/highmem_32.c linux-2.6.29.6/arch/x86/mm/highmem_32.c +--- linux-2.6.29.6/arch/x86/mm/highmem_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/highmem_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -74,6 +74,10 @@ void *kmap_atomic_prot(struct page *page enum fixed_addresses idx; unsigned long vaddr; @@ -14084,9 +14101,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/highmem_32.c linux-2.6.29.5/arch/x86/mm/hi arch_flush_lazy_mmu_mode(); return (void*) vaddr; -diff -urNp linux-2.6.29.5/arch/x86/mm/hugetlbpage.c linux-2.6.29.5/arch/x86/mm/hugetlbpage.c ---- linux-2.6.29.5/arch/x86/mm/hugetlbpage.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/hugetlbpage.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/hugetlbpage.c linux-2.6.29.6/arch/x86/mm/hugetlbpage.c +--- linux-2.6.29.6/arch/x86/mm/hugetlbpage.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/hugetlbpage.c 2009-07-09 22:13:39.000000000 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -14221,9 +14238,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/hugetlbpage.c linux-2.6.29.5/arch/x86/mm/h (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.29.5/arch/x86/mm/init_32.c linux-2.6.29.5/arch/x86/mm/init_32.c ---- linux-2.6.29.5/arch/x86/mm/init_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/init_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_32.c +--- linux-2.6.29.6/arch/x86/mm/init_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/init_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -50,6 +50,7 @@ #include <asm/setup.h> #include <asm/cacheflush.h> @@ -14597,9 +14614,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/init_32.c linux-2.6.29.5/arch/x86/mm/init_ free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.29.5/arch/x86/mm/init_64.c linux-2.6.29.5/arch/x86/mm/init_64.c ---- linux-2.6.29.5/arch/x86/mm/init_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/init_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_64.c +--- linux-2.6.29.6/arch/x86/mm/init_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/init_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -175,6 +175,10 @@ set_pte_vaddr_pud(pud_t *pud_page, unsig pmd_t *pmd; pte_t *pte; @@ -14717,9 +14734,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/init_64.c linux-2.6.29.5/arch/x86/mm/init_ return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.29.5/arch/x86/mm/iomap_32.c linux-2.6.29.5/arch/x86/mm/iomap_32.c ---- linux-2.6.29.5/arch/x86/mm/iomap_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/iomap_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/iomap_32.c linux-2.6.29.6/arch/x86/mm/iomap_32.c +--- linux-2.6.29.6/arch/x86/mm/iomap_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/iomap_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -24,7 +24,7 @@ int is_io_mapping_possible(resource_size { #ifndef CONFIG_X86_PAE @@ -14729,9 +14746,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/iomap_32.c linux-2.6.29.5/arch/x86/mm/ioma return 0; #endif return 1; -diff -urNp linux-2.6.29.5/arch/x86/mm/ioremap.c linux-2.6.29.5/arch/x86/mm/ioremap.c ---- linux-2.6.29.5/arch/x86/mm/ioremap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/ioremap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/ioremap.c +--- linux-2.6.29.6/arch/x86/mm/ioremap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/ioremap.c 2009-07-09 22:13:39.000000000 -0400 @@ -114,8 +114,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. @@ -14790,9 +14807,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/ioremap.c linux-2.6.29.5/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.29.5/arch/x86/mm/mmap.c linux-2.6.29.5/arch/x86/mm/mmap.c ---- linux-2.6.29.5/arch/x86/mm/mmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/mmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/mmap.c linux-2.6.29.6/arch/x86/mm/mmap.c +--- linux-2.6.29.6/arch/x86/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/mmap.c 2009-07-09 22:13:39.000000000 -0400 @@ -36,7 +36,7 @@ * Leave an at least ~128 MB hole. */ @@ -14874,9 +14891,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/mmap.c linux-2.6.29.5/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.5/arch/x86/mm/numa_32.c linux-2.6.29.5/arch/x86/mm/numa_32.c ---- linux-2.6.29.5/arch/x86/mm/numa_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/numa_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/numa_32.c linux-2.6.29.6/arch/x86/mm/numa_32.c +--- linux-2.6.29.6/arch/x86/mm/numa_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/numa_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -14885,9 +14902,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/numa_32.c linux-2.6.29.5/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.29.5/arch/x86/mm/pageattr.c linux-2.6.29.5/arch/x86/mm/pageattr.c ---- linux-2.6.29.5/arch/x86/mm/pageattr.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/pageattr.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/pageattr.c +--- linux-2.6.29.6/arch/x86/mm/pageattr.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/pageattr.c 2009-07-09 22:13:39.000000000 -0400 @@ -20,6 +20,7 @@ #include <asm/pgalloc.h> #include <asm/proto.h> @@ -14937,9 +14954,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/pageattr.c linux-2.6.29.5/arch/x86/mm/page #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.29.5/arch/x86/mm/pageattr-test.c linux-2.6.29.5/arch/x86/mm/pageattr-test.c ---- linux-2.6.29.5/arch/x86/mm/pageattr-test.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/pageattr-test.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr-test.c linux-2.6.29.6/arch/x86/mm/pageattr-test.c +--- linux-2.6.29.6/arch/x86/mm/pageattr-test.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/pageattr-test.c 2009-07-09 22:13:39.000000000 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -14949,9 +14966,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/pageattr-test.c linux-2.6.29.5/arch/x86/mm } struct split_state { -diff -urNp linux-2.6.29.5/arch/x86/mm/pat.c linux-2.6.29.5/arch/x86/mm/pat.c ---- linux-2.6.29.5/arch/x86/mm/pat.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/pat.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c +--- linux-2.6.29.6/arch/x86/mm/pat.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/pat.c 2009-07-09 22:13:39.000000000 -0400 @@ -204,7 +204,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -15006,9 +15023,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/pat.c linux-2.6.29.5/arch/x86/mm/pat.c cattr_name(flags), (unsigned long long)paddr, (unsigned long long)(paddr + size)); -diff -urNp linux-2.6.29.5/arch/x86/mm/pgtable_32.c linux-2.6.29.5/arch/x86/mm/pgtable_32.c ---- linux-2.6.29.5/arch/x86/mm/pgtable_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/mm/pgtable_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/mm/pgtable_32.c linux-2.6.29.6/arch/x86/mm/pgtable_32.c +--- linux-2.6.29.6/arch/x86/mm/pgtable_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/mm/pgtable_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -31,6 +31,10 @@ void set_pte_vaddr(unsigned long vaddr, pmd_t *pmd; pte_t *pte; @@ -15041,9 +15058,9 @@ diff -urNp linux-2.6.29.5/arch/x86/mm/pgtable_32.c linux-2.6.29.5/arch/x86/mm/pg /* * It's enough to flush this one mapping. * (PGE mappings get flushed as well) -diff -urNp linux-2.6.29.5/arch/x86/oprofile/backtrace.c linux-2.6.29.5/arch/x86/oprofile/backtrace.c ---- linux-2.6.29.5/arch/x86/oprofile/backtrace.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/oprofile/backtrace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/oprofile/backtrace.c linux-2.6.29.6/arch/x86/oprofile/backtrace.c +--- linux-2.6.29.6/arch/x86/oprofile/backtrace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/oprofile/backtrace.c 2009-07-09 22:13:39.000000000 -0400 @@ -37,7 +37,7 @@ static void backtrace_address(void *data unsigned int *depth = data; @@ -15062,9 +15079,9 @@ diff -urNp linux-2.6.29.5/arch/x86/oprofile/backtrace.c linux-2.6.29.5/arch/x86/ if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, &backtrace_ops, &depth); -diff -urNp linux-2.6.29.5/arch/x86/oprofile/op_model_p4.c linux-2.6.29.5/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.29.5/arch/x86/oprofile/op_model_p4.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/oprofile/op_model_p4.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c 2009-07-09 22:13:39.000000000 -0400 @@ -48,7 +48,7 @@ static inline void setup_num_counters(vo #endif } @@ -15074,9 +15091,9 @@ diff -urNp linux-2.6.29.5/arch/x86/oprofile/op_model_p4.c linux-2.6.29.5/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.29.5/arch/x86/pci/common.c linux-2.6.29.5/arch/x86/pci/common.c ---- linux-2.6.29.5/arch/x86/pci/common.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/pci/common.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/pci/common.c linux-2.6.29.6/arch/x86/pci/common.c +--- linux-2.6.29.6/arch/x86/pci/common.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/pci/common.c 2009-07-09 22:13:39.000000000 -0400 @@ -367,7 +367,7 @@ static struct dmi_system_id __devinitdat DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), }, @@ -15086,9 +15103,9 @@ diff -urNp linux-2.6.29.5/arch/x86/pci/common.c linux-2.6.29.5/arch/x86/pci/comm }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.29.5/arch/x86/pci/fixup.c linux-2.6.29.5/arch/x86/pci/fixup.c ---- linux-2.6.29.5/arch/x86/pci/fixup.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/pci/fixup.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/pci/fixup.c linux-2.6.29.6/arch/x86/pci/fixup.c +--- linux-2.6.29.6/arch/x86/pci/fixup.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/pci/fixup.c 2009-07-09 22:13:39.000000000 -0400 @@ -364,7 +364,7 @@ static struct dmi_system_id __devinitdat DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -15107,9 +15124,9 @@ diff -urNp linux-2.6.29.5/arch/x86/pci/fixup.c linux-2.6.29.5/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.29.5/arch/x86/pci/irq.c linux-2.6.29.5/arch/x86/pci/irq.c ---- linux-2.6.29.5/arch/x86/pci/irq.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/pci/irq.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/pci/irq.c linux-2.6.29.6/arch/x86/pci/irq.c +--- linux-2.6.29.6/arch/x86/pci/irq.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/pci/irq.c 2009-07-09 22:13:39.000000000 -0400 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, @@ -15128,9 +15145,9 @@ diff -urNp linux-2.6.29.5/arch/x86/pci/irq.c linux-2.6.29.5/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.29.5/arch/x86/pci/pcbios.c linux-2.6.29.5/arch/x86/pci/pcbios.c ---- linux-2.6.29.5/arch/x86/pci/pcbios.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/pci/pcbios.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/pci/pcbios.c linux-2.6.29.6/arch/x86/pci/pcbios.c +--- linux-2.6.29.6/arch/x86/pci/pcbios.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/pci/pcbios.c 2009-07-09 22:13:39.000000000 -0400 @@ -56,50 +56,120 @@ union bios32 { static struct { unsigned long address; @@ -15462,9 +15479,9 @@ diff -urNp linux-2.6.29.5/arch/x86/pci/pcbios.c linux-2.6.29.5/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.29.5/arch/x86/power/cpu_32.c linux-2.6.29.5/arch/x86/power/cpu_32.c ---- linux-2.6.29.5/arch/x86/power/cpu_32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/power/cpu_32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/power/cpu_32.c linux-2.6.29.6/arch/x86/power/cpu_32.c +--- linux-2.6.29.6/arch/x86/power/cpu_32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/power/cpu_32.c 2009-07-09 22:13:39.000000000 -0400 @@ -67,7 +67,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -15474,9 +15491,9 @@ diff -urNp linux-2.6.29.5/arch/x86/power/cpu_32.c linux-2.6.29.5/arch/x86/power/ set_tss_desc(cpu, t); /* * This just modifies memory; should not be -diff -urNp linux-2.6.29.5/arch/x86/power/cpu_64.c linux-2.6.29.5/arch/x86/power/cpu_64.c ---- linux-2.6.29.5/arch/x86/power/cpu_64.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/power/cpu_64.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/power/cpu_64.c linux-2.6.29.6/arch/x86/power/cpu_64.c +--- linux-2.6.29.6/arch/x86/power/cpu_64.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/power/cpu_64.c 2009-07-09 22:13:39.000000000 -0400 @@ -143,7 +143,11 @@ void restore_processor_state(void) static void fix_processor_context(void) { @@ -15507,9 +15524,9 @@ diff -urNp linux-2.6.29.5/arch/x86/power/cpu_64.c linux-2.6.29.5/arch/x86/power/ syscall_init(); /* This sets MSR_*STAR and related */ load_TR_desc(); /* This does ltr */ load_LDT(¤t->active_mm->context); /* This does lldt */ -diff -urNp linux-2.6.29.5/arch/x86/vdso/Makefile linux-2.6.29.5/arch/x86/vdso/Makefile ---- linux-2.6.29.5/arch/x86/vdso/Makefile 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/Makefile linux-2.6.29.6/arch/x86/vdso/Makefile +--- linux-2.6.29.6/arch/x86/vdso/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -15519,9 +15536,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/Makefile linux-2.6.29.5/arch/x86/vdso/Ma # # Install the unstripped copy of vdso*.so listed in $(vdso-install-y). -diff -urNp linux-2.6.29.5/arch/x86/vdso/vclock_gettime.c linux-2.6.29.5/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.29.5/arch/x86/vdso/vclock_gettime.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/vclock_gettime.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c 2009-07-09 22:13:39.000000000 -0400 @@ -26,20 +26,43 @@ #define gtod vdso_vsyscall_gtod_data @@ -15615,9 +15632,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/vclock_gettime.c linux-2.6.29.5/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.29.5/arch/x86/vdso/vdso32-setup.c linux-2.6.29.5/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.29.5/arch/x86/vdso/vdso32-setup.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/vdso32-setup.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c 2009-07-09 22:13:39.000000000 -0400 @@ -226,7 +226,7 @@ static inline void map_compat_vdso(int m void enable_sep_cpu(void) { @@ -15697,9 +15714,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/vdso32-setup.c linux-2.6.29.5/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.29.5/arch/x86/vdso/vdso.lds.S linux-2.6.29.5/arch/x86/vdso/vdso.lds.S ---- linux-2.6.29.5/arch/x86/vdso/vdso.lds.S 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/vdso.lds.S 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso.lds.S linux-2.6.29.6/arch/x86/vdso/vdso.lds.S +--- linux-2.6.29.6/arch/x86/vdso/vdso.lds.S 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/vdso.lds.S 2009-07-09 22:13:39.000000000 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -15710,9 +15727,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/vdso.lds.S linux-2.6.29.5/arch/x86/vdso/ +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.29.5/arch/x86/vdso/vextern.h linux-2.6.29.5/arch/x86/vdso/vextern.h ---- linux-2.6.29.5/arch/x86/vdso/vextern.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/vextern.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/vextern.h linux-2.6.29.6/arch/x86/vdso/vextern.h +--- linux-2.6.29.6/arch/x86/vdso/vextern.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/vextern.h 2009-07-09 22:13:39.000000000 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -15720,9 +15737,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/vextern.h linux-2.6.29.5/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.29.5/arch/x86/vdso/vma.c linux-2.6.29.5/arch/x86/vdso/vma.c ---- linux-2.6.29.5/arch/x86/vdso/vma.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/vdso/vma.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/vdso/vma.c linux-2.6.29.6/arch/x86/vdso/vma.c +--- linux-2.6.29.6/arch/x86/vdso/vma.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/vdso/vma.c 2009-07-09 22:13:39.000000000 -0400 @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/init.h> @@ -15757,9 +15774,9 @@ diff -urNp linux-2.6.29.5/arch/x86/vdso/vma.c linux-2.6.29.5/arch/x86/vdso/vma.c up_fail: up_write(&mm->mmap_sem); return ret; -diff -urNp linux-2.6.29.5/arch/x86/xen/enlighten.c linux-2.6.29.5/arch/x86/xen/enlighten.c ---- linux-2.6.29.5/arch/x86/xen/enlighten.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/xen/enlighten.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/xen/enlighten.c linux-2.6.29.6/arch/x86/xen/enlighten.c +--- linux-2.6.29.6/arch/x86/xen/enlighten.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/xen/enlighten.c 2009-07-09 22:13:39.000000000 -0400 @@ -319,7 +319,7 @@ static void xen_set_ldt(const void *addr static void xen_load_gdt(const struct desc_ptr *dtr) { @@ -15809,9 +15826,9 @@ diff -urNp linux-2.6.29.5/arch/x86/xen/enlighten.c linux-2.6.29.5/arch/x86/xen/e /* Pin down new L4 */ pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, -diff -urNp linux-2.6.29.5/arch/x86/xen/smp.c linux-2.6.29.5/arch/x86/xen/smp.c ---- linux-2.6.29.5/arch/x86/xen/smp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/x86/xen/smp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/x86/xen/smp.c linux-2.6.29.6/arch/x86/xen/smp.c +--- linux-2.6.29.6/arch/x86/xen/smp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/x86/xen/smp.c 2009-07-09 22:13:39.000000000 -0400 @@ -171,11 +171,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -15835,9 +15852,9 @@ diff -urNp linux-2.6.29.5/arch/x86/xen/smp.c linux-2.6.29.5/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.29.5/arch/xtensa/include/asm/atomic.h linux-2.6.29.5/arch/xtensa/include/asm/atomic.h ---- linux-2.6.29.5/arch/xtensa/include/asm/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/xtensa/include/asm/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/atomic.h linux-2.6.29.6/arch/xtensa/include/asm/atomic.h +--- linux-2.6.29.6/arch/xtensa/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/xtensa/include/asm/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -165,6 +165,9 @@ static inline int atomic_sub_return(int * Atomically increments @v by 1. */ @@ -15848,9 +15865,9 @@ diff -urNp linux-2.6.29.5/arch/xtensa/include/asm/atomic.h linux-2.6.29.5/arch/x /** * atomic_inc - increment atomic variable -diff -urNp linux-2.6.29.5/arch/xtensa/include/asm/kmap_types.h linux-2.6.29.5/arch/xtensa/include/asm/kmap_types.h ---- linux-2.6.29.5/arch/xtensa/include/asm/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/arch/xtensa/include/asm/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h +--- linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -25,6 +25,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -15859,9 +15876,9 @@ diff -urNp linux-2.6.29.5/arch/xtensa/include/asm/kmap_types.h linux-2.6.29.5/ar KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/crypto/lrw.c linux-2.6.29.5/crypto/lrw.c ---- linux-2.6.29.5/crypto/lrw.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/crypto/lrw.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/crypto/lrw.c linux-2.6.29.6/crypto/lrw.c +--- linux-2.6.29.6/crypto/lrw.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/crypto/lrw.c 2009-07-09 22:13:39.000000000 -0400 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -15871,9 +15888,9 @@ diff -urNp linux-2.6.29.5/crypto/lrw.c linux-2.6.29.5/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.29.5/Documentation/dontdiff linux-2.6.29.5/Documentation/dontdiff ---- linux-2.6.29.5/Documentation/dontdiff 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/Documentation/dontdiff 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/dontdiff +--- linux-2.6.29.6/Documentation/dontdiff 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/Documentation/dontdiff 2009-07-09 22:13:39.000000000 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -15941,9 +15958,9 @@ diff -urNp linux-2.6.29.5/Documentation/dontdiff linux-2.6.29.5/Documentation/do wakeup.bin wakeup.elf wakeup.lds -diff -urNp linux-2.6.29.5/drivers/acpi/blacklist.c linux-2.6.29.5/drivers/acpi/blacklist.c ---- linux-2.6.29.5/drivers/acpi/blacklist.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/acpi/blacklist.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/acpi/blacklist.c linux-2.6.29.6/drivers/acpi/blacklist.c +--- linux-2.6.29.6/drivers/acpi/blacklist.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/acpi/blacklist.c 2009-07-09 22:13:39.000000000 -0400 @@ -71,7 +71,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -15953,9 +15970,9 @@ diff -urNp linux-2.6.29.5/drivers/acpi/blacklist.c linux-2.6.29.5/drivers/acpi/b }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.29.5/drivers/acpi/osl.c linux-2.6.29.5/drivers/acpi/osl.c ---- linux-2.6.29.5/drivers/acpi/osl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/acpi/osl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/acpi/osl.c linux-2.6.29.6/drivers/acpi/osl.c +--- linux-2.6.29.6/drivers/acpi/osl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/acpi/osl.c 2009-07-09 22:13:39.000000000 -0400 @@ -483,6 +483,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -15974,9 +15991,9 @@ diff -urNp linux-2.6.29.5/drivers/acpi/osl.c linux-2.6.29.5/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.29.5/drivers/acpi/processor_core.c linux-2.6.29.5/drivers/acpi/processor_core.c ---- linux-2.6.29.5/drivers/acpi/processor_core.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/acpi/processor_core.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/acpi/processor_core.c linux-2.6.29.6/drivers/acpi/processor_core.c +--- linux-2.6.29.6/drivers/acpi/processor_core.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/acpi/processor_core.c 2009-07-09 22:13:39.000000000 -0400 @@ -678,7 +678,7 @@ static int __cpuinit acpi_processor_star return 0; } @@ -15986,9 +16003,9 @@ diff -urNp linux-2.6.29.5/drivers/acpi/processor_core.c linux-2.6.29.5/drivers/a /* * Buggy BIOS check -diff -urNp linux-2.6.29.5/drivers/acpi/processor_idle.c linux-2.6.29.5/drivers/acpi/processor_idle.c ---- linux-2.6.29.5/drivers/acpi/processor_idle.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/drivers/acpi/processor_idle.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/acpi/processor_idle.c linux-2.6.29.6/drivers/acpi/processor_idle.c +--- linux-2.6.29.6/drivers/acpi/processor_idle.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/acpi/processor_idle.c 2009-07-09 22:13:39.000000000 -0400 @@ -156,7 +156,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, @@ -15998,9 +16015,9 @@ diff -urNp linux-2.6.29.5/drivers/acpi/processor_idle.c linux-2.6.29.5/drivers/a }; static inline u32 ticks_elapsed(u32 t1, u32 t2) -diff -urNp linux-2.6.29.5/drivers/ata/ahci.c linux-2.6.29.5/drivers/ata/ahci.c ---- linux-2.6.29.5/drivers/ata/ahci.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ata/ahci.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ata/ahci.c linux-2.6.29.6/drivers/ata/ahci.c +--- linux-2.6.29.6/drivers/ata/ahci.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ata/ahci.c 2009-07-09 22:13:39.000000000 -0400 @@ -611,7 +611,7 @@ static const struct pci_device_id ahci_p { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, @@ -16010,9 +16027,9 @@ diff -urNp linux-2.6.29.5/drivers/ata/ahci.c linux-2.6.29.5/drivers/ata/ahci.c }; -diff -urNp linux-2.6.29.5/drivers/ata/ata_piix.c linux-2.6.29.5/drivers/ata/ata_piix.c ---- linux-2.6.29.5/drivers/ata/ata_piix.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ata/ata_piix.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ata/ata_piix.c linux-2.6.29.6/drivers/ata/ata_piix.c +--- linux-2.6.29.6/drivers/ata/ata_piix.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ata/ata_piix.c 2009-07-09 22:13:39.000000000 -0400 @@ -291,7 +291,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (PCH) */ @@ -16040,9 +16057,9 @@ diff -urNp linux-2.6.29.5/drivers/ata/ata_piix.c linux-2.6.29.5/drivers/ata/ata_ }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.29.5/drivers/ata/libata-core.c linux-2.6.29.5/drivers/ata/libata-core.c ---- linux-2.6.29.5/drivers/ata/libata-core.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ata/libata-core.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ata/libata-core.c linux-2.6.29.6/drivers/ata/libata-core.c +--- linux-2.6.29.6/drivers/ata/libata-core.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ata/libata-core.c 2009-07-09 22:13:39.000000000 -0400 @@ -889,7 +889,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, @@ -16070,9 +16087,9 @@ diff -urNp linux-2.6.29.5/drivers/ata/libata-core.c linux-2.6.29.5/drivers/ata/l }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -diff -urNp linux-2.6.29.5/drivers/atm/adummy.c linux-2.6.29.5/drivers/atm/adummy.c ---- linux-2.6.29.5/drivers/atm/adummy.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/adummy.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/adummy.c linux-2.6.29.6/drivers/atm/adummy.c +--- linux-2.6.29.6/drivers/atm/adummy.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/adummy.c 2009-07-09 22:13:39.000000000 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -16082,9 +16099,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/adummy.c linux-2.6.29.5/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.29.5/drivers/atm/ambassador.c linux-2.6.29.5/drivers/atm/ambassador.c ---- linux-2.6.29.5/drivers/atm/ambassador.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/ambassador.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/ambassador.c linux-2.6.29.6/drivers/atm/ambassador.c +--- linux-2.6.29.6/drivers/atm/ambassador.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/ambassador.c 2009-07-09 22:13:39.000000000 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -16121,9 +16138,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/ambassador.c linux-2.6.29.5/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.29.5/drivers/atm/atmtcp.c linux-2.6.29.5/drivers/atm/atmtcp.c ---- linux-2.6.29.5/drivers/atm/atmtcp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/atmtcp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/atmtcp.c linux-2.6.29.6/drivers/atm/atmtcp.c +--- linux-2.6.29.6/drivers/atm/atmtcp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/atmtcp.c 2009-07-09 22:13:39.000000000 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -16173,9 +16190,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/atmtcp.c linux-2.6.29.5/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.29.5/drivers/atm/eni.c linux-2.6.29.5/drivers/atm/eni.c ---- linux-2.6.29.5/drivers/atm/eni.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/eni.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/eni.c linux-2.6.29.6/drivers/atm/eni.c +--- linux-2.6.29.6/drivers/atm/eni.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/eni.c 2009-07-09 22:13:39.000000000 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -16221,9 +16238,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/eni.c linux-2.6.29.5/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.29.5/drivers/atm/firestream.c linux-2.6.29.5/drivers/atm/firestream.c ---- linux-2.6.29.5/drivers/atm/firestream.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/firestream.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/firestream.c linux-2.6.29.6/drivers/atm/firestream.c +--- linux-2.6.29.6/drivers/atm/firestream.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/firestream.c 2009-07-09 22:13:39.000000000 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -16257,9 +16274,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/firestream.c linux-2.6.29.5/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.29.5/drivers/atm/fore200e.c linux-2.6.29.5/drivers/atm/fore200e.c ---- linux-2.6.29.5/drivers/atm/fore200e.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/fore200e.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/fore200e.c linux-2.6.29.6/drivers/atm/fore200e.c +--- linux-2.6.29.6/drivers/atm/fore200e.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/fore200e.c 2009-07-09 22:13:39.000000000 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -16316,9 +16333,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/fore200e.c linux-2.6.29.5/drivers/atm/fore fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.29.5/drivers/atm/he.c linux-2.6.29.5/drivers/atm/he.c ---- linux-2.6.29.5/drivers/atm/he.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/he.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/he.c linux-2.6.29.6/drivers/atm/he.c +--- linux-2.6.29.6/drivers/atm/he.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/he.c 2009-07-09 22:13:39.000000000 -0400 @@ -1728,7 +1728,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -16355,9 +16372,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/he.c linux-2.6.29.5/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.29.5/drivers/atm/horizon.c linux-2.6.29.5/drivers/atm/horizon.c ---- linux-2.6.29.5/drivers/atm/horizon.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/horizon.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/horizon.c linux-2.6.29.6/drivers/atm/horizon.c +--- linux-2.6.29.6/drivers/atm/horizon.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/horizon.c 2009-07-09 22:13:39.000000000 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -16376,9 +16393,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/horizon.c linux-2.6.29.5/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.29.5/drivers/atm/idt77252.c linux-2.6.29.5/drivers/atm/idt77252.c ---- linux-2.6.29.5/drivers/atm/idt77252.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/idt77252.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/idt77252.c linux-2.6.29.6/drivers/atm/idt77252.c +--- linux-2.6.29.6/drivers/atm/idt77252.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/idt77252.c 2009-07-09 22:13:39.000000000 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -16533,9 +16550,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/idt77252.c linux-2.6.29.5/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.29.5/drivers/atm/iphase.c linux-2.6.29.5/drivers/atm/iphase.c ---- linux-2.6.29.5/drivers/atm/iphase.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/iphase.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase.c +--- linux-2.6.29.6/drivers/atm/iphase.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/iphase.c 2009-07-09 22:13:39.000000000 -0400 @@ -1125,7 +1125,7 @@ static int rx_pkt(struct atm_dev *dev) status = (u_short) (buf_desc_ptr->desc_mode); if (status & (RX_CER | RX_PTE | RX_OFL)) @@ -16599,9 +16616,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/iphase.c linux-2.6.29.5/drivers/atm/iphase iadev->tx_pkt_cnt++; /* Increment transaction counter */ writel(2, iadev->dma+IPHASE5575_TX_COUNTER); -diff -urNp linux-2.6.29.5/drivers/atm/lanai.c linux-2.6.29.5/drivers/atm/lanai.c ---- linux-2.6.29.5/drivers/atm/lanai.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/lanai.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/lanai.c linux-2.6.29.6/drivers/atm/lanai.c +--- linux-2.6.29.6/drivers/atm/lanai.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/lanai.c 2009-07-09 22:13:39.000000000 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -16656,9 +16673,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/lanai.c linux-2.6.29.5/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.29.5/drivers/atm/nicstar.c linux-2.6.29.5/drivers/atm/nicstar.c ---- linux-2.6.29.5/drivers/atm/nicstar.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/nicstar.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/nicstar.c linux-2.6.29.6/drivers/atm/nicstar.c +--- linux-2.6.29.6/drivers/atm/nicstar.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/nicstar.c 2009-07-09 22:13:39.000000000 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -16861,9 +16878,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/nicstar.c linux-2.6.29.5/drivers/atm/nicst } } -diff -urNp linux-2.6.29.5/drivers/atm/solos-pci.c linux-2.6.29.5/drivers/atm/solos-pci.c ---- linux-2.6.29.5/drivers/atm/solos-pci.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/solos-pci.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/solos-pci.c linux-2.6.29.6/drivers/atm/solos-pci.c +--- linux-2.6.29.6/drivers/atm/solos-pci.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/solos-pci.c 2009-07-09 22:13:39.000000000 -0400 @@ -261,7 +261,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -16894,9 +16911,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/solos-pci.c linux-2.6.29.5/drivers/atm/sol solos_pop(vcc, skb); return 0; } -diff -urNp linux-2.6.29.5/drivers/atm/suni.c linux-2.6.29.5/drivers/atm/suni.c ---- linux-2.6.29.5/drivers/atm/suni.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/suni.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/suni.c linux-2.6.29.6/drivers/atm/suni.c +--- linux-2.6.29.6/drivers/atm/suni.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/suni.c 2009-07-09 22:13:39.000000000 -0400 @@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -16906,9 +16923,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/suni.c linux-2.6.29.5/drivers/atm/suni.c if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX); -diff -urNp linux-2.6.29.5/drivers/atm/uPD98402.c linux-2.6.29.5/drivers/atm/uPD98402.c ---- linux-2.6.29.5/drivers/atm/uPD98402.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/uPD98402.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/uPD98402.c linux-2.6.29.6/drivers/atm/uPD98402.c +--- linux-2.6.29.6/drivers/atm/uPD98402.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/uPD98402.c 2009-07-09 22:13:39.000000000 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -16936,9 +16953,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/uPD98402.c linux-2.6.29.5/drivers/atm/uPD9 &PRIV(dev)->sonet_stats.uncorr_hcs); } if ((reason & uPD98402_INT_RFO) && -diff -urNp linux-2.6.29.5/drivers/atm/zatm.c linux-2.6.29.5/drivers/atm/zatm.c ---- linux-2.6.29.5/drivers/atm/zatm.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/atm/zatm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/atm/zatm.c linux-2.6.29.6/drivers/atm/zatm.c +--- linux-2.6.29.6/drivers/atm/zatm.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/atm/zatm.c 2009-07-09 22:13:39.000000000 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -16966,9 +16983,9 @@ diff -urNp linux-2.6.29.5/drivers/atm/zatm.c linux-2.6.29.5/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.29.5/drivers/char/agp/frontend.c linux-2.6.29.5/drivers/char/agp/frontend.c ---- linux-2.6.29.5/drivers/char/agp/frontend.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/agp/frontend.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/agp/frontend.c linux-2.6.29.6/drivers/char/agp/frontend.c +--- linux-2.6.29.6/drivers/char/agp/frontend.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/agp/frontend.c 2009-07-09 22:13:39.000000000 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -16978,9 +16995,9 @@ diff -urNp linux-2.6.29.5/drivers/char/agp/frontend.c linux-2.6.29.5/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.29.5/drivers/char/agp/intel-agp.c linux-2.6.29.5/drivers/char/agp/intel-agp.c ---- linux-2.6.29.5/drivers/char/agp/intel-agp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/agp/intel-agp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/agp/intel-agp.c linux-2.6.29.6/drivers/char/agp/intel-agp.c +--- linux-2.6.29.6/drivers/char/agp/intel-agp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/agp/intel-agp.c 2009-07-09 22:13:39.000000000 -0400 @@ -2369,7 +2369,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_Q45_HB), ID(PCI_DEVICE_ID_INTEL_G45_HB), @@ -16990,9 +17007,9 @@ diff -urNp linux-2.6.29.5/drivers/char/agp/intel-agp.c linux-2.6.29.5/drivers/ch }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.29.5/drivers/char/hpet.c linux-2.6.29.5/drivers/char/hpet.c ---- linux-2.6.29.5/drivers/char/hpet.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/hpet.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/hpet.c linux-2.6.29.6/drivers/char/hpet.c +--- linux-2.6.29.6/drivers/char/hpet.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/hpet.c 2009-07-09 22:13:39.000000000 -0400 @@ -975,7 +975,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -17002,9 +17019,9 @@ diff -urNp linux-2.6.29.5/drivers/char/hpet.c linux-2.6.29.5/drivers/char/hpet.c static int __init hpet_init(void) { -diff -urNp linux-2.6.29.5/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.5/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.29.5/drivers/char/ipmi/ipmi_msghandler.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/ipmi/ipmi_msghandler.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c 2009-07-09 22:13:39.000000000 -0400 @@ -408,7 +408,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -17023,9 +17040,9 @@ diff -urNp linux-2.6.29.5/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.5/dri #define ipmi_get_stat(intf, stat) \ ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat])) -diff -urNp linux-2.6.29.5/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.5/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.29.5/drivers/char/ipmi/ipmi_si_intf.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/ipmi/ipmi_si_intf.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c 2009-07-09 22:13:39.000000000 -0400 @@ -288,7 +288,7 @@ struct smi_info { }; @@ -17035,9 +17052,9 @@ diff -urNp linux-2.6.29.5/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.5/driver #define smi_get_stat(smi, stat) \ ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat])) -diff -urNp linux-2.6.29.5/drivers/char/keyboard.c linux-2.6.29.5/drivers/char/keyboard.c ---- linux-2.6.29.5/drivers/char/keyboard.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/keyboard.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/keyboard.c linux-2.6.29.6/drivers/char/keyboard.c +--- linux-2.6.29.6/drivers/char/keyboard.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/keyboard.c 2009-07-09 22:13:39.000000000 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -17064,9 +17081,9 @@ diff -urNp linux-2.6.29.5/drivers/char/keyboard.c linux-2.6.29.5/drivers/char/ke }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.29.5/drivers/char/mem.c linux-2.6.29.5/drivers/char/mem.c ---- linux-2.6.29.5/drivers/char/mem.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/mem.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c +--- linux-2.6.29.6/drivers/char/mem.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/mem.c 2009-07-09 22:13:39.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -17169,9 +17186,9 @@ diff -urNp linux-2.6.29.5/drivers/char/mem.c linux-2.6.29.5/drivers/char/mem.c }; static struct class *mem_class; -diff -urNp linux-2.6.29.5/drivers/char/nvram.c linux-2.6.29.5/drivers/char/nvram.c ---- linux-2.6.29.5/drivers/char/nvram.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/nvram.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/nvram.c linux-2.6.29.6/drivers/char/nvram.c +--- linux-2.6.29.6/drivers/char/nvram.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/nvram.c 2009-07-09 22:13:39.000000000 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -17184,9 +17201,9 @@ diff -urNp linux-2.6.29.5/drivers/char/nvram.c linux-2.6.29.5/drivers/char/nvram }; static int __init nvram_init(void) -diff -urNp linux-2.6.29.5/drivers/char/random.c linux-2.6.29.5/drivers/char/random.c ---- linux-2.6.29.5/drivers/char/random.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/random.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/random.c linux-2.6.29.6/drivers/char/random.c +--- linux-2.6.29.6/drivers/char/random.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/random.c 2009-07-09 22:13:39.000000000 -0400 @@ -249,8 +249,13 @@ /* * Configuration information @@ -17228,9 +17245,9 @@ diff -urNp linux-2.6.29.5/drivers/char/random.c linux-2.6.29.5/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.29.5/drivers/char/tty_ldisc.c linux-2.6.29.5/drivers/char/tty_ldisc.c ---- linux-2.6.29.5/drivers/char/tty_ldisc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/tty_ldisc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/tty_ldisc.c +--- linux-2.6.29.6/drivers/char/tty_ldisc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/tty_ldisc.c 2009-07-09 22:13:39.000000000 -0400 @@ -74,7 +74,7 @@ int tty_register_ldisc(int disc, struct spin_lock_irqsave(&tty_ldisc_lock, flags); tty_ldiscs[disc] = new_ldisc; @@ -17351,9 +17368,9 @@ diff -urNp linux-2.6.29.5/drivers/char/tty_ldisc.c linux-2.6.29.5/drivers/char/t spin_lock_irqsave(&tty_ldisc_lock, flags); } spin_unlock_irqrestore(&tty_ldisc_lock, flags); -diff -urNp linux-2.6.29.5/drivers/char/vt_ioctl.c linux-2.6.29.5/drivers/char/vt_ioctl.c ---- linux-2.6.29.5/drivers/char/vt_ioctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/char/vt_ioctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/char/vt_ioctl.c linux-2.6.29.6/drivers/char/vt_ioctl.c +--- linux-2.6.29.6/drivers/char/vt_ioctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/char/vt_ioctl.c 2009-07-09 22:13:39.000000000 -0400 @@ -96,6 +96,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -17381,9 +17398,9 @@ diff -urNp linux-2.6.29.5/drivers/char/vt_ioctl.c linux-2.6.29.5/drivers/char/vt q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.29.5/drivers/edac/edac_core.h linux-2.6.29.5/drivers/edac/edac_core.h ---- linux-2.6.29.5/drivers/edac/edac_core.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/edac/edac_core.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/edac/edac_core.h linux-2.6.29.6/drivers/edac/edac_core.h +--- linux-2.6.29.6/drivers/edac/edac_core.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/edac/edac_core.h 2009-07-09 22:13:39.000000000 -0400 @@ -85,11 +85,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -17401,9 +17418,9 @@ diff -urNp linux-2.6.29.5/drivers/edac/edac_core.h linux-2.6.29.5/drivers/edac/e #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.29.5/drivers/firmware/dmi_scan.c linux-2.6.29.5/drivers/firmware/dmi_scan.c ---- linux-2.6.29.5/drivers/firmware/dmi_scan.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/firmware/dmi_scan.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/firmware/dmi_scan.c linux-2.6.29.6/drivers/firmware/dmi_scan.c +--- linux-2.6.29.6/drivers/firmware/dmi_scan.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/firmware/dmi_scan.c 2009-07-09 22:13:39.000000000 -0400 @@ -389,11 +389,6 @@ void __init dmi_scan_machine(void) } } @@ -17416,9 +17433,9 @@ diff -urNp linux-2.6.29.5/drivers/firmware/dmi_scan.c linux-2.6.29.5/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_drv.c linux-2.6.29.5/drivers/gpu/drm/drm_drv.c ---- linux-2.6.29.5/drivers/gpu/drm/drm_drv.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/gpu/drm/drm_drv.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_drv.c linux-2.6.29.6/drivers/gpu/drm/drm_drv.c +--- linux-2.6.29.6/drivers/gpu/drm/drm_drv.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/gpu/drm/drm_drv.c 2009-07-09 22:13:39.000000000 -0400 @@ -461,7 +461,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -17428,9 +17445,9 @@ diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_drv.c linux-2.6.29.5/drivers/gpu/d ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_fops.c linux-2.6.29.5/drivers/gpu/drm/drm_fops.c ---- linux-2.6.29.5/drivers/gpu/drm/drm_fops.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/gpu/drm/drm_fops.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/drm/drm_fops.c +--- linux-2.6.29.6/drivers/gpu/drm/drm_fops.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/gpu/drm/drm_fops.c 2009-07-09 22:13:39.000000000 -0400 @@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct retcode = drm_open_helper(inode, filp, dev); @@ -17473,9 +17490,9 @@ diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_fops.c linux-2.6.29.5/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_lock.c linux-2.6.29.5/drivers/gpu/drm/drm_lock.c ---- linux-2.6.29.5/drivers/gpu/drm/drm_lock.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/gpu/drm/drm_lock.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_lock.c linux-2.6.29.6/drivers/gpu/drm/drm_lock.c +--- linux-2.6.29.6/drivers/gpu/drm/drm_lock.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/gpu/drm/drm_lock.c 2009-07-09 22:13:39.000000000 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -17494,9 +17511,9 @@ diff -urNp linux-2.6.29.5/drivers/gpu/drm/drm_lock.c linux-2.6.29.5/drivers/gpu/ /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.29.5/drivers/gpu/drm/i810/i810_dma.c linux-2.6.29.5/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.29.5/drivers/gpu/drm/i810/i810_dma.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/gpu/drm/i810/i810_dma.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c 2009-07-09 22:13:39.000000000 -0400 @@ -954,8 +954,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -17519,9 +17536,9 @@ diff -urNp linux-2.6.29.5/drivers/gpu/drm/i810/i810_dma.c linux-2.6.29.5/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.29.5/drivers/hwmon/fscpos.c linux-2.6.29.5/drivers/hwmon/fscpos.c ---- linux-2.6.29.5/drivers/hwmon/fscpos.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/fscpos.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/fscpos.c linux-2.6.29.6/drivers/hwmon/fscpos.c +--- linux-2.6.29.6/drivers/hwmon/fscpos.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/fscpos.c 2009-07-09 22:13:39.000000000 -0400 @@ -240,7 +240,6 @@ static ssize_t set_pwm(struct i2c_client unsigned long v = simple_strtoul(buf, NULL, 10); @@ -17530,9 +17547,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/fscpos.c linux-2.6.29.5/drivers/hwmon/fs if (v > 255) v = 255; mutex_lock(&data->update_lock); -diff -urNp linux-2.6.29.5/drivers/hwmon/k8temp.c linux-2.6.29.5/drivers/hwmon/k8temp.c ---- linux-2.6.29.5/drivers/hwmon/k8temp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/k8temp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/k8temp.c linux-2.6.29.6/drivers/hwmon/k8temp.c +--- linux-2.6.29.6/drivers/hwmon/k8temp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/k8temp.c 2009-07-09 22:13:39.000000000 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -17542,9 +17559,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/k8temp.c linux-2.6.29.5/drivers/hwmon/k8 }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.29.5/drivers/hwmon/sis5595.c linux-2.6.29.5/drivers/hwmon/sis5595.c ---- linux-2.6.29.5/drivers/hwmon/sis5595.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/sis5595.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/sis5595.c linux-2.6.29.6/drivers/hwmon/sis5595.c +--- linux-2.6.29.6/drivers/hwmon/sis5595.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/sis5595.c 2009-07-09 22:13:39.000000000 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -17554,9 +17571,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/sis5595.c linux-2.6.29.5/drivers/hwmon/s }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.29.5/drivers/hwmon/via686a.c linux-2.6.29.5/drivers/hwmon/via686a.c ---- linux-2.6.29.5/drivers/hwmon/via686a.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/via686a.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/via686a.c linux-2.6.29.6/drivers/hwmon/via686a.c +--- linux-2.6.29.6/drivers/hwmon/via686a.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/via686a.c 2009-07-09 22:13:39.000000000 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -17566,9 +17583,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/via686a.c linux-2.6.29.5/drivers/hwmon/v }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.29.5/drivers/hwmon/vt8231.c linux-2.6.29.5/drivers/hwmon/vt8231.c ---- linux-2.6.29.5/drivers/hwmon/vt8231.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/vt8231.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/vt8231.c linux-2.6.29.6/drivers/hwmon/vt8231.c +--- linux-2.6.29.6/drivers/hwmon/vt8231.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/vt8231.c 2009-07-09 22:13:39.000000000 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -17578,9 +17595,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/vt8231.c linux-2.6.29.5/drivers/hwmon/vt }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.29.5/drivers/hwmon/w83791d.c linux-2.6.29.5/drivers/hwmon/w83791d.c ---- linux-2.6.29.5/drivers/hwmon/w83791d.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/hwmon/w83791d.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/hwmon/w83791d.c linux-2.6.29.6/drivers/hwmon/w83791d.c +--- linux-2.6.29.6/drivers/hwmon/w83791d.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/hwmon/w83791d.c 2009-07-09 22:13:39.000000000 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -17592,9 +17609,9 @@ diff -urNp linux-2.6.29.5/drivers/hwmon/w83791d.c linux-2.6.29.5/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-i801.c linux-2.6.29.5/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.29.5/drivers/i2c/busses/i2c-i801.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/i2c/busses/i2c-i801.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c 2009-07-09 22:13:39.000000000 -0400 @@ -577,7 +577,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, @@ -17604,9 +17621,9 @@ diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-i801.c linux-2.6.29.5/drivers/i }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-piix4.c linux-2.6.29.5/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.29.5/drivers/i2c/busses/i2c-piix4.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/i2c/busses/i2c-piix4.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c 2009-07-09 22:13:39.000000000 -0400 @@ -123,7 +123,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -17625,9 +17642,9 @@ diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-piix4.c linux-2.6.29.5/drivers/ }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-sis630.c linux-2.6.29.5/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.29.5/drivers/i2c/busses/i2c-sis630.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/i2c/busses/i2c-sis630.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c 2009-07-09 22:13:39.000000000 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -17637,9 +17654,9 @@ diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-sis630.c linux-2.6.29.5/drivers }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-sis96x.c linux-2.6.29.5/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.29.5/drivers/i2c/busses/i2c-sis96x.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/i2c/busses/i2c-sis96x.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c 2009-07-09 22:13:39.000000000 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -17649,9 +17666,9 @@ diff -urNp linux-2.6.29.5/drivers/i2c/busses/i2c-sis96x.c linux-2.6.29.5/drivers }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.29.5/drivers/ieee1394/dv1394.c linux-2.6.29.5/drivers/ieee1394/dv1394.c ---- linux-2.6.29.5/drivers/ieee1394/dv1394.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/dv1394.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/dv1394.c linux-2.6.29.6/drivers/ieee1394/dv1394.c +--- linux-2.6.29.6/drivers/ieee1394/dv1394.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/dv1394.c 2009-07-09 22:13:39.000000000 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -17670,9 +17687,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/dv1394.c linux-2.6.29.5/drivers/ieee1 }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.29.5/drivers/ieee1394/eth1394.c linux-2.6.29.5/drivers/ieee1394/eth1394.c ---- linux-2.6.29.5/drivers/ieee1394/eth1394.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/eth1394.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/eth1394.c linux-2.6.29.6/drivers/ieee1394/eth1394.c +--- linux-2.6.29.6/drivers/ieee1394/eth1394.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/eth1394.c 2009-07-09 22:13:39.000000000 -0400 @@ -445,7 +445,7 @@ static struct ieee1394_device_id eth1394 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -17682,9 +17699,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/eth1394.c linux-2.6.29.5/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.29.5/drivers/ieee1394/hosts.c linux-2.6.29.5/drivers/ieee1394/hosts.c ---- linux-2.6.29.5/drivers/ieee1394/hosts.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/hosts.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/hosts.c linux-2.6.29.6/drivers/ieee1394/hosts.c +--- linux-2.6.29.6/drivers/ieee1394/hosts.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/hosts.c 2009-07-09 22:13:39.000000000 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -17693,9 +17710,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/hosts.c linux-2.6.29.5/drivers/ieee13 .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.29.5/drivers/ieee1394/ohci1394.c linux-2.6.29.5/drivers/ieee1394/ohci1394.c ---- linux-2.6.29.5/drivers/ieee1394/ohci1394.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/ohci1394.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/ohci1394.c linux-2.6.29.6/drivers/ieee1394/ohci1394.c +--- linux-2.6.29.6/drivers/ieee1394/ohci1394.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/ohci1394.c 2009-07-09 22:13:39.000000000 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -17717,9 +17734,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/ohci1394.c linux-2.6.29.5/drivers/iee }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.29.5/drivers/ieee1394/raw1394.c linux-2.6.29.5/drivers/ieee1394/raw1394.c ---- linux-2.6.29.5/drivers/ieee1394/raw1394.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/raw1394.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/raw1394.c linux-2.6.29.6/drivers/ieee1394/raw1394.c +--- linux-2.6.29.6/drivers/ieee1394/raw1394.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/raw1394.c 2009-07-09 22:13:39.000000000 -0400 @@ -2995,7 +2995,7 @@ static struct ieee1394_device_id raw1394 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -17729,9 +17746,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/raw1394.c linux-2.6.29.5/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.29.5/drivers/ieee1394/sbp2.c linux-2.6.29.5/drivers/ieee1394/sbp2.c ---- linux-2.6.29.5/drivers/ieee1394/sbp2.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/sbp2.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/sbp2.c linux-2.6.29.6/drivers/ieee1394/sbp2.c +--- linux-2.6.29.6/drivers/ieee1394/sbp2.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/sbp2.c 2009-07-09 22:13:39.000000000 -0400 @@ -290,7 +290,7 @@ static struct ieee1394_device_id sbp2_id .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -17750,9 +17767,9 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/sbp2.c linux-2.6.29.5/drivers/ieee139 { int ret; -diff -urNp linux-2.6.29.5/drivers/ieee1394/video1394.c linux-2.6.29.5/drivers/ieee1394/video1394.c ---- linux-2.6.29.5/drivers/ieee1394/video1394.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/ieee1394/video1394.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/ieee1394/video1394.c linux-2.6.29.6/drivers/ieee1394/video1394.c +--- linux-2.6.29.6/drivers/ieee1394/video1394.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/ieee1394/video1394.c 2009-07-09 22:13:39.000000000 -0400 @@ -1310,7 +1310,7 @@ static struct ieee1394_device_id video13 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -17762,10 +17779,10 @@ diff -urNp linux-2.6.29.5/drivers/ieee1394/video1394.c linux-2.6.29.5/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.29.5/drivers/input/keyboard/atkbd.c linux-2.6.29.5/drivers/input/keyboard/atkbd.c ---- linux-2.6.29.5/drivers/input/keyboard/atkbd.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/keyboard/atkbd.c 2009-06-12 23:57:32.000000000 -0400 -@@ -1181,7 +1181,7 @@ static struct serio_device_id atkbd_seri +diff -urNp linux-2.6.29.6/drivers/input/keyboard/atkbd.c linux-2.6.29.6/drivers/input/keyboard/atkbd.c +--- linux-2.6.29.6/drivers/input/keyboard/atkbd.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/keyboard/atkbd.c 2009-07-09 22:13:39.000000000 -0400 +@@ -1166,7 +1166,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -17774,9 +17791,9 @@ diff -urNp linux-2.6.29.5/drivers/input/keyboard/atkbd.c linux-2.6.29.5/drivers/ }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.29.5/drivers/input/mouse/lifebook.c linux-2.6.29.5/drivers/input/mouse/lifebook.c ---- linux-2.6.29.5/drivers/input/mouse/lifebook.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/mouse/lifebook.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/mouse/lifebook.c linux-2.6.29.6/drivers/input/mouse/lifebook.c +--- linux-2.6.29.6/drivers/input/mouse/lifebook.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/mouse/lifebook.c 2009-07-09 22:13:39.000000000 -0400 @@ -110,7 +110,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -17786,9 +17803,9 @@ diff -urNp linux-2.6.29.5/drivers/input/mouse/lifebook.c linux-2.6.29.5/drivers/ }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.29.5/drivers/input/mouse/psmouse-base.c linux-2.6.29.5/drivers/input/mouse/psmouse-base.c ---- linux-2.6.29.5/drivers/input/mouse/psmouse-base.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/mouse/psmouse-base.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/mouse/psmouse-base.c linux-2.6.29.6/drivers/input/mouse/psmouse-base.c +--- linux-2.6.29.6/drivers/input/mouse/psmouse-base.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/mouse/psmouse-base.c 2009-07-09 22:13:39.000000000 -0400 @@ -1378,7 +1378,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -17798,9 +17815,9 @@ diff -urNp linux-2.6.29.5/drivers/input/mouse/psmouse-base.c linux-2.6.29.5/driv }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.29.5/drivers/input/mouse/synaptics.c linux-2.6.29.5/drivers/input/mouse/synaptics.c ---- linux-2.6.29.5/drivers/input/mouse/synaptics.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/mouse/synaptics.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/mouse/synaptics.c linux-2.6.29.6/drivers/input/mouse/synaptics.c +--- linux-2.6.29.6/drivers/input/mouse/synaptics.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/mouse/synaptics.c 2009-07-09 22:13:39.000000000 -0400 @@ -412,7 +412,7 @@ static void synaptics_process_packet(str break; case 2: @@ -17819,9 +17836,9 @@ diff -urNp linux-2.6.29.5/drivers/input/mouse/synaptics.c linux-2.6.29.5/drivers }; #endif -diff -urNp linux-2.6.29.5/drivers/input/mousedev.c linux-2.6.29.5/drivers/input/mousedev.c ---- linux-2.6.29.5/drivers/input/mousedev.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/mousedev.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/mousedev.c linux-2.6.29.6/drivers/input/mousedev.c +--- linux-2.6.29.6/drivers/input/mousedev.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/mousedev.c 2009-07-09 22:13:39.000000000 -0400 @@ -1062,7 +1062,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -17831,9 +17848,9 @@ diff -urNp linux-2.6.29.5/drivers/input/mousedev.c linux-2.6.29.5/drivers/input/ }; static int psaux_registered; #endif -diff -urNp linux-2.6.29.5/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.5/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.29.5/drivers/input/serio/i8042-x86ia64io.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/serio/i8042-x86ia64io.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h 2009-07-09 22:13:39.000000000 -0400 @@ -151,7 +151,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_VERSION, "01"), }, @@ -17870,9 +17887,9 @@ diff -urNp linux-2.6.29.5/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.5/d }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.29.5/drivers/input/serio/serio_raw.c linux-2.6.29.5/drivers/input/serio/serio_raw.c ---- linux-2.6.29.5/drivers/input/serio/serio_raw.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/input/serio/serio_raw.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/input/serio/serio_raw.c linux-2.6.29.6/drivers/input/serio/serio_raw.c +--- linux-2.6.29.6/drivers/input/serio/serio_raw.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/input/serio/serio_raw.c 2009-07-09 22:13:39.000000000 -0400 @@ -378,7 +378,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -17882,9 +17899,9 @@ diff -urNp linux-2.6.29.5/drivers/input/serio/serio_raw.c linux-2.6.29.5/drivers }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.29.5/drivers/lguest/core.c linux-2.6.29.5/drivers/lguest/core.c ---- linux-2.6.29.5/drivers/lguest/core.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/lguest/core.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/lguest/core.c linux-2.6.29.6/drivers/lguest/core.c +--- linux-2.6.29.6/drivers/lguest/core.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/lguest/core.c 2009-07-09 22:13:39.000000000 -0400 @@ -80,9 +80,17 @@ static __init int map_switcher(void) * (SWITCHER_ADDR). We might not get it in theory, but in practice * it's worked so far. The end address needs +1 because __get_vm_area @@ -17903,9 +17920,9 @@ diff -urNp linux-2.6.29.5/drivers/lguest/core.c linux-2.6.29.5/drivers/lguest/co if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.29.5/drivers/md/bitmap.c linux-2.6.29.5/drivers/md/bitmap.c ---- linux-2.6.29.5/drivers/md/bitmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/md/bitmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/md/bitmap.c linux-2.6.29.6/drivers/md/bitmap.c +--- linux-2.6.29.6/drivers/md/bitmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/md/bitmap.c 2009-07-09 22:13:39.000000000 -0400 @@ -57,7 +57,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -17915,9 +17932,9 @@ diff -urNp linux-2.6.29.5/drivers/md/bitmap.c linux-2.6.29.5/drivers/md/bitmap.c # endif #endif -diff -urNp linux-2.6.29.5/drivers/md/md.c linux-2.6.29.5/drivers/md/md.c ---- linux-2.6.29.5/drivers/md/md.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/md/md.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/md/md.c linux-2.6.29.6/drivers/md/md.c +--- linux-2.6.29.6/drivers/md/md.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/md/md.c 2009-07-09 22:13:39.000000000 -0400 @@ -5637,7 +5637,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { @@ -17927,9 +17944,9 @@ diff -urNp linux-2.6.29.5/drivers/md/md.c linux-2.6.29.5/drivers/md/md.c } seq_printf(seq, "\n"); -diff -urNp linux-2.6.29.5/drivers/mtd/devices/doc2000.c linux-2.6.29.5/drivers/mtd/devices/doc2000.c ---- linux-2.6.29.5/drivers/mtd/devices/doc2000.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/mtd/devices/doc2000.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2000.c linux-2.6.29.6/drivers/mtd/devices/doc2000.c +--- linux-2.6.29.6/drivers/mtd/devices/doc2000.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/mtd/devices/doc2000.c 2009-07-09 22:13:39.000000000 -0400 @@ -777,7 +777,7 @@ static int doc_write(struct mtd_info *mt /* The ECC will not be calculated correctly if less than 512 is written */ @@ -17939,9 +17956,9 @@ diff -urNp linux-2.6.29.5/drivers/mtd/devices/doc2000.c linux-2.6.29.5/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.29.5/drivers/mtd/devices/doc2001.c linux-2.6.29.5/drivers/mtd/devices/doc2001.c ---- linux-2.6.29.5/drivers/mtd/devices/doc2001.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/mtd/devices/doc2001.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2001.c linux-2.6.29.6/drivers/mtd/devices/doc2001.c +--- linux-2.6.29.6/drivers/mtd/devices/doc2001.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/mtd/devices/doc2001.c 2009-07-09 22:13:39.000000000 -0400 @@ -396,6 +396,8 @@ static int doc_read (struct mtd_info *mt /* Don't allow read past end of device */ if (from >= this->totlen) @@ -17951,9 +17968,9 @@ diff -urNp linux-2.6.29.5/drivers/mtd/devices/doc2001.c linux-2.6.29.5/drivers/m /* Don't allow a single read to cross a 512-byte block boundary */ if (from + len > ((from | 0x1ff) + 1)) -diff -urNp linux-2.6.29.5/drivers/mtd/ubi/build.c linux-2.6.29.5/drivers/mtd/ubi/build.c ---- linux-2.6.29.5/drivers/mtd/ubi/build.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/mtd/ubi/build.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/mtd/ubi/build.c linux-2.6.29.6/drivers/mtd/ubi/build.c +--- linux-2.6.29.6/drivers/mtd/ubi/build.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/mtd/ubi/build.c 2009-07-09 22:13:39.000000000 -0400 @@ -1112,7 +1112,7 @@ static int __init bytes_str_to_int(const unsigned long result; @@ -17963,9 +17980,9 @@ diff -urNp linux-2.6.29.5/drivers/mtd/ubi/build.c linux-2.6.29.5/drivers/mtd/ubi printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", str); return -EINVAL; -diff -urNp linux-2.6.29.5/drivers/net/irda/vlsi_ir.c linux-2.6.29.5/drivers/net/irda/vlsi_ir.c ---- linux-2.6.29.5/drivers/net/irda/vlsi_ir.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/net/irda/vlsi_ir.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/net/irda/vlsi_ir.c linux-2.6.29.6/drivers/net/irda/vlsi_ir.c +--- linux-2.6.29.6/drivers/net/irda/vlsi_ir.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/net/irda/vlsi_ir.c 2009-07-09 22:13:39.000000000 -0400 @@ -906,13 +906,12 @@ static int vlsi_hard_start_xmit(struct s /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -17982,9 +17999,9 @@ diff -urNp linux-2.6.29.5/drivers/net/irda/vlsi_ir.c linux-2.6.29.5/drivers/net/ spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return 0; -diff -urNp linux-2.6.29.5/drivers/net/pcnet32.c linux-2.6.29.5/drivers/net/pcnet32.c ---- linux-2.6.29.5/drivers/net/pcnet32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/net/pcnet32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/net/pcnet32.c linux-2.6.29.6/drivers/net/pcnet32.c +--- linux-2.6.29.6/drivers/net/pcnet32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/net/pcnet32.c 2009-07-09 22:13:39.000000000 -0400 @@ -78,7 +78,7 @@ static int cards_found; /* * VLB I/O addresses @@ -17994,9 +18011,9 @@ diff -urNp linux-2.6.29.5/drivers/net/pcnet32.c linux-2.6.29.5/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.29.5/drivers/net/tg3.h linux-2.6.29.5/drivers/net/tg3.h ---- linux-2.6.29.5/drivers/net/tg3.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/net/tg3.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/net/tg3.h linux-2.6.29.6/drivers/net/tg3.h +--- linux-2.6.29.6/drivers/net/tg3.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/net/tg3.h 2009-07-09 22:13:39.000000000 -0400 @@ -89,6 +89,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -18005,9 +18022,9 @@ diff -urNp linux-2.6.29.5/drivers/net/tg3.h linux-2.6.29.5/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.29.5/drivers/oprofile/buffer_sync.c linux-2.6.29.5/drivers/oprofile/buffer_sync.c ---- linux-2.6.29.5/drivers/oprofile/buffer_sync.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/oprofile/buffer_sync.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/oprofile/buffer_sync.c linux-2.6.29.6/drivers/oprofile/buffer_sync.c +--- linux-2.6.29.6/drivers/oprofile/buffer_sync.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/oprofile/buffer_sync.c 2009-07-09 22:13:39.000000000 -0400 @@ -335,7 +335,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -18043,9 +18060,9 @@ diff -urNp linux-2.6.29.5/drivers/oprofile/buffer_sync.c linux-2.6.29.5/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.29.5/drivers/oprofile/event_buffer.c linux-2.6.29.5/drivers/oprofile/event_buffer.c ---- linux-2.6.29.5/drivers/oprofile/event_buffer.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/oprofile/event_buffer.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/oprofile/event_buffer.c linux-2.6.29.6/drivers/oprofile/event_buffer.c +--- linux-2.6.29.6/drivers/oprofile/event_buffer.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/oprofile/event_buffer.c 2009-07-09 22:13:39.000000000 -0400 @@ -42,7 +42,7 @@ static atomic_t buffer_ready = ATOMIC_IN void add_event_entry(unsigned long value) { @@ -18055,9 +18072,9 @@ diff -urNp linux-2.6.29.5/drivers/oprofile/event_buffer.c linux-2.6.29.5/drivers return; } -diff -urNp linux-2.6.29.5/drivers/oprofile/oprofilefs.c linux-2.6.29.5/drivers/oprofile/oprofilefs.c ---- linux-2.6.29.5/drivers/oprofile/oprofilefs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/oprofile/oprofilefs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/oprofile/oprofilefs.c linux-2.6.29.6/drivers/oprofile/oprofilefs.c +--- linux-2.6.29.6/drivers/oprofile/oprofilefs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/oprofile/oprofilefs.c 2009-07-09 22:13:39.000000000 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -18067,9 +18084,9 @@ diff -urNp linux-2.6.29.5/drivers/oprofile/oprofilefs.c linux-2.6.29.5/drivers/o { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.29.5/drivers/oprofile/oprofile_stats.h linux-2.6.29.5/drivers/oprofile/oprofile_stats.h ---- linux-2.6.29.5/drivers/oprofile/oprofile_stats.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/oprofile/oprofile_stats.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/oprofile/oprofile_stats.h linux-2.6.29.6/drivers/oprofile/oprofile_stats.h +--- linux-2.6.29.6/drivers/oprofile/oprofile_stats.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/oprofile/oprofile_stats.h 2009-07-09 22:13:39.000000000 -0400 @@ -13,10 +13,10 @@ #include <asm/atomic.h> @@ -18085,9 +18102,9 @@ diff -urNp linux-2.6.29.5/drivers/oprofile/oprofile_stats.h linux-2.6.29.5/drive }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.29.5/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.29.5/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.29.5/drivers/pci/hotplug/cpqphp_nvram.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pci/hotplug/cpqphp_nvram.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-09 22:13:39.000000000 -0400 @@ -425,9 +425,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -18102,9 +18119,9 @@ diff -urNp linux-2.6.29.5/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.29.5/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv.c linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv.c ---- linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c +--- linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c 2009-07-09 22:13:39.000000000 -0400 @@ -59,7 +59,7 @@ static struct pcie_port_service_id aer_i .port_type = PCIE_RC_PORT, .service_type = PCIE_PORT_SERVICE_AER, @@ -18114,9 +18131,9 @@ diff -urNp linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv.c linux-2.6.29.5/drivers/p }; static struct pci_error_handlers aer_error_handlers = { -diff -urNp linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv_core.c ---- linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv_core.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv_core.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c +--- linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-09 22:13:39.000000000 -0400 @@ -670,7 +670,7 @@ static void aer_isr_one_error(struct pci struct aer_err_source *e_src) { @@ -18126,9 +18143,9 @@ diff -urNp linux-2.6.29.5/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.29.5/driv int i; u16 id; -diff -urNp linux-2.6.29.5/drivers/pci/pcie/portdrv_pci.c linux-2.6.29.5/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.29.5/drivers/pci/pcie/portdrv_pci.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pci/pcie/portdrv_pci.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c 2009-07-09 22:13:39.000000000 -0400 @@ -260,7 +260,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -18138,9 +18155,9 @@ diff -urNp linux-2.6.29.5/drivers/pci/pcie/portdrv_pci.c linux-2.6.29.5/drivers/ }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.29.5/drivers/pci/proc.c linux-2.6.29.5/drivers/pci/proc.c ---- linux-2.6.29.5/drivers/pci/proc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pci/proc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pci/proc.c linux-2.6.29.6/drivers/pci/proc.c +--- linux-2.6.29.6/drivers/pci/proc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pci/proc.c 2009-07-09 22:13:39.000000000 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -18158,9 +18175,9 @@ diff -urNp linux-2.6.29.5/drivers/pci/proc.c linux-2.6.29.5/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.29.5/drivers/pcmcia/ti113x.h linux-2.6.29.5/drivers/pcmcia/ti113x.h ---- linux-2.6.29.5/drivers/pcmcia/ti113x.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pcmcia/ti113x.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pcmcia/ti113x.h linux-2.6.29.6/drivers/pcmcia/ti113x.h +--- linux-2.6.29.6/drivers/pcmcia/ti113x.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pcmcia/ti113x.h 2009-07-09 22:13:39.000000000 -0400 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), @@ -18170,9 +18187,9 @@ diff -urNp linux-2.6.29.5/drivers/pcmcia/ti113x.h linux-2.6.29.5/drivers/pcmcia/ }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.29.5/drivers/pcmcia/yenta_socket.c linux-2.6.29.5/drivers/pcmcia/yenta_socket.c ---- linux-2.6.29.5/drivers/pcmcia/yenta_socket.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pcmcia/yenta_socket.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pcmcia/yenta_socket.c linux-2.6.29.6/drivers/pcmcia/yenta_socket.c +--- linux-2.6.29.6/drivers/pcmcia/yenta_socket.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pcmcia/yenta_socket.c 2009-07-09 22:13:39.000000000 -0400 @@ -1366,7 +1366,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -18182,9 +18199,9 @@ diff -urNp linux-2.6.29.5/drivers/pcmcia/yenta_socket.c linux-2.6.29.5/drivers/p }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.29.5/drivers/pnp/pnpbios/bioscalls.c linux-2.6.29.5/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.29.5/drivers/pnp/pnpbios/bioscalls.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pnp/pnpbios/bioscalls.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c 2009-07-09 22:13:39.000000000 -0400 @@ -60,7 +60,7 @@ set_base(gdt[(selname) >> 3], (u32)(addr set_limit(gdt[(selname) >> 3], size); \ } while(0) @@ -18277,9 +18294,9 @@ diff -urNp linux-2.6.29.5/drivers/pnp/pnpbios/bioscalls.c linux-2.6.29.5/drivers +#endif + } -diff -urNp linux-2.6.29.5/drivers/pnp/quirks.c linux-2.6.29.5/drivers/pnp/quirks.c ---- linux-2.6.29.5/drivers/pnp/quirks.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pnp/quirks.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pnp/quirks.c linux-2.6.29.6/drivers/pnp/quirks.c +--- linux-2.6.29.6/drivers/pnp/quirks.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pnp/quirks.c 2009-07-09 22:13:39.000000000 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -18289,9 +18306,9 @@ diff -urNp linux-2.6.29.5/drivers/pnp/quirks.c linux-2.6.29.5/drivers/pnp/quirks }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.29.5/drivers/pnp/resource.c linux-2.6.29.5/drivers/pnp/resource.c ---- linux-2.6.29.5/drivers/pnp/resource.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/pnp/resource.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/pnp/resource.c linux-2.6.29.6/drivers/pnp/resource.c +--- linux-2.6.29.6/drivers/pnp/resource.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/pnp/resource.c 2009-07-09 22:13:39.000000000 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -18310,9 +18327,9 @@ diff -urNp linux-2.6.29.5/drivers/pnp/resource.c linux-2.6.29.5/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.29.5/drivers/scsi/libfc/fc_exch.c linux-2.6.29.5/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.29.5/drivers/scsi/libfc/fc_exch.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/scsi/libfc/fc_exch.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c 2009-07-09 22:13:39.000000000 -0400 @@ -84,12 +84,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -18430,9 +18447,9 @@ diff -urNp linux-2.6.29.5/drivers/scsi/libfc/fc_exch.c linux-2.6.29.5/drivers/sc FC_DEBUG_EXCH("non-BLS response to sequence"); } fc_frame_free(fp); -diff -urNp linux-2.6.29.5/drivers/scsi/scsi_logging.h linux-2.6.29.5/drivers/scsi/scsi_logging.h ---- linux-2.6.29.5/drivers/scsi/scsi_logging.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/scsi/scsi_logging.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/scsi/scsi_logging.h linux-2.6.29.6/drivers/scsi/scsi_logging.h +--- linux-2.6.29.6/drivers/scsi/scsi_logging.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/scsi/scsi_logging.h 2009-07-09 22:13:39.000000000 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -18442,9 +18459,9 @@ diff -urNp linux-2.6.29.5/drivers/scsi/scsi_logging.h linux-2.6.29.5/drivers/scs #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.29.5/drivers/serial/8250_pci.c linux-2.6.29.5/drivers/serial/8250_pci.c ---- linux-2.6.29.5/drivers/serial/8250_pci.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/serial/8250_pci.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/serial/8250_pci.c linux-2.6.29.6/drivers/serial/8250_pci.c +--- linux-2.6.29.6/drivers/serial/8250_pci.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/serial/8250_pci.c 2009-07-09 22:13:39.000000000 -0400 @@ -3162,7 +3162,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -18454,9 +18471,9 @@ diff -urNp linux-2.6.29.5/drivers/serial/8250_pci.c linux-2.6.29.5/drivers/seria }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.29.5/drivers/usb/atm/usbatm.c linux-2.6.29.5/drivers/usb/atm/usbatm.c ---- linux-2.6.29.5/drivers/usb/atm/usbatm.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/atm/usbatm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/atm/usbatm.c linux-2.6.29.6/drivers/usb/atm/usbatm.c +--- linux-2.6.29.6/drivers/usb/atm/usbatm.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/atm/usbatm.c 2009-07-09 22:13:39.000000000 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -18519,9 +18536,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/atm/usbatm.c linux-2.6.29.5/drivers/usb/at skb = skb_dequeue(&instance->sndqueue); } -diff -urNp linux-2.6.29.5/drivers/usb/class/cdc-acm.c linux-2.6.29.5/drivers/usb/class/cdc-acm.c ---- linux-2.6.29.5/drivers/usb/class/cdc-acm.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/class/cdc-acm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/class/cdc-acm.c linux-2.6.29.6/drivers/usb/class/cdc-acm.c +--- linux-2.6.29.6/drivers/usb/class/cdc-acm.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/class/cdc-acm.c 2009-07-09 22:13:39.000000000 -0400 @@ -1397,7 +1397,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -18531,9 +18548,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/class/cdc-acm.c linux-2.6.29.5/drivers/usb }; MODULE_DEVICE_TABLE (usb, acm_ids); -diff -urNp linux-2.6.29.5/drivers/usb/class/usblp.c linux-2.6.29.5/drivers/usb/class/usblp.c ---- linux-2.6.29.5/drivers/usb/class/usblp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/class/usblp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/class/usblp.c linux-2.6.29.6/drivers/usb/class/usblp.c +--- linux-2.6.29.6/drivers/usb/class/usblp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/class/usblp.c 2009-07-09 22:13:39.000000000 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -18552,9 +18569,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/class/usblp.c linux-2.6.29.5/drivers/usb/c }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.29.5/drivers/usb/core/hub.c linux-2.6.29.5/drivers/usb/core/hub.c ---- linux-2.6.29.5/drivers/usb/core/hub.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/core/hub.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/core/hub.c linux-2.6.29.6/drivers/usb/core/hub.c +--- linux-2.6.29.6/drivers/usb/core/hub.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/core/hub.c 2009-07-09 22:13:39.000000000 -0400 @@ -3193,7 +3193,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -18564,9 +18581,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/core/hub.c linux-2.6.29.5/drivers/usb/core }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.29.5/drivers/usb/core/message.c linux-2.6.29.5/drivers/usb/core/message.c ---- linux-2.6.29.5/drivers/usb/core/message.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/core/message.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/core/message.c linux-2.6.29.6/drivers/usb/core/message.c +--- linux-2.6.29.6/drivers/usb/core/message.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/core/message.c 2009-07-09 22:13:39.000000000 -0400 @@ -866,7 +866,8 @@ char *usb_cache_string(struct usb_device if (buf) { len = usb_string(udev, index, buf, 256); @@ -18577,9 +18594,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/core/message.c linux-2.6.29.5/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.29.5/drivers/usb/host/ehci-pci.c linux-2.6.29.5/drivers/usb/host/ehci-pci.c ---- linux-2.6.29.5/drivers/usb/host/ehci-pci.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/host/ehci-pci.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/host/ehci-pci.c linux-2.6.29.6/drivers/usb/host/ehci-pci.c +--- linux-2.6.29.6/drivers/usb/host/ehci-pci.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/host/ehci-pci.c 2009-07-09 22:13:39.000000000 -0400 @@ -418,7 +418,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .driver_data = (unsigned long) &ehci_pci_hc_driver, @@ -18589,9 +18606,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/host/ehci-pci.c linux-2.6.29.5/drivers/usb }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.29.5/drivers/usb/host/uhci-hcd.c linux-2.6.29.5/drivers/usb/host/uhci-hcd.c ---- linux-2.6.29.5/drivers/usb/host/uhci-hcd.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/host/uhci-hcd.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/host/uhci-hcd.c linux-2.6.29.6/drivers/usb/host/uhci-hcd.c +--- linux-2.6.29.6/drivers/usb/host/uhci-hcd.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/host/uhci-hcd.c 2009-07-09 22:13:39.000000000 -0400 @@ -927,7 +927,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -18601,9 +18618,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/host/uhci-hcd.c linux-2.6.29.5/drivers/usb }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.29.5/drivers/usb/storage/debug.h linux-2.6.29.5/drivers/usb/storage/debug.h ---- linux-2.6.29.5/drivers/usb/storage/debug.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/storage/debug.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/storage/debug.h linux-2.6.29.6/drivers/usb/storage/debug.h +--- linux-2.6.29.6/drivers/usb/storage/debug.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/storage/debug.h 2009-07-09 22:13:39.000000000 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -18617,9 +18634,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/storage/debug.h linux-2.6.29.5/drivers/usb #endif #endif -diff -urNp linux-2.6.29.5/drivers/usb/storage/usb.c linux-2.6.29.5/drivers/usb/storage/usb.c ---- linux-2.6.29.5/drivers/usb/storage/usb.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/usb/storage/usb.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/usb/storage/usb.c linux-2.6.29.6/drivers/usb/storage/usb.c +--- linux-2.6.29.6/drivers/usb/storage/usb.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/usb/storage/usb.c 2009-07-09 22:13:39.000000000 -0400 @@ -141,7 +141,7 @@ static struct usb_device_id storage_usb_ #undef COMPLIANT_DEV #undef USUAL_DEV @@ -18638,9 +18655,9 @@ diff -urNp linux-2.6.29.5/drivers/usb/storage/usb.c linux-2.6.29.5/drivers/usb/s }; -diff -urNp linux-2.6.29.5/drivers/uwb/wlp/messages.c linux-2.6.29.5/drivers/uwb/wlp/messages.c ---- linux-2.6.29.5/drivers/uwb/wlp/messages.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/uwb/wlp/messages.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/uwb/wlp/messages.c linux-2.6.29.6/drivers/uwb/wlp/messages.c +--- linux-2.6.29.6/drivers/uwb/wlp/messages.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/uwb/wlp/messages.c 2009-07-09 22:13:39.000000000 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -18650,9 +18667,9 @@ diff -urNp linux-2.6.29.5/drivers/uwb/wlp/messages.c linux-2.6.29.5/drivers/uwb/ enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.29.5/drivers/video/fbmem.c linux-2.6.29.5/drivers/video/fbmem.c ---- linux-2.6.29.5/drivers/video/fbmem.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/fbmem.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/fbmem.c linux-2.6.29.6/drivers/video/fbmem.c +--- linux-2.6.29.6/drivers/video/fbmem.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/fbmem.c 2009-07-09 22:13:39.000000000 -0400 @@ -393,7 +393,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -18680,9 +18697,9 @@ diff -urNp linux-2.6.29.5/drivers/video/fbmem.c linux-2.6.29.5/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.29.5/drivers/video/fbmon.c linux-2.6.29.5/drivers/video/fbmon.c ---- linux-2.6.29.5/drivers/video/fbmon.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/fbmon.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/fbmon.c linux-2.6.29.6/drivers/video/fbmon.c +--- linux-2.6.29.6/drivers/video/fbmon.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/fbmon.c 2009-07-09 22:13:39.000000000 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -18692,9 +18709,9 @@ diff -urNp linux-2.6.29.5/drivers/video/fbmon.c linux-2.6.29.5/drivers/video/fbm #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.29.5/drivers/video/i810/i810_accel.c linux-2.6.29.5/drivers/video/i810/i810_accel.c ---- linux-2.6.29.5/drivers/video/i810/i810_accel.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/i810/i810_accel.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/i810/i810_accel.c linux-2.6.29.6/drivers/video/i810/i810_accel.c +--- linux-2.6.29.6/drivers/video/i810/i810_accel.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/i810/i810_accel.c 2009-07-09 22:13:39.000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -18703,9 +18720,9 @@ diff -urNp linux-2.6.29.5/drivers/video/i810/i810_accel.c linux-2.6.29.5/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.29.5/drivers/video/i810/i810_main.c linux-2.6.29.5/drivers/video/i810/i810_main.c ---- linux-2.6.29.5/drivers/video/i810/i810_main.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/i810/i810_main.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/i810/i810_main.c linux-2.6.29.6/drivers/video/i810/i810_main.c +--- linux-2.6.29.6/drivers/video/i810/i810_main.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/i810/i810_main.c 2009-07-09 22:13:39.000000000 -0400 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, @@ -18715,9 +18732,9 @@ diff -urNp linux-2.6.29.5/drivers/video/i810/i810_main.c linux-2.6.29.5/drivers/ }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.29.5/drivers/video/modedb.c linux-2.6.29.5/drivers/video/modedb.c ---- linux-2.6.29.5/drivers/video/modedb.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/modedb.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/modedb.c linux-2.6.29.6/drivers/video/modedb.c +--- linux-2.6.29.6/drivers/video/modedb.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/modedb.c 2009-07-09 22:13:39.000000000 -0400 @@ -38,232 +38,232 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -19008,9 +19025,9 @@ diff -urNp linux-2.6.29.5/drivers/video/modedb.c linux-2.6.29.5/drivers/video/mo }, }; -diff -urNp linux-2.6.29.5/drivers/video/uvesafb.c linux-2.6.29.5/drivers/video/uvesafb.c ---- linux-2.6.29.5/drivers/video/uvesafb.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/uvesafb.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/uvesafb.c +--- linux-2.6.29.6/drivers/video/uvesafb.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/uvesafb.c 2009-07-09 22:13:39.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -19088,9 +19105,9 @@ diff -urNp linux-2.6.29.5/drivers/video/uvesafb.c linux-2.6.29.5/drivers/video/u } framebuffer_release(info); -diff -urNp linux-2.6.29.5/drivers/video/vesafb.c linux-2.6.29.5/drivers/video/vesafb.c ---- linux-2.6.29.5/drivers/video/vesafb.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/drivers/video/vesafb.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/drivers/video/vesafb.c linux-2.6.29.6/drivers/video/vesafb.c +--- linux-2.6.29.6/drivers/video/vesafb.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/drivers/video/vesafb.c 2009-07-09 22:13:39.000000000 -0400 @@ -9,6 +9,7 @@ */ @@ -19198,9 +19215,9 @@ diff -urNp linux-2.6.29.5/drivers/video/vesafb.c linux-2.6.29.5/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.29.5/fs/9p/vfs_inode.c linux-2.6.29.5/fs/9p/vfs_inode.c ---- linux-2.6.29.5/fs/9p/vfs_inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/9p/vfs_inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/9p/vfs_inode.c linux-2.6.29.6/fs/9p/vfs_inode.c +--- linux-2.6.29.6/fs/9p/vfs_inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/9p/vfs_inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -1021,7 +1021,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -19210,9 +19227,9 @@ diff -urNp linux-2.6.29.5/fs/9p/vfs_inode.c linux-2.6.29.5/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.29.5/fs/aio.c linux-2.6.29.5/fs/aio.c ---- linux-2.6.29.5/fs/aio.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/aio.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/aio.c linux-2.6.29.6/fs/aio.c +--- linux-2.6.29.6/fs/aio.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/aio.c 2009-07-09 22:13:39.000000000 -0400 @@ -114,7 +114,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -19222,9 +19239,9 @@ diff -urNp linux-2.6.29.5/fs/aio.c linux-2.6.29.5/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.29.5/fs/autofs/root.c linux-2.6.29.5/fs/autofs/root.c ---- linux-2.6.29.5/fs/autofs/root.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/autofs/root.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/autofs/root.c linux-2.6.29.6/fs/autofs/root.c +--- linux-2.6.29.6/fs/autofs/root.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/autofs/root.c 2009-07-09 22:13:39.000000000 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -19235,9 +19252,9 @@ diff -urNp linux-2.6.29.5/fs/autofs/root.c linux-2.6.29.5/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.29.5/fs/autofs4/symlink.c linux-2.6.29.5/fs/autofs4/symlink.c ---- linux-2.6.29.5/fs/autofs4/symlink.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/autofs4/symlink.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/autofs4/symlink.c linux-2.6.29.6/fs/autofs4/symlink.c +--- linux-2.6.29.6/fs/autofs4/symlink.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/autofs4/symlink.c 2009-07-09 22:13:39.000000000 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -19247,9 +19264,9 @@ diff -urNp linux-2.6.29.5/fs/autofs4/symlink.c linux-2.6.29.5/fs/autofs4/symlink return NULL; } -diff -urNp linux-2.6.29.5/fs/befs/linuxvfs.c linux-2.6.29.5/fs/befs/linuxvfs.c ---- linux-2.6.29.5/fs/befs/linuxvfs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/befs/linuxvfs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/befs/linuxvfs.c linux-2.6.29.6/fs/befs/linuxvfs.c +--- linux-2.6.29.6/fs/befs/linuxvfs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/befs/linuxvfs.c 2009-07-09 22:13:39.000000000 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -19259,9 +19276,9 @@ diff -urNp linux-2.6.29.5/fs/befs/linuxvfs.c linux-2.6.29.5/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.29.5/fs/binfmt_aout.c linux-2.6.29.5/fs/binfmt_aout.c ---- linux-2.6.29.5/fs/binfmt_aout.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/binfmt_aout.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/binfmt_aout.c linux-2.6.29.6/fs/binfmt_aout.c +--- linux-2.6.29.6/fs/binfmt_aout.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/binfmt_aout.c 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -19329,9 +19346,9 @@ diff -urNp linux-2.6.29.5/fs/binfmt_aout.c linux-2.6.29.5/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.29.5/fs/binfmt_elf.c linux-2.6.29.5/fs/binfmt_elf.c ---- linux-2.6.29.5/fs/binfmt_elf.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/binfmt_elf.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c +--- linux-2.6.29.6/fs/binfmt_elf.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/binfmt_elf.c 2009-07-09 22:13:39.000000000 -0400 @@ -42,6 +42,10 @@ #include <asm/param.h> #include <asm/page.h> @@ -19964,9 +19981,9 @@ diff -urNp linux-2.6.29.5/fs/binfmt_elf.c linux-2.6.29.5/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.29.5/fs/binfmt_flat.c linux-2.6.29.5/fs/binfmt_flat.c ---- linux-2.6.29.5/fs/binfmt_flat.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/binfmt_flat.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/binfmt_flat.c linux-2.6.29.6/fs/binfmt_flat.c +--- linux-2.6.29.6/fs/binfmt_flat.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/binfmt_flat.c 2009-07-09 22:13:39.000000000 -0400 @@ -554,7 +554,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -19999,9 +20016,9 @@ diff -urNp linux-2.6.29.5/fs/binfmt_flat.c linux-2.6.29.5/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.29.5/fs/binfmt_misc.c linux-2.6.29.5/fs/binfmt_misc.c ---- linux-2.6.29.5/fs/binfmt_misc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/binfmt_misc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/binfmt_misc.c linux-2.6.29.6/fs/binfmt_misc.c +--- linux-2.6.29.6/fs/binfmt_misc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/binfmt_misc.c 2009-07-09 22:13:39.000000000 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -20011,9 +20028,9 @@ diff -urNp linux-2.6.29.5/fs/binfmt_misc.c linux-2.6.29.5/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.29.5/fs/bio.c linux-2.6.29.5/fs/bio.c ---- linux-2.6.29.5/fs/bio.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/bio.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/bio.c linux-2.6.29.6/fs/bio.c +--- linux-2.6.29.6/fs/bio.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/bio.c 2009-07-09 22:13:39.000000000 -0400 @@ -710,7 +710,7 @@ static int __bio_copy_iov(struct bio *bi while (bv_len && iov_idx < iov_count) { @@ -20023,9 +20040,9 @@ diff -urNp linux-2.6.29.5/fs/bio.c linux-2.6.29.5/fs/bio.c bytes = min_t(unsigned int, iov[iov_idx].iov_len - iov_off, bv_len); -diff -urNp linux-2.6.29.5/fs/buffer.c linux-2.6.29.5/fs/buffer.c ---- linux-2.6.29.5/fs/buffer.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/buffer.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/buffer.c linux-2.6.29.6/fs/buffer.c +--- linux-2.6.29.6/fs/buffer.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/buffer.c 2009-07-09 22:13:39.000000000 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -20042,9 +20059,9 @@ diff -urNp linux-2.6.29.5/fs/buffer.c linux-2.6.29.5/fs/buffer.c if (limit != RLIM_INFINITY && size > (loff_t)limit) { send_sig(SIGXFSZ, current, 0); goto out; -diff -urNp linux-2.6.29.5/fs/cifs/cifs_uniupr.h linux-2.6.29.5/fs/cifs/cifs_uniupr.h ---- linux-2.6.29.5/fs/cifs/cifs_uniupr.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/cifs/cifs_uniupr.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/cifs/cifs_uniupr.h linux-2.6.29.6/fs/cifs/cifs_uniupr.h +--- linux-2.6.29.6/fs/cifs/cifs_uniupr.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/cifs/cifs_uniupr.h 2009-07-09 22:13:39.000000000 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -20054,9 +20071,9 @@ diff -urNp linux-2.6.29.5/fs/cifs/cifs_uniupr.h linux-2.6.29.5/fs/cifs/cifs_uniu }; #endif -diff -urNp linux-2.6.29.5/fs/cifs/link.c linux-2.6.29.5/fs/cifs/link.c ---- linux-2.6.29.5/fs/cifs/link.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/cifs/link.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/cifs/link.c linux-2.6.29.6/fs/cifs/link.c +--- linux-2.6.29.6/fs/cifs/link.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/cifs/link.c 2009-07-09 22:13:39.000000000 -0400 @@ -318,7 +318,7 @@ cifs_readlink(struct dentry *direntry, c void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -20066,9 +20083,9 @@ diff -urNp linux-2.6.29.5/fs/cifs/link.c linux-2.6.29.5/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.29.5/fs/compat.c linux-2.6.29.5/fs/compat.c ---- linux-2.6.29.5/fs/compat.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/compat.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c +--- linux-2.6.29.6/fs/compat.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/compat.c 2009-07-09 22:13:39.000000000 -0400 @@ -1338,14 +1338,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -20168,9 +20185,9 @@ diff -urNp linux-2.6.29.5/fs/compat.c linux-2.6.29.5/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.29.5/fs/compat_ioctl.c linux-2.6.29.5/fs/compat_ioctl.c ---- linux-2.6.29.5/fs/compat_ioctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/compat_ioctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/compat_ioctl.c linux-2.6.29.6/fs/compat_ioctl.c +--- linux-2.6.29.6/fs/compat_ioctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/compat_ioctl.c 2009-07-09 22:13:39.000000000 -0400 @@ -1832,15 +1832,15 @@ struct ioctl_trans { }; @@ -20190,9 +20207,9 @@ diff -urNp linux-2.6.29.5/fs/compat_ioctl.c linux-2.6.29.5/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.29.5/fs/debugfs/inode.c linux-2.6.29.5/fs/debugfs/inode.c ---- linux-2.6.29.5/fs/debugfs/inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/debugfs/inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/debugfs/inode.c linux-2.6.29.6/fs/debugfs/inode.c +--- linux-2.6.29.6/fs/debugfs/inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/debugfs/inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -117,7 +117,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -20202,9 +20219,9 @@ diff -urNp linux-2.6.29.5/fs/debugfs/inode.c linux-2.6.29.5/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.29.5/fs/exec.c linux-2.6.29.5/fs/exec.c ---- linux-2.6.29.5/fs/exec.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/exec.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c +--- linux-2.6.29.6/fs/exec.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/exec.c 2009-07-09 22:13:39.000000000 -0400 @@ -52,12 +52,24 @@ #include <linux/tracehook.h> #include <linux/kmod.h> @@ -20620,9 +20637,9 @@ diff -urNp linux-2.6.29.5/fs/exec.c linux-2.6.29.5/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.29.5/fs/ext2/balloc.c linux-2.6.29.5/fs/ext2/balloc.c ---- linux-2.6.29.5/fs/ext2/balloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ext2/balloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext2/balloc.c linux-2.6.29.6/fs/ext2/balloc.c +--- linux-2.6.29.6/fs/ext2/balloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext2/balloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -20632,9 +20649,9 @@ diff -urNp linux-2.6.29.5/fs/ext2/balloc.c linux-2.6.29.5/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.29.5/fs/ext3/balloc.c linux-2.6.29.5/fs/ext3/balloc.c ---- linux-2.6.29.5/fs/ext3/balloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ext3/balloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext3/balloc.c linux-2.6.29.6/fs/ext3/balloc.c +--- linux-2.6.29.6/fs/ext3/balloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext3/balloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -20644,9 +20661,9 @@ diff -urNp linux-2.6.29.5/fs/ext3/balloc.c linux-2.6.29.5/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.29.5/fs/ext3/namei.c linux-2.6.29.5/fs/ext3/namei.c ---- linux-2.6.29.5/fs/ext3/namei.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ext3/namei.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext3/namei.c linux-2.6.29.6/fs/ext3/namei.c +--- linux-2.6.29.6/fs/ext3/namei.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext3/namei.c 2009-07-09 22:13:39.000000000 -0400 @@ -1159,7 +1159,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -20656,9 +20673,9 @@ diff -urNp linux-2.6.29.5/fs/ext3/namei.c linux-2.6.29.5/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.29.5/fs/ext3/xattr.c linux-2.6.29.5/fs/ext3/xattr.c ---- linux-2.6.29.5/fs/ext3/xattr.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ext3/xattr.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext3/xattr.c linux-2.6.29.6/fs/ext3/xattr.c +--- linux-2.6.29.6/fs/ext3/xattr.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext3/xattr.c 2009-07-09 22:13:39.000000000 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -20670,9 +20687,9 @@ diff -urNp linux-2.6.29.5/fs/ext3/xattr.c linux-2.6.29.5/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.29.5/fs/ext4/balloc.c linux-2.6.29.5/fs/ext4/balloc.c ---- linux-2.6.29.5/fs/ext4/balloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ext4/balloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext4/balloc.c linux-2.6.29.6/fs/ext4/balloc.c +--- linux-2.6.29.6/fs/ext4/balloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext4/balloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -577,7 +577,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -20682,9 +20699,9 @@ diff -urNp linux-2.6.29.5/fs/ext4/balloc.c linux-2.6.29.5/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.29.5/fs/ext4/namei.c linux-2.6.29.5/fs/ext4/namei.c ---- linux-2.6.29.5/fs/ext4/namei.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/fs/ext4/namei.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ext4/namei.c linux-2.6.29.6/fs/ext4/namei.c +--- linux-2.6.29.6/fs/ext4/namei.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ext4/namei.c 2009-07-09 22:13:39.000000000 -0400 @@ -1177,7 +1177,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -20694,9 +20711,9 @@ diff -urNp linux-2.6.29.5/fs/ext4/namei.c linux-2.6.29.5/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.29.5/fs/fcntl.c linux-2.6.29.5/fs/fcntl.c ---- linux-2.6.29.5/fs/fcntl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/fcntl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/fcntl.c linux-2.6.29.6/fs/fcntl.c +--- linux-2.6.29.6/fs/fcntl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/fcntl.c 2009-07-09 22:13:39.000000000 -0400 @@ -269,6 +269,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: @@ -20715,9 +20732,9 @@ diff -urNp linux-2.6.29.5/fs/fcntl.c linux-2.6.29.5/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.29.5/fs/file.c linux-2.6.29.5/fs/file.c ---- linux-2.6.29.5/fs/file.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/file.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/file.c linux-2.6.29.6/fs/file.c +--- linux-2.6.29.6/fs/file.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/file.c 2009-07-09 22:13:39.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -20735,9 +20752,9 @@ diff -urNp linux-2.6.29.5/fs/file.c linux-2.6.29.5/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.29.5/fs/fs_struct.c linux-2.6.29.5/fs/fs_struct.c ---- linux-2.6.29.5/fs/fs_struct.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/fs_struct.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c +--- linux-2.6.29.6/fs/fs_struct.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/fs_struct.c 2009-07-09 22:13:39.000000000 -0400 @@ -88,7 +88,7 @@ void exit_fs(struct task_struct *tsk) task_lock(tsk); write_lock(&fs->lock); @@ -20789,9 +20806,9 @@ diff -urNp linux-2.6.29.5/fs/fs_struct.c linux-2.6.29.5/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-2.6.29.5/fs/fuse/control.c linux-2.6.29.5/fs/fuse/control.c ---- linux-2.6.29.5/fs/fuse/control.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/fuse/control.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/fuse/control.c linux-2.6.29.6/fs/fuse/control.c +--- linux-2.6.29.6/fs/fuse/control.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/fuse/control.c 2009-07-09 22:13:39.000000000 -0400 @@ -161,7 +161,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -20801,9 +20818,9 @@ diff -urNp linux-2.6.29.5/fs/fuse/control.c linux-2.6.29.5/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.29.5/fs/fuse/dir.c linux-2.6.29.5/fs/fuse/dir.c ---- linux-2.6.29.5/fs/fuse/dir.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/fuse/dir.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/fuse/dir.c linux-2.6.29.6/fs/fuse/dir.c +--- linux-2.6.29.6/fs/fuse/dir.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/fuse/dir.c 2009-07-09 22:13:39.000000000 -0400 @@ -1081,7 +1081,7 @@ static char *read_link(struct dentry *de return link; } @@ -20813,9 +20830,9 @@ diff -urNp linux-2.6.29.5/fs/fuse/dir.c linux-2.6.29.5/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.29.5/fs/hfs/inode.c linux-2.6.29.5/fs/hfs/inode.c ---- linux-2.6.29.5/fs/hfs/inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/hfs/inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/hfs/inode.c linux-2.6.29.6/fs/hfs/inode.c +--- linux-2.6.29.6/fs/hfs/inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/hfs/inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -419,7 +419,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -20834,9 +20851,9 @@ diff -urNp linux-2.6.29.5/fs/hfs/inode.c linux-2.6.29.5/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.29.5/fs/hfsplus/inode.c linux-2.6.29.5/fs/hfsplus/inode.c ---- linux-2.6.29.5/fs/hfsplus/inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/hfsplus/inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/hfsplus/inode.c linux-2.6.29.6/fs/hfsplus/inode.c +--- linux-2.6.29.6/fs/hfsplus/inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/hfsplus/inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -20873,9 +20890,9 @@ diff -urNp linux-2.6.29.5/fs/hfsplus/inode.c linux-2.6.29.5/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.29.5/fs/jffs2/debug.h linux-2.6.29.5/fs/jffs2/debug.h ---- linux-2.6.29.5/fs/jffs2/debug.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/jffs2/debug.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/jffs2/debug.h linux-2.6.29.6/fs/jffs2/debug.h +--- linux-2.6.29.6/fs/jffs2/debug.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/jffs2/debug.h 2009-07-09 22:13:39.000000000 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -20977,9 +20994,9 @@ diff -urNp linux-2.6.29.5/fs/jffs2/debug.h linux-2.6.29.5/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.29.5/fs/jffs2/erase.c linux-2.6.29.5/fs/jffs2/erase.c ---- linux-2.6.29.5/fs/jffs2/erase.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/jffs2/erase.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/jffs2/erase.c linux-2.6.29.6/fs/jffs2/erase.c +--- linux-2.6.29.6/fs/jffs2/erase.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/jffs2/erase.c 2009-07-09 22:13:39.000000000 -0400 @@ -432,7 +432,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -20990,9 +21007,9 @@ diff -urNp linux-2.6.29.5/fs/jffs2/erase.c linux-2.6.29.5/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.29.5/fs/jffs2/summary.h linux-2.6.29.5/fs/jffs2/summary.h ---- linux-2.6.29.5/fs/jffs2/summary.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/jffs2/summary.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/jffs2/summary.h linux-2.6.29.6/fs/jffs2/summary.h +--- linux-2.6.29.6/fs/jffs2/summary.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/jffs2/summary.h 2009-07-09 22:13:39.000000000 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -21021,9 +21038,9 @@ diff -urNp linux-2.6.29.5/fs/jffs2/summary.h linux-2.6.29.5/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.29.5/fs/jffs2/wbuf.c linux-2.6.29.5/fs/jffs2/wbuf.c ---- linux-2.6.29.5/fs/jffs2/wbuf.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/jffs2/wbuf.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/jffs2/wbuf.c linux-2.6.29.6/fs/jffs2/wbuf.c +--- linux-2.6.29.6/fs/jffs2/wbuf.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/jffs2/wbuf.c 2009-07-09 22:13:39.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -21034,9 +21051,9 @@ diff -urNp linux-2.6.29.5/fs/jffs2/wbuf.c linux-2.6.29.5/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.29.5/fs/locks.c linux-2.6.29.5/fs/locks.c ---- linux-2.6.29.5/fs/locks.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/locks.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/locks.c linux-2.6.29.6/fs/locks.c +--- linux-2.6.29.6/fs/locks.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/locks.c 2009-07-09 22:13:39.000000000 -0400 @@ -2006,16 +2006,16 @@ void locks_remove_flock(struct file *fil return; @@ -21058,9 +21075,9 @@ diff -urNp linux-2.6.29.5/fs/locks.c linux-2.6.29.5/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.29.5/fs/namei.c linux-2.6.29.5/fs/namei.c ---- linux-2.6.29.5/fs/namei.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/namei.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c +--- linux-2.6.29.6/fs/namei.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/namei.c 2009-07-09 22:13:39.000000000 -0400 @@ -622,7 +622,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -21378,9 +21395,9 @@ diff -urNp linux-2.6.29.5/fs/namei.c linux-2.6.29.5/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.29.5/fs/namespace.c linux-2.6.29.5/fs/namespace.c ---- linux-2.6.29.5/fs/namespace.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/namespace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c +--- linux-2.6.29.6/fs/namespace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/namespace.c 2009-07-09 22:13:39.000000000 -0400 @@ -1096,6 +1096,8 @@ static int do_umount(struct vfsmount *mn lock_kernel(); retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -21432,9 +21449,9 @@ diff -urNp linux-2.6.29.5/fs/namespace.c linux-2.6.29.5/fs/namespace.c lock_kernel(); retval = do_mount((char *)dev_page, dir_page, (char *)type_page, flags, (void *)data_page); -diff -urNp linux-2.6.29.5/fs/nfs/nfs4proc.c linux-2.6.29.5/fs/nfs/nfs4proc.c ---- linux-2.6.29.5/fs/nfs/nfs4proc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/nfs/nfs4proc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c +--- linux-2.6.29.6/fs/nfs/nfs4proc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/nfs/nfs4proc.c 2009-07-09 22:13:39.000000000 -0400 @@ -763,7 +763,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -21705,9 +21722,9 @@ diff -urNp linux-2.6.29.5/fs/nfs/nfs4proc.c linux-2.6.29.5/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.29.5/fs/nfsd/export.c linux-2.6.29.5/fs/nfsd/export.c ---- linux-2.6.29.5/fs/nfsd/export.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/nfsd/export.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/nfsd/export.c linux-2.6.29.6/fs/nfsd/export.c +--- linux-2.6.29.6/fs/nfsd/export.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/nfsd/export.c 2009-07-09 22:13:39.000000000 -0400 @@ -472,7 +472,7 @@ static int secinfo_parse(char **mesg, ch * probably discover the problem when someone fails to * authenticate. @@ -21717,9 +21734,9 @@ diff -urNp linux-2.6.29.5/fs/nfsd/export.c linux-2.6.29.5/fs/nfsd/export.c return -EINVAL; err = get_int(mesg, &f->flags); if (err) -diff -urNp linux-2.6.29.5/fs/nls/nls_base.c linux-2.6.29.5/fs/nls/nls_base.c ---- linux-2.6.29.5/fs/nls/nls_base.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/nls/nls_base.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/nls/nls_base.c linux-2.6.29.6/fs/nls/nls_base.c +--- linux-2.6.29.6/fs/nls/nls_base.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/nls/nls_base.c 2009-07-09 22:13:39.000000000 -0400 @@ -40,7 +40,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -21729,9 +21746,9 @@ diff -urNp linux-2.6.29.5/fs/nls/nls_base.c linux-2.6.29.5/fs/nls/nls_base.c }; int -diff -urNp linux-2.6.29.5/fs/ntfs/file.c linux-2.6.29.5/fs/ntfs/file.c ---- linux-2.6.29.5/fs/ntfs/file.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ntfs/file.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ntfs/file.c linux-2.6.29.6/fs/ntfs/file.c +--- linux-2.6.29.6/fs/ntfs/file.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ntfs/file.c 2009-07-09 22:13:39.000000000 -0400 @@ -2291,6 +2291,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -21741,9 +21758,9 @@ diff -urNp linux-2.6.29.5/fs/ntfs/file.c linux-2.6.29.5/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops; -diff -urNp linux-2.6.29.5/fs/ocfs2/localalloc.c linux-2.6.29.5/fs/ocfs2/localalloc.c ---- linux-2.6.29.5/fs/ocfs2/localalloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ocfs2/localalloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ocfs2/localalloc.c linux-2.6.29.6/fs/ocfs2/localalloc.c +--- linux-2.6.29.6/fs/ocfs2/localalloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ocfs2/localalloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -1272,7 +1272,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -21753,9 +21770,9 @@ diff -urNp linux-2.6.29.5/fs/ocfs2/localalloc.c linux-2.6.29.5/fs/ocfs2/localall status = 0; bail: -diff -urNp linux-2.6.29.5/fs/ocfs2/ocfs2.h linux-2.6.29.5/fs/ocfs2/ocfs2.h ---- linux-2.6.29.5/fs/ocfs2/ocfs2.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ocfs2/ocfs2.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ocfs2/ocfs2.h linux-2.6.29.6/fs/ocfs2/ocfs2.h +--- linux-2.6.29.6/fs/ocfs2/ocfs2.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ocfs2/ocfs2.h 2009-07-09 22:13:39.000000000 -0400 @@ -168,11 +168,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -21773,9 +21790,9 @@ diff -urNp linux-2.6.29.5/fs/ocfs2/ocfs2.h linux-2.6.29.5/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.29.5/fs/ocfs2/suballoc.c linux-2.6.29.5/fs/ocfs2/suballoc.c ---- linux-2.6.29.5/fs/ocfs2/suballoc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ocfs2/suballoc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c +--- linux-2.6.29.6/fs/ocfs2/suballoc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ocfs2/suballoc.c 2009-07-09 22:13:39.000000000 -0400 @@ -602,7 +602,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -21821,9 +21838,9 @@ diff -urNp linux-2.6.29.5/fs/ocfs2/suballoc.c linux-2.6.29.5/fs/ocfs2/suballoc.c } } if (status < 0) { -diff -urNp linux-2.6.29.5/fs/open.c linux-2.6.29.5/fs/open.c ---- linux-2.6.29.5/fs/open.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/open.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c +--- linux-2.6.29.6/fs/open.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/open.c 2009-07-09 22:13:39.000000000 -0400 @@ -205,6 +205,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -21997,9 +22014,9 @@ diff -urNp linux-2.6.29.5/fs/open.c linux-2.6.29.5/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.29.5/fs/pipe.c linux-2.6.29.5/fs/pipe.c ---- linux-2.6.29.5/fs/pipe.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/pipe.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/pipe.c linux-2.6.29.6/fs/pipe.c +--- linux-2.6.29.6/fs/pipe.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/pipe.c 2009-07-09 22:13:39.000000000 -0400 @@ -848,7 +848,7 @@ void free_pipe_info(struct inode *inode) inode->i_pipe = NULL; } @@ -22009,9 +22026,9 @@ diff -urNp linux-2.6.29.5/fs/pipe.c linux-2.6.29.5/fs/pipe.c static int pipefs_delete_dentry(struct dentry *dentry) { /* -diff -urNp linux-2.6.29.5/fs/proc/array.c linux-2.6.29.5/fs/proc/array.c ---- linux-2.6.29.5/fs/proc/array.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/array.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/array.c linux-2.6.29.6/fs/proc/array.c +--- linux-2.6.29.6/fs/proc/array.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/array.c 2009-07-09 22:13:39.000000000 -0400 @@ -321,6 +321,21 @@ static inline void task_context_switch_c p->nivcsw); } @@ -22102,9 +22119,9 @@ diff -urNp linux-2.6.29.5/fs/proc/array.c linux-2.6.29.5/fs/proc/array.c + return sprintf(buffer, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip)); +} +#endif -diff -urNp linux-2.6.29.5/fs/proc/base.c linux-2.6.29.5/fs/proc/base.c ---- linux-2.6.29.5/fs/proc/base.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/base.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c +--- linux-2.6.29.6/fs/proc/base.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/base.c 2009-07-09 22:13:39.000000000 -0400 @@ -212,6 +212,9 @@ static int check_mem_permission(struct t if (task == current) return 0; @@ -22429,9 +22446,9 @@ diff -urNp linux-2.6.29.5/fs/proc/base.c linux-2.6.29.5/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.29.5/fs/proc/cmdline.c linux-2.6.29.5/fs/proc/cmdline.c ---- linux-2.6.29.5/fs/proc/cmdline.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/cmdline.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/cmdline.c linux-2.6.29.6/fs/proc/cmdline.c +--- linux-2.6.29.6/fs/proc/cmdline.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/cmdline.c 2009-07-09 22:13:39.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -22444,9 +22461,9 @@ diff -urNp linux-2.6.29.5/fs/proc/cmdline.c linux-2.6.29.5/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.29.5/fs/proc/devices.c linux-2.6.29.5/fs/proc/devices.c ---- linux-2.6.29.5/fs/proc/devices.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/devices.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/devices.c linux-2.6.29.6/fs/proc/devices.c +--- linux-2.6.29.6/fs/proc/devices.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/devices.c 2009-07-09 22:13:39.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -22459,9 +22476,9 @@ diff -urNp linux-2.6.29.5/fs/proc/devices.c linux-2.6.29.5/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.29.5/fs/proc/inode.c linux-2.6.29.5/fs/proc/inode.c ---- linux-2.6.29.5/fs/proc/inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/inode.c linux-2.6.29.6/fs/proc/inode.c +--- linux-2.6.29.6/fs/proc/inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -463,7 +463,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -22474,9 +22491,9 @@ diff -urNp linux-2.6.29.5/fs/proc/inode.c linux-2.6.29.5/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.29.5/fs/proc/internal.h linux-2.6.29.5/fs/proc/internal.h ---- linux-2.6.29.5/fs/proc/internal.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/internal.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/internal.h linux-2.6.29.6/fs/proc/internal.h +--- linux-2.6.29.6/fs/proc/internal.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/internal.h 2009-07-09 22:13:39.000000000 -0400 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -22487,9 +22504,9 @@ diff -urNp linux-2.6.29.5/fs/proc/internal.h linux-2.6.29.5/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.29.5/fs/proc/Kconfig linux-2.6.29.5/fs/proc/Kconfig ---- linux-2.6.29.5/fs/proc/Kconfig 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/Kconfig 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/Kconfig linux-2.6.29.6/fs/proc/Kconfig +--- linux-2.6.29.6/fs/proc/Kconfig 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/Kconfig 2009-07-09 22:13:39.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -22517,9 +22534,9 @@ diff -urNp linux-2.6.29.5/fs/proc/Kconfig linux-2.6.29.5/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.29.5/fs/proc/kcore.c linux-2.6.29.5/fs/proc/kcore.c ---- linux-2.6.29.5/fs/proc/kcore.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/kcore.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/kcore.c linux-2.6.29.6/fs/proc/kcore.c +--- linux-2.6.29.6/fs/proc/kcore.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/kcore.c 2009-07-09 22:13:39.000000000 -0400 @@ -404,10 +404,12 @@ read_kcore(struct file *file, char __use static int __init proc_kcore_init(void) @@ -22533,9 +22550,9 @@ diff -urNp linux-2.6.29.5/fs/proc/kcore.c linux-2.6.29.5/fs/proc/kcore.c return 0; } module_init(proc_kcore_init); -diff -urNp linux-2.6.29.5/fs/proc/nommu.c linux-2.6.29.5/fs/proc/nommu.c ---- linux-2.6.29.5/fs/proc/nommu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/nommu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/nommu.c linux-2.6.29.6/fs/proc/nommu.c +--- linux-2.6.29.6/fs/proc/nommu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/nommu.c 2009-07-09 22:13:39.000000000 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -22545,9 +22562,9 @@ diff -urNp linux-2.6.29.5/fs/proc/nommu.c linux-2.6.29.5/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.29.5/fs/proc/proc_net.c linux-2.6.29.5/fs/proc/proc_net.c ---- linux-2.6.29.5/fs/proc/proc_net.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/proc_net.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/proc_net.c linux-2.6.29.6/fs/proc/proc_net.c +--- linux-2.6.29.6/fs/proc/proc_net.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/proc_net.c 2009-07-09 22:13:39.000000000 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -22566,9 +22583,9 @@ diff -urNp linux-2.6.29.5/fs/proc/proc_net.c linux-2.6.29.5/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.29.5/fs/proc/proc_sysctl.c linux-2.6.29.5/fs/proc/proc_sysctl.c ---- linux-2.6.29.5/fs/proc/proc_sysctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/proc_sysctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/proc_sysctl.c linux-2.6.29.6/fs/proc/proc_sysctl.c +--- linux-2.6.29.6/fs/proc/proc_sysctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/proc_sysctl.c 2009-07-09 22:13:39.000000000 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -22608,10 +22625,22 @@ diff -urNp linux-2.6.29.5/fs/proc/proc_sysctl.c linux-2.6.29.5/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.29.5/fs/proc/root.c linux-2.6.29.5/fs/proc/root.c ---- linux-2.6.29.5/fs/proc/root.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/root.c 2009-06-12 23:57:32.000000000 -0400 -@@ -134,7 +134,15 @@ void __init proc_root_init(void) +diff -urNp linux-2.6.29.6/fs/proc/root.c linux-2.6.29.6/fs/proc/root.c +--- linux-2.6.29.6/fs/proc/root.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/root.c 2009-07-09 23:42:59.000000000 -0400 +@@ -101,6 +101,11 @@ static struct file_system_type proc_fs_t + .kill_sb = proc_kill_sb, + }; + ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++static const struct file_operations __kallsyms_operations = { ++}; ++#endif ++ + void __init proc_root_init(void) + { + int err; +@@ -134,8 +139,21 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); #endif @@ -22625,11 +22654,17 @@ diff -urNp linux-2.6.29.5/fs/proc/root.c linux-2.6.29.5/fs/proc/root.c proc_mkdir("bus", NULL); +#endif proc_sys_init(); ++ ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++ /* fake kallsyms to workaround klogd bug */ ++ proc_create("kallsyms", 0444, NULL, &__kallsyms_operations); ++#endif } -diff -urNp linux-2.6.29.5/fs/proc/task_mmu.c linux-2.6.29.5/fs/proc/task_mmu.c ---- linux-2.6.29.5/fs/proc/task_mmu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/task_mmu.c 2009-06-12 23:57:32.000000000 -0400 + static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat +diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c +--- linux-2.6.29.6/fs/proc/task_mmu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/task_mmu.c 2009-07-09 22:13:39.000000000 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -22750,9 +22785,9 @@ diff -urNp linux-2.6.29.5/fs/proc/task_mmu.c linux-2.6.29.5/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.29.5/fs/proc/task_nommu.c linux-2.6.29.5/fs/proc/task_nommu.c ---- linux-2.6.29.5/fs/proc/task_nommu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/proc/task_nommu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/proc/task_nommu.c linux-2.6.29.6/fs/proc/task_nommu.c +--- linux-2.6.29.6/fs/proc/task_nommu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/proc/task_nommu.c 2009-07-09 22:13:39.000000000 -0400 @@ -49,7 +49,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -22771,9 +22806,9 @@ diff -urNp linux-2.6.29.5/fs/proc/task_nommu.c linux-2.6.29.5/fs/proc/task_nommu } seq_putc(m, '\n'); -diff -urNp linux-2.6.29.5/fs/readdir.c linux-2.6.29.5/fs/readdir.c ---- linux-2.6.29.5/fs/readdir.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/readdir.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/readdir.c linux-2.6.29.6/fs/readdir.c +--- linux-2.6.29.6/fs/readdir.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/readdir.c 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -22863,9 +22898,9 @@ diff -urNp linux-2.6.29.5/fs/readdir.c linux-2.6.29.5/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.29.5/fs/reiserfs/do_balan.c linux-2.6.29.5/fs/reiserfs/do_balan.c ---- linux-2.6.29.5/fs/reiserfs/do_balan.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/reiserfs/do_balan.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/reiserfs/do_balan.c linux-2.6.29.6/fs/reiserfs/do_balan.c +--- linux-2.6.29.6/fs/reiserfs/do_balan.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/reiserfs/do_balan.c 2009-07-09 22:13:39.000000000 -0400 @@ -2114,7 +2114,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -22875,9 +22910,9 @@ diff -urNp linux-2.6.29.5/fs/reiserfs/do_balan.c linux-2.6.29.5/fs/reiserfs/do_b do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.29.5/fs/select.c linux-2.6.29.5/fs/select.c ---- linux-2.6.29.5/fs/select.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/select.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/select.c linux-2.6.29.6/fs/select.c +--- linux-2.6.29.6/fs/select.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/select.c 2009-07-09 22:13:39.000000000 -0400 @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -22894,9 +22929,9 @@ diff -urNp linux-2.6.29.5/fs/select.c linux-2.6.29.5/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.29.5/fs/seq_file.c linux-2.6.29.5/fs/seq_file.c ---- linux-2.6.29.5/fs/seq_file.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/seq_file.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/seq_file.c linux-2.6.29.6/fs/seq_file.c +--- linux-2.6.29.6/fs/seq_file.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/seq_file.c 2009-07-09 22:13:39.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -22937,9 +22972,9 @@ diff -urNp linux-2.6.29.5/fs/seq_file.c linux-2.6.29.5/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.29.5/fs/smbfs/symlink.c linux-2.6.29.5/fs/smbfs/symlink.c ---- linux-2.6.29.5/fs/smbfs/symlink.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/smbfs/symlink.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/smbfs/symlink.c linux-2.6.29.6/fs/smbfs/symlink.c +--- linux-2.6.29.6/fs/smbfs/symlink.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/smbfs/symlink.c 2009-07-09 22:13:39.000000000 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -22949,9 +22984,9 @@ diff -urNp linux-2.6.29.5/fs/smbfs/symlink.c linux-2.6.29.5/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.29.5/fs/sysfs/symlink.c linux-2.6.29.5/fs/sysfs/symlink.c ---- linux-2.6.29.5/fs/sysfs/symlink.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/sysfs/symlink.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/sysfs/symlink.c linux-2.6.29.6/fs/sysfs/symlink.c +--- linux-2.6.29.6/fs/sysfs/symlink.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/sysfs/symlink.c 2009-07-09 22:13:39.000000000 -0400 @@ -200,7 +200,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -22961,9 +22996,9 @@ diff -urNp linux-2.6.29.5/fs/sysfs/symlink.c linux-2.6.29.5/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.29.5/fs/udf/balloc.c linux-2.6.29.5/fs/udf/balloc.c ---- linux-2.6.29.5/fs/udf/balloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/udf/balloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c +--- linux-2.6.29.6/fs/udf/balloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/udf/balloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -169,9 +169,7 @@ static void udf_bitmap_free_blocks(struc unsigned long overflow; @@ -23023,9 +23058,9 @@ diff -urNp linux-2.6.29.5/fs/udf/balloc.c linux-2.6.29.5/fs/udf/balloc.c goal = 0; /* We search for the closest matching block to goal. If we find -diff -urNp linux-2.6.29.5/fs/ufs/inode.c linux-2.6.29.5/fs/ufs/inode.c ---- linux-2.6.29.5/fs/ufs/inode.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/ufs/inode.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/ufs/inode.c linux-2.6.29.6/fs/ufs/inode.c +--- linux-2.6.29.6/fs/ufs/inode.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/ufs/inode.c 2009-07-09 22:13:39.000000000 -0400 @@ -56,9 +56,7 @@ static int ufs_block_to_path(struct inod @@ -23057,9 +23092,9 @@ diff -urNp linux-2.6.29.5/fs/ufs/inode.c linux-2.6.29.5/fs/ufs/inode.c abort_too_big: ufs_warning(sb, "ufs_get_block", "block > big"); goto abort; -diff -urNp linux-2.6.29.5/fs/utimes.c linux-2.6.29.5/fs/utimes.c ---- linux-2.6.29.5/fs/utimes.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/utimes.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/utimes.c linux-2.6.29.6/fs/utimes.c +--- linux-2.6.29.6/fs/utimes.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/utimes.c 2009-07-09 22:13:39.000000000 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -23081,9 +23116,9 @@ diff -urNp linux-2.6.29.5/fs/utimes.c linux-2.6.29.5/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.29.5/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.5/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.29.5/fs/xfs/linux-2.6/xfs_iops.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/xfs/linux-2.6/xfs_iops.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c 2009-07-09 22:13:39.000000000 -0400 @@ -494,7 +494,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -23093,9 +23128,9 @@ diff -urNp linux-2.6.29.5/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.5/fs/xfs/linu if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.29.5/fs/xfs/xfs_bmap.c linux-2.6.29.5/fs/xfs/xfs_bmap.c ---- linux-2.6.29.5/fs/xfs/xfs_bmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/fs/xfs/xfs_bmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/fs/xfs/xfs_bmap.c linux-2.6.29.6/fs/xfs/xfs_bmap.c +--- linux-2.6.29.6/fs/xfs/xfs_bmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/fs/xfs/xfs_bmap.c 2009-07-09 22:13:39.000000000 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -23105,9 +23140,9 @@ diff -urNp linux-2.6.29.5/fs/xfs/xfs_bmap.c linux-2.6.29.5/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.29.5/grsecurity/gracl_alloc.c linux-2.6.29.5/grsecurity/gracl_alloc.c ---- linux-2.6.29.5/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_alloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_alloc.c linux-2.6.29.6/grsecurity/gracl_alloc.c +--- linux-2.6.29.6/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_alloc.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -23214,10 +23249,10 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_alloc.c linux-2.6.29.5/grsecurity/gra + else + return 1; +} -diff -urNp linux-2.6.29.5/grsecurity/gracl.c linux-2.6.29.5/grsecurity/gracl.c ---- linux-2.6.29.5/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl.c 2009-06-12 23:57:32.000000000 -0400 -@@ -0,0 +1,3811 @@ +diff -urNp linux-2.6.29.6/grsecurity/gracl.c linux-2.6.29.6/grsecurity/gracl.c +--- linux-2.6.29.6/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl.c 2009-07-10 05:42:10.000000000 -0400 +@@ -0,0 +1,3855 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/sched.h> @@ -26952,6 +26987,50 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl.c linux-2.6.29.5/grsecurity/gracl.c + return; +} + ++#ifdef CONFIG_TASKSTATS ++int gr_is_taskstats_denied(int pid) ++{ ++ struct task_struct *task; ++ const struct cred *cred; ++ int ret = 0; ++ ++ /* restrict taskstats viewing to un-chrooted root users ++ who have the 'view' subject flag if the RBAC system is enabled ++ */ ++ ++ read_lock(&tasklist_lock); ++ task = find_task_by_vpid(pid); ++ if (task) { ++ task_lock(task); ++#ifdef CONFIG_GRKERNSEC_CHROOT ++ if (proc_is_chrooted(task)) ++ ret = -EACCES; ++#endif ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ cred = __task_cred(task); ++#ifdef CONFIG_GRKERNSEC_PROC_USER ++ if (cred->uid != 0) ++ ret = -EACCES; ++#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID)) ++ ret = -EACCES; ++#endif ++#endif ++ if (gr_status & GR_READY) { ++ if (!(task->acl->mode & GR_VIEW)) ++ ret = -EACCES; ++ } ++ ++ task_unlock(task); ++ } else ++ ret = -ENOENT; ++ ++ read_unlock(&tasklist_lock); ++ ++ return ret; ++} ++#endif ++ +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino) +{ + struct task_struct *task = current; @@ -27029,9 +27108,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl.c linux-2.6.29.5/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.29.5/grsecurity/gracl_cap.c linux-2.6.29.5/grsecurity/gracl_cap.c ---- linux-2.6.29.5/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_cap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_cap.c linux-2.6.29.6/grsecurity/gracl_cap.c +--- linux-2.6.29.6/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_cap.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -27164,9 +27243,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_cap.c linux-2.6.29.5/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.29.5/grsecurity/gracl_fs.c linux-2.6.29.5/grsecurity/gracl_fs.c ---- linux-2.6.29.5/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_fs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_fs.c linux-2.6.29.6/grsecurity/gracl_fs.c +--- linux-2.6.29.6/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_fs.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,423 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -27591,9 +27670,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_fs.c linux-2.6.29.5/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.29.5/grsecurity/gracl_ip.c linux-2.6.29.5/grsecurity/gracl_ip.c ---- linux-2.6.29.5/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_ip.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_ip.c linux-2.6.29.6/grsecurity/gracl_ip.c +--- linux-2.6.29.6/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_ip.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,340 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -27935,9 +28014,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_ip.c linux-2.6.29.5/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.29.5/grsecurity/gracl_learn.c linux-2.6.29.5/grsecurity/gracl_learn.c ---- linux-2.6.29.5/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_learn.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_learn.c linux-2.6.29.6/grsecurity/gracl_learn.c +--- linux-2.6.29.6/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_learn.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -28150,9 +28229,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_learn.c linux-2.6.29.5/grsecurity/gra + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.29.5/grsecurity/gracl_res.c linux-2.6.29.5/grsecurity/gracl_res.c ---- linux-2.6.29.5/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_res.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_res.c linux-2.6.29.6/grsecurity/gracl_res.c +--- linux-2.6.29.6/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_res.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,58 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -28212,9 +28291,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_res.c linux-2.6.29.5/grsecurity/gracl + + return; +} -diff -urNp linux-2.6.29.5/grsecurity/gracl_segv.c linux-2.6.29.5/grsecurity/gracl_segv.c ---- linux-2.6.29.5/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_segv.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_segv.c linux-2.6.29.6/grsecurity/gracl_segv.c +--- linux-2.6.29.6/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_segv.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,307 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -28523,9 +28602,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_segv.c linux-2.6.29.5/grsecurity/grac + + return; +} -diff -urNp linux-2.6.29.5/grsecurity/gracl_shm.c linux-2.6.29.5/grsecurity/gracl_shm.c ---- linux-2.6.29.5/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/gracl_shm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/gracl_shm.c linux-2.6.29.6/grsecurity/gracl_shm.c +--- linux-2.6.29.6/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/gracl_shm.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -28564,9 +28643,9 @@ diff -urNp linux-2.6.29.5/grsecurity/gracl_shm.c linux-2.6.29.5/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_chdir.c linux-2.6.29.5/grsecurity/grsec_chdir.c ---- linux-2.6.29.5/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_chdir.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_chdir.c linux-2.6.29.6/grsecurity/grsec_chdir.c +--- linux-2.6.29.6/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_chdir.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -28587,9 +28666,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_chdir.c linux-2.6.29.5/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_chroot.c linux-2.6.29.5/grsecurity/grsec_chroot.c ---- linux-2.6.29.5/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_chroot.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_chroot.c linux-2.6.29.6/grsecurity/grsec_chroot.c +--- linux-2.6.29.6/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_chroot.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,350 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -28941,10 +29020,10 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_chroot.c linux-2.6.29.5/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.29.5/grsecurity/grsec_disabled.c linux-2.6.29.5/grsecurity/grsec_disabled.c ---- linux-2.6.29.5/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_disabled.c 2009-06-12 23:57:32.000000000 -0400 -@@ -0,0 +1,419 @@ +diff -urNp linux-2.6.29.6/grsecurity/grsec_disabled.c linux-2.6.29.6/grsecurity/grsec_disabled.c +--- linux-2.6.29.6/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_disabled.c 2009-07-09 23:09:22.000000000 -0400 +@@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/sched.h> @@ -28973,6 +29052,13 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_disabled.c linux-2.6.29.5/grsecurity/ +} +#endif + ++#ifdef CONFIG_TASKSTATS ++int gr_is_taskstats_denied(int pid) ++{ ++ return 0; ++} ++#endif ++ +int +gr_acl_is_enabled(void) +{ @@ -29364,9 +29450,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_disabled.c linux-2.6.29.5/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.29.5/grsecurity/grsec_exec.c linux-2.6.29.5/grsecurity/grsec_exec.c ---- linux-2.6.29.5/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_exec.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_exec.c linux-2.6.29.6/grsecurity/grsec_exec.c +--- linux-2.6.29.6/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_exec.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29457,9 +29543,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_exec.c linux-2.6.29.5/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_fifo.c linux-2.6.29.5/grsecurity/grsec_fifo.c ---- linux-2.6.29.5/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_fifo.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_fifo.c linux-2.6.29.6/grsecurity/grsec_fifo.c +--- linux-2.6.29.6/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_fifo.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29485,9 +29571,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_fifo.c linux-2.6.29.5/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_fork.c linux-2.6.29.5/grsecurity/grsec_fork.c ---- linux-2.6.29.5/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_fork.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_fork.c linux-2.6.29.6/grsecurity/grsec_fork.c +--- linux-2.6.29.6/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_fork.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29504,9 +29590,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_fork.c linux-2.6.29.5/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_init.c linux-2.6.29.5/grsecurity/grsec_init.c ---- linux-2.6.29.5/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_init.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_init.c linux-2.6.29.6/grsecurity/grsec_init.c +--- linux-2.6.29.6/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_init.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,230 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29738,9 +29824,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_init.c linux-2.6.29.5/grsecurity/grse + + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_ipc.c linux-2.6.29.5/grsecurity/grsec_ipc.c ---- linux-2.6.29.5/grsecurity/grsec_ipc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_ipc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_ipc.c linux-2.6.29.6/grsecurity/grsec_ipc.c +--- linux-2.6.29.6/grsecurity/grsec_ipc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_ipc.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,81 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29823,9 +29909,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_ipc.c linux-2.6.29.5/grsecurity/grsec +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_link.c linux-2.6.29.5/grsecurity/grsec_link.c ---- linux-2.6.29.5/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_link.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_link.c linux-2.6.29.6/grsecurity/grsec_link.c +--- linux-2.6.29.6/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_link.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -29870,9 +29956,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_link.c linux-2.6.29.5/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_log.c linux-2.6.29.5/grsecurity/grsec_log.c ---- linux-2.6.29.5/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_log.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_log.c linux-2.6.29.6/grsecurity/grsec_log.c +--- linux-2.6.29.6/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_log.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,288 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -30162,9 +30248,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_log.c linux-2.6.29.5/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_mem.c linux-2.6.29.5/grsecurity/grsec_mem.c ---- linux-2.6.29.5/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_mem.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_mem.c linux-2.6.29.6/grsecurity/grsec_mem.c +--- linux-2.6.29.6/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_mem.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,71 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -30237,9 +30323,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_mem.c linux-2.6.29.5/grsecurity/grsec + + return 0; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_mount.c linux-2.6.29.5/grsecurity/grsec_mount.c ---- linux-2.6.29.5/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_mount.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_mount.c linux-2.6.29.6/grsecurity/grsec_mount.c +--- linux-2.6.29.6/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_mount.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,34 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -30275,9 +30361,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_mount.c linux-2.6.29.5/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_sig.c linux-2.6.29.5/grsecurity/grsec_sig.c ---- linux-2.6.29.5/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_sig.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_sig.c linux-2.6.29.6/grsecurity/grsec_sig.c +--- linux-2.6.29.6/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_sig.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,58 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -30337,9 +30423,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_sig.c linux-2.6.29.5/grsecurity/grsec + return; +} + -diff -urNp linux-2.6.29.5/grsecurity/grsec_sock.c linux-2.6.29.5/grsecurity/grsec_sock.c ---- linux-2.6.29.5/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_sock.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_sock.c linux-2.6.29.6/grsecurity/grsec_sock.c +--- linux-2.6.29.6/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_sock.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,269 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -30610,9 +30696,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_sock.c linux-2.6.29.5/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_sysctl.c linux-2.6.29.5/grsecurity/grsec_sysctl.c ---- linux-2.6.29.5/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_sysctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_sysctl.c linux-2.6.29.6/grsecurity/grsec_sysctl.c +--- linux-2.6.29.6/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_sysctl.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,435 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31049,9 +31135,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_sysctl.c linux-2.6.29.5/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_textrel.c linux-2.6.29.5/grsecurity/grsec_textrel.c ---- linux-2.6.29.5/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_textrel.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_textrel.c linux-2.6.29.6/grsecurity/grsec_textrel.c +--- linux-2.6.29.6/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_textrel.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31069,9 +31155,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_textrel.c linux-2.6.29.5/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_time.c linux-2.6.29.5/grsecurity/grsec_time.c ---- linux-2.6.29.5/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_time.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_time.c linux-2.6.29.6/grsecurity/grsec_time.c +--- linux-2.6.29.6/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_time.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31086,9 +31172,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_time.c linux-2.6.29.5/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.5/grsecurity/grsec_tpe.c linux-2.6.29.5/grsecurity/grsec_tpe.c ---- linux-2.6.29.5/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsec_tpe.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsec_tpe.c linux-2.6.29.6/grsecurity/grsec_tpe.c +--- linux-2.6.29.6/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsec_tpe.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31128,9 +31214,9 @@ diff -urNp linux-2.6.29.5/grsecurity/grsec_tpe.c linux-2.6.29.5/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.29.5/grsecurity/grsum.c linux-2.6.29.5/grsecurity/grsum.c ---- linux-2.6.29.5/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/grsum.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/grsum.c linux-2.6.29.6/grsecurity/grsum.c +--- linux-2.6.29.6/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/grsum.c 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -31191,10 +31277,10 @@ diff -urNp linux-2.6.29.5/grsecurity/grsum.c linux-2.6.29.5/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.29.5/grsecurity/Kconfig linux-2.6.29.5/grsecurity/Kconfig ---- linux-2.6.29.5/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/Kconfig 2009-06-12 23:57:32.000000000 -0400 -@@ -0,0 +1,894 @@ +diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig +--- linux-2.6.29.6/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/Kconfig 2009-07-10 07:22:18.000000000 -0400 +@@ -0,0 +1,896 @@ +# +# grecurity configuration +# @@ -31278,6 +31364,7 @@ diff -urNp linux-2.6.29.5/grsecurity/Kconfig linux-2.6.29.5/grsecurity/Kconfig + select PAX_RANDMMAP + select PAX_REFCOUNT if (X86) + select PAX_USERCOPY if (X86_32 && (SLAB || SLUB)) ++ select PAX_SECURE_VSYSCALL if (X86_64) + + help + If you say Y here, several features in addition to those included @@ -31360,6 +31447,7 @@ diff -urNp linux-2.6.29.5/grsecurity/Kconfig linux-2.6.29.5/grsecurity/Kconfig + select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC) + select PAX_REFCOUNT if (X86) + select PAX_USERCOPY if (X86_32 && (SLAB || SLUB)) ++ select PAX_SECURE_VSYSCALL if (X86_64) + help + If you say Y here, many of the features of grsecurity will be + enabled, which will protect you against many kinds of attacks @@ -32089,9 +32177,9 @@ diff -urNp linux-2.6.29.5/grsecurity/Kconfig linux-2.6.29.5/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.29.5/grsecurity/Makefile linux-2.6.29.5/grsecurity/Makefile ---- linux-2.6.29.5/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/grsecurity/Makefile 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/grsecurity/Makefile linux-2.6.29.6/grsecurity/Makefile +--- linux-2.6.29.6/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/grsecurity/Makefile 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,21 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2005 it has been completely redesigned by Brad Spengler @@ -32114,9 +32202,9 @@ diff -urNp linux-2.6.29.5/grsecurity/Makefile linux-2.6.29.5/grsecurity/Makefile +obj-y += grsec_disabled.o +endif + -diff -urNp linux-2.6.29.5/include/asm-frv/atomic.h linux-2.6.29.5/include/asm-frv/atomic.h ---- linux-2.6.29.5/include/asm-frv/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-frv/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-frv/atomic.h linux-2.6.29.6/include/asm-frv/atomic.h +--- linux-2.6.29.6/include/asm-frv/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-frv/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -114,6 +114,10 @@ static inline void atomic_dec(atomic_t * atomic_sub_return(1, v); } @@ -32128,9 +32216,9 @@ diff -urNp linux-2.6.29.5/include/asm-frv/atomic.h linux-2.6.29.5/include/asm-fr #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.29.5/include/asm-frv/kmap_types.h linux-2.6.29.5/include/asm-frv/kmap_types.h ---- linux-2.6.29.5/include/asm-frv/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-frv/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-frv/kmap_types.h linux-2.6.29.6/include/asm-frv/kmap_types.h +--- linux-2.6.29.6/include/asm-frv/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-frv/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -32139,9 +32227,9 @@ diff -urNp linux-2.6.29.5/include/asm-frv/kmap_types.h linux-2.6.29.5/include/as KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/include/asm-generic/futex.h linux-2.6.29.5/include/asm-generic/futex.h ---- linux-2.6.29.5/include/asm-generic/futex.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-generic/futex.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-generic/futex.h linux-2.6.29.6/include/asm-generic/futex.h +--- linux-2.6.29.6/include/asm-generic/futex.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-generic/futex.h 2009-07-09 22:13:39.000000000 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -32160,9 +32248,9 @@ diff -urNp linux-2.6.29.5/include/asm-generic/futex.h linux-2.6.29.5/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.29.5/include/asm-generic/int-l64.h linux-2.6.29.5/include/asm-generic/int-l64.h ---- linux-2.6.29.5/include/asm-generic/int-l64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-generic/int-l64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-generic/int-l64.h linux-2.6.29.6/include/asm-generic/int-l64.h +--- linux-2.6.29.6/include/asm-generic/int-l64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-generic/int-l64.h 2009-07-09 22:13:39.000000000 -0400 @@ -44,6 +44,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -32172,9 +32260,9 @@ diff -urNp linux-2.6.29.5/include/asm-generic/int-l64.h linux-2.6.29.5/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.29.5/include/asm-generic/int-ll64.h linux-2.6.29.5/include/asm-generic/int-ll64.h ---- linux-2.6.29.5/include/asm-generic/int-ll64.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-generic/int-ll64.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-generic/int-ll64.h linux-2.6.29.6/include/asm-generic/int-ll64.h +--- linux-2.6.29.6/include/asm-generic/int-ll64.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-generic/int-ll64.h 2009-07-09 22:13:39.000000000 -0400 @@ -49,6 +49,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -32184,9 +32272,9 @@ diff -urNp linux-2.6.29.5/include/asm-generic/int-ll64.h linux-2.6.29.5/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.29.5/include/asm-generic/vmlinux.lds.h linux-2.6.29.5/include/asm-generic/vmlinux.lds.h ---- linux-2.6.29.5/include/asm-generic/vmlinux.lds.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-generic/vmlinux.lds.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-generic/vmlinux.lds.h linux-2.6.29.6/include/asm-generic/vmlinux.lds.h +--- linux-2.6.29.6/include/asm-generic/vmlinux.lds.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-generic/vmlinux.lds.h 2009-07-09 22:13:39.000000000 -0400 @@ -88,6 +88,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -32195,9 +32283,9 @@ diff -urNp linux-2.6.29.5/include/asm-generic/vmlinux.lds.h linux-2.6.29.5/inclu *(__vermagic) /* Kernel version magic */ \ *(__markers_strings) /* Markers: strings */ \ *(__tracepoints_strings)/* Tracepoints: strings */ \ -diff -urNp linux-2.6.29.5/include/asm-m32r/atomic.h linux-2.6.29.5/include/asm-m32r/atomic.h ---- linux-2.6.29.5/include/asm-m32r/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-m32r/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-m32r/atomic.h linux-2.6.29.6/include/asm-m32r/atomic.h +--- linux-2.6.29.6/include/asm-m32r/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-m32r/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -308,6 +308,10 @@ static __inline__ void atomic_set_mask(u local_irq_restore(flags); } @@ -32209,9 +32297,9 @@ diff -urNp linux-2.6.29.5/include/asm-m32r/atomic.h linux-2.6.29.5/include/asm-m /* 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.29.5/include/asm-m32r/kmap_types.h linux-2.6.29.5/include/asm-m32r/kmap_types.h ---- linux-2.6.29.5/include/asm-m32r/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-m32r/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-m32r/kmap_types.h linux-2.6.29.6/include/asm-m32r/kmap_types.h +--- linux-2.6.29.6/include/asm-m32r/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-m32r/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -21,7 +21,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -32222,9 +32310,9 @@ diff -urNp linux-2.6.29.5/include/asm-m32r/kmap_types.h linux-2.6.29.5/include/a }; #undef D -diff -urNp linux-2.6.29.5/include/asm-mn10300/atomic.h linux-2.6.29.5/include/asm-mn10300/atomic.h ---- linux-2.6.29.5/include/asm-mn10300/atomic.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-mn10300/atomic.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-mn10300/atomic.h linux-2.6.29.6/include/asm-mn10300/atomic.h +--- linux-2.6.29.6/include/asm-mn10300/atomic.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-mn10300/atomic.h 2009-07-09 22:13:39.000000000 -0400 @@ -145,6 +145,10 @@ static inline void atomic_clear_mask(uns #define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v))) #define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) @@ -32236,9 +32324,9 @@ diff -urNp linux-2.6.29.5/include/asm-mn10300/atomic.h linux-2.6.29.5/include/as /* Atomic operations are already serializing on MN10300??? */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.5/include/asm-mn10300/kmap_types.h linux-2.6.29.5/include/asm-mn10300/kmap_types.h ---- linux-2.6.29.5/include/asm-mn10300/kmap_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/asm-mn10300/kmap_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/asm-mn10300/kmap_types.h linux-2.6.29.6/include/asm-mn10300/kmap_types.h +--- linux-2.6.29.6/include/asm-mn10300/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/asm-mn10300/kmap_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -25,6 +25,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -32247,9 +32335,9 @@ diff -urNp linux-2.6.29.5/include/asm-mn10300/kmap_types.h linux-2.6.29.5/includ KM_TYPE_NR }; -diff -urNp linux-2.6.29.5/include/drm/drm_pciids.h linux-2.6.29.5/include/drm/drm_pciids.h ---- linux-2.6.29.5/include/drm/drm_pciids.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/drm/drm_pciids.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/drm_pciids.h +--- linux-2.6.29.6/include/drm/drm_pciids.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/drm/drm_pciids.h 2009-07-09 22:13:39.000000000 -0400 @@ -243,7 +243,7 @@ {0x1002, 0x796d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ {0x1002, 0x796e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ @@ -32352,9 +32440,9 @@ diff -urNp linux-2.6.29.5/include/drm/drm_pciids.h linux-2.6.29.5/include/drm/dr {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.29.5/include/drm/drmP.h linux-2.6.29.5/include/drm/drmP.h ---- linux-2.6.29.5/include/drm/drmP.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/drm/drmP.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/drm/drmP.h linux-2.6.29.6/include/drm/drmP.h +--- linux-2.6.29.6/include/drm/drmP.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/drm/drmP.h 2009-07-09 22:13:39.000000000 -0400 @@ -825,7 +825,7 @@ struct drm_device { /** \name Usage Counters */ @@ -32373,9 +32461,9 @@ diff -urNp linux-2.6.29.5/include/drm/drmP.h linux-2.6.29.5/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.29.5/include/linux/a.out.h linux-2.6.29.5/include/linux/a.out.h ---- linux-2.6.29.5/include/linux/a.out.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/a.out.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/a.out.h linux-2.6.29.6/include/linux/a.out.h +--- linux-2.6.29.6/include/linux/a.out.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/a.out.h 2009-07-09 22:13:39.000000000 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -32391,9 +32479,9 @@ diff -urNp linux-2.6.29.5/include/linux/a.out.h linux-2.6.29.5/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.29.5/include/linux/atmdev.h linux-2.6.29.5/include/linux/atmdev.h ---- linux-2.6.29.5/include/linux/atmdev.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/atmdev.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/atmdev.h linux-2.6.29.6/include/linux/atmdev.h +--- linux-2.6.29.6/include/linux/atmdev.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/atmdev.h 2009-07-09 22:13:39.000000000 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -32403,9 +32491,9 @@ diff -urNp linux-2.6.29.5/include/linux/atmdev.h linux-2.6.29.5/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.29.5/include/linux/binfmts.h linux-2.6.29.5/include/linux/binfmts.h ---- linux-2.6.29.5/include/linux/binfmts.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/binfmts.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/binfmts.h linux-2.6.29.6/include/linux/binfmts.h +--- linux-2.6.29.6/include/linux/binfmts.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/binfmts.h 2009-07-09 22:13:39.000000000 -0400 @@ -79,6 +79,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -32414,9 +32502,9 @@ diff -urNp linux-2.6.29.5/include/linux/binfmts.h linux-2.6.29.5/include/linux/b unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.29.5/include/linux/cache.h linux-2.6.29.5/include/linux/cache.h ---- linux-2.6.29.5/include/linux/cache.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/cache.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/cache.h linux-2.6.29.6/include/linux/cache.h +--- linux-2.6.29.6/include/linux/cache.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/cache.h 2009-07-09 22:13:39.000000000 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -32428,9 +32516,9 @@ diff -urNp linux-2.6.29.5/include/linux/cache.h linux-2.6.29.5/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.29.5/include/linux/capability.h linux-2.6.29.5/include/linux/capability.h ---- linux-2.6.29.5/include/linux/capability.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/capability.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/capability.h linux-2.6.29.6/include/linux/capability.h +--- linux-2.6.29.6/include/linux/capability.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/capability.h 2009-07-09 22:13:39.000000000 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -32439,9 +32527,9 @@ diff -urNp linux-2.6.29.5/include/linux/capability.h linux-2.6.29.5/include/linu /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.29.5/include/linux/cpumask.h linux-2.6.29.5/include/linux/cpumask.h ---- linux-2.6.29.5/include/linux/cpumask.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/cpumask.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/cpumask.h linux-2.6.29.6/include/linux/cpumask.h +--- linux-2.6.29.6/include/linux/cpumask.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/cpumask.h 2009-07-09 22:13:39.000000000 -0400 @@ -142,7 +142,6 @@ #include <linux/bitmap.h> @@ -32450,9 +32538,9 @@ diff -urNp linux-2.6.29.5/include/linux/cpumask.h linux-2.6.29.5/include/linux/c #ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS #define cpu_set(cpu, dst) __cpu_set((cpu), &(dst)) -diff -urNp linux-2.6.29.5/include/linux/elf.h linux-2.6.29.5/include/linux/elf.h ---- linux-2.6.29.5/include/linux/elf.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/elf.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/elf.h linux-2.6.29.6/include/linux/elf.h +--- linux-2.6.29.6/include/linux/elf.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/elf.h 2009-07-09 22:13:39.000000000 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -32525,9 +32613,9 @@ diff -urNp linux-2.6.29.5/include/linux/elf.h linux-2.6.29.5/include/linux/elf.h #endif -diff -urNp linux-2.6.29.5/include/linux/fs_struct.h linux-2.6.29.5/include/linux/fs_struct.h ---- linux-2.6.29.5/include/linux/fs_struct.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/fs_struct.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/fs_struct.h linux-2.6.29.6/include/linux/fs_struct.h +--- linux-2.6.29.6/include/linux/fs_struct.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/fs_struct.h 2009-07-09 22:13:39.000000000 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -32537,9 +32625,9 @@ diff -urNp linux-2.6.29.5/include/linux/fs_struct.h linux-2.6.29.5/include/linux rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.29.5/include/linux/genhd.h linux-2.6.29.5/include/linux/genhd.h ---- linux-2.6.29.5/include/linux/genhd.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/genhd.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/genhd.h linux-2.6.29.6/include/linux/genhd.h +--- linux-2.6.29.6/include/linux/genhd.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/genhd.h 2009-07-09 22:13:39.000000000 -0400 @@ -159,7 +159,7 @@ struct gendisk { struct timer_rand_state *random; @@ -32549,9 +32637,9 @@ diff -urNp linux-2.6.29.5/include/linux/genhd.h linux-2.6.29.5/include/linux/gen struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.29.5/include/linux/gracl.h linux-2.6.29.5/include/linux/gracl.h ---- linux-2.6.29.5/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/gracl.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/gracl.h linux-2.6.29.6/include/linux/gracl.h +--- linux-2.6.29.6/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/gracl.h 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,318 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -32871,9 +32959,9 @@ diff -urNp linux-2.6.29.5/include/linux/gracl.h linux-2.6.29.5/include/linux/gra + +#endif + -diff -urNp linux-2.6.29.5/include/linux/gralloc.h linux-2.6.29.5/include/linux/gralloc.h ---- linux-2.6.29.5/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/gralloc.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/gralloc.h linux-2.6.29.6/include/linux/gralloc.h +--- linux-2.6.29.6/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/gralloc.h 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -32884,9 +32972,9 @@ diff -urNp linux-2.6.29.5/include/linux/gralloc.h linux-2.6.29.5/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.29.5/include/linux/grdefs.h linux-2.6.29.5/include/linux/grdefs.h ---- linux-2.6.29.5/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/grdefs.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/grdefs.h linux-2.6.29.6/include/linux/grdefs.h +--- linux-2.6.29.6/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/grdefs.h 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -33024,9 +33112,9 @@ diff -urNp linux-2.6.29.5/include/linux/grdefs.h linux-2.6.29.5/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.29.5/include/linux/grinternal.h linux-2.6.29.5/include/linux/grinternal.h ---- linux-2.6.29.5/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/grinternal.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/grinternal.h linux-2.6.29.6/include/linux/grinternal.h +--- linux-2.6.29.6/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/grinternal.h 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,211 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -33239,9 +33327,9 @@ diff -urNp linux-2.6.29.5/include/linux/grinternal.h linux-2.6.29.5/include/linu +#endif + +#endif -diff -urNp linux-2.6.29.5/include/linux/grmsg.h linux-2.6.29.5/include/linux/grmsg.h ---- linux-2.6.29.5/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/grmsg.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/grmsg.h linux-2.6.29.6/include/linux/grmsg.h +--- linux-2.6.29.6/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/grmsg.h 2009-07-09 22:13:39.000000000 -0400 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u 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:%u/%u gid/egid:%u/%u" @@ -33351,9 +33439,9 @@ diff -urNp linux-2.6.29.5/include/linux/grmsg.h linux-2.6.29.5/include/linux/grm +#define GR_SHMR_AUDIT_MSG "shared memory of uid:%u euid:%u removed by " +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for " +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " -diff -urNp linux-2.6.29.5/include/linux/grsecurity.h linux-2.6.29.5/include/linux/grsecurity.h ---- linux-2.6.29.5/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/include/linux/grsecurity.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/grsecurity.h linux-2.6.29.6/include/linux/grsecurity.h +--- linux-2.6.29.6/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/include/linux/grsecurity.h 2009-07-09 23:21:34.000000000 -0400 @@ -0,0 +1,201 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -33556,9 +33644,9 @@ diff -urNp linux-2.6.29.5/include/linux/grsecurity.h linux-2.6.29.5/include/linu +#endif + +#endif -diff -urNp linux-2.6.29.5/include/linux/highmem.h linux-2.6.29.5/include/linux/highmem.h ---- linux-2.6.29.5/include/linux/highmem.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/highmem.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/highmem.h linux-2.6.29.6/include/linux/highmem.h +--- linux-2.6.29.6/include/linux/highmem.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/highmem.h 2009-07-09 22:13:39.000000000 -0400 @@ -124,6 +124,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -33578,9 +33666,9 @@ diff -urNp linux-2.6.29.5/include/linux/highmem.h linux-2.6.29.5/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.29.5/include/linux/jbd2.h linux-2.6.29.5/include/linux/jbd2.h ---- linux-2.6.29.5/include/linux/jbd2.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/jbd2.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/jbd2.h linux-2.6.29.6/include/linux/jbd2.h +--- linux-2.6.29.6/include/linux/jbd2.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/jbd2.h 2009-07-09 22:13:39.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -33590,9 +33678,9 @@ diff -urNp linux-2.6.29.5/include/linux/jbd2.h linux-2.6.29.5/include/linux/jbd2 #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.29.5/include/linux/jbd.h linux-2.6.29.5/include/linux/jbd.h ---- linux-2.6.29.5/include/linux/jbd.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/jbd.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/jbd.h linux-2.6.29.6/include/linux/jbd.h +--- linux-2.6.29.6/include/linux/jbd.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/jbd.h 2009-07-09 22:13:39.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -33602,9 +33690,9 @@ diff -urNp linux-2.6.29.5/include/linux/jbd.h linux-2.6.29.5/include/linux/jbd.h #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.29.5/include/linux/kvm_host.h linux-2.6.29.5/include/linux/kvm_host.h ---- linux-2.6.29.5/include/linux/kvm_host.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/kvm_host.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/kvm_host.h linux-2.6.29.6/include/linux/kvm_host.h +--- linux-2.6.29.6/include/linux/kvm_host.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/kvm_host.h 2009-07-09 22:13:39.000000000 -0400 @@ -155,7 +155,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -33623,9 +33711,9 @@ diff -urNp linux-2.6.29.5/include/linux/kvm_host.h linux-2.6.29.5/include/linux/ void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.29.5/include/linux/libata.h linux-2.6.29.5/include/linux/libata.h ---- linux-2.6.29.5/include/linux/libata.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/libata.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/libata.h linux-2.6.29.6/include/linux/libata.h +--- linux-2.6.29.6/include/linux/libata.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/libata.h 2009-07-09 22:13:39.000000000 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -33641,9 +33729,9 @@ diff -urNp linux-2.6.29.5/include/linux/libata.h linux-2.6.29.5/include/linux/li #endif /* ATA_DEBUG */ #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) -diff -urNp linux-2.6.29.5/include/linux/mm.h linux-2.6.29.5/include/linux/mm.h ---- linux-2.6.29.5/include/linux/mm.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/mm.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h +--- linux-2.6.29.6/include/linux/mm.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/mm.h 2009-07-09 22:13:39.000000000 -0400 @@ -39,6 +39,7 @@ extern unsigned long mmap_min_addr; #include <asm/page.h> #include <asm/pgtable.h> @@ -33712,9 +33800,9 @@ diff -urNp linux-2.6.29.5/include/linux/mm.h linux-2.6.29.5/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.29.5/include/linux/mm_types.h linux-2.6.29.5/include/linux/mm_types.h ---- linux-2.6.29.5/include/linux/mm_types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/mm_types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/mm_types.h linux-2.6.29.6/include/linux/mm_types.h +--- linux-2.6.29.6/include/linux/mm_types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/mm_types.h 2009-07-09 22:13:39.000000000 -0400 @@ -174,6 +174,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -33749,9 +33837,9 @@ diff -urNp linux-2.6.29.5/include/linux/mm_types.h linux-2.6.29.5/include/linux/ }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.29.5/include/linux/module.h linux-2.6.29.5/include/linux/module.h ---- linux-2.6.29.5/include/linux/module.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/module.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/module.h +--- linux-2.6.29.6/include/linux/module.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/module.h 2009-07-09 22:13:39.000000000 -0400 @@ -278,16 +278,16 @@ struct module int (*init)(void); @@ -33836,9 +33924,9 @@ diff -urNp linux-2.6.29.5/include/linux/module.h linux-2.6.29.5/include/linux/mo #else return &mod->ref; #endif -diff -urNp linux-2.6.29.5/include/linux/moduleloader.h linux-2.6.29.5/include/linux/moduleloader.h ---- linux-2.6.29.5/include/linux/moduleloader.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/moduleloader.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/moduleloader.h linux-2.6.29.6/include/linux/moduleloader.h +--- linux-2.6.29.6/include/linux/moduleloader.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/moduleloader.h 2009-07-09 22:13:39.000000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -33861,9 +33949,9 @@ diff -urNp linux-2.6.29.5/include/linux/moduleloader.h linux-2.6.29.5/include/li /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.29.5/include/linux/namei.h linux-2.6.29.5/include/linux/namei.h ---- linux-2.6.29.5/include/linux/namei.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/namei.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/namei.h linux-2.6.29.6/include/linux/namei.h +--- linux-2.6.29.6/include/linux/namei.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/namei.h 2009-07-09 22:13:39.000000000 -0400 @@ -21,7 +21,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -33888,9 +33976,9 @@ diff -urNp linux-2.6.29.5/include/linux/namei.h linux-2.6.29.5/include/linux/nam { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.29.5/include/linux/nodemask.h linux-2.6.29.5/include/linux/nodemask.h ---- linux-2.6.29.5/include/linux/nodemask.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/nodemask.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/nodemask.h linux-2.6.29.6/include/linux/nodemask.h +--- linux-2.6.29.6/include/linux/nodemask.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/nodemask.h 2009-07-09 22:13:39.000000000 -0400 @@ -442,11 +442,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -33907,9 +33995,9 @@ diff -urNp linux-2.6.29.5/include/linux/nodemask.h linux-2.6.29.5/include/linux/ }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.29.5/include/linux/oprofile.h linux-2.6.29.5/include/linux/oprofile.h ---- linux-2.6.29.5/include/linux/oprofile.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/oprofile.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/oprofile.h linux-2.6.29.6/include/linux/oprofile.h +--- linux-2.6.29.6/include/linux/oprofile.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/oprofile.h 2009-07-09 22:13:39.000000000 -0400 @@ -128,7 +128,7 @@ int oprofilefs_create_ro_ulong(struct su /** Create a file for read-only access to an atomic_t. */ @@ -33919,9 +34007,9 @@ diff -urNp linux-2.6.29.5/include/linux/oprofile.h linux-2.6.29.5/include/linux/ /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.29.5/include/linux/percpu.h linux-2.6.29.5/include/linux/percpu.h ---- linux-2.6.29.5/include/linux/percpu.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/percpu.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/percpu.h linux-2.6.29.6/include/linux/percpu.h +--- linux-2.6.29.6/include/linux/percpu.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/percpu.h 2009-07-09 22:13:39.000000000 -0400 @@ -50,7 +50,7 @@ #endif @@ -33931,9 +34019,21 @@ diff -urNp linux-2.6.29.5/include/linux/percpu.h linux-2.6.29.5/include/linux/pe #endif /* PERCPU_ENOUGH_ROOM */ /* -diff -urNp linux-2.6.29.5/include/linux/poison.h linux-2.6.29.5/include/linux/poison.h ---- linux-2.6.29.5/include/linux/poison.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/poison.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/personality.h linux-2.6.29.6/include/linux/personality.h +--- linux-2.6.29.6/include/linux/personality.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/personality.h 2009-07-10 05:44:42.000000000 -0400 +@@ -40,7 +40,7 @@ enum { + * Security-relevant compatibility flags that must be + * cleared upon setuid or setgid exec: + */ +-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE) ++#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE|ADDR_COMPAT_LAYOUT|MMAP_PAGE_ZERO) + + /* + * Personality types. +diff -urNp linux-2.6.29.6/include/linux/poison.h linux-2.6.29.6/include/linux/poison.h +--- linux-2.6.29.6/include/linux/poison.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/poison.h 2009-07-09 22:13:39.000000000 -0400 @@ -7,8 +7,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -33945,9 +34045,9 @@ diff -urNp linux-2.6.29.5/include/linux/poison.h linux-2.6.29.5/include/linux/po /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.29.5/include/linux/proc_fs.h linux-2.6.29.5/include/linux/proc_fs.h ---- linux-2.6.29.5/include/linux/proc_fs.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/proc_fs.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/proc_fs.h linux-2.6.29.6/include/linux/proc_fs.h +--- linux-2.6.29.6/include/linux/proc_fs.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/proc_fs.h 2009-07-09 22:13:39.000000000 -0400 @@ -174,6 +174,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -33968,9 +34068,9 @@ diff -urNp linux-2.6.29.5/include/linux/proc_fs.h linux-2.6.29.5/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.29.5/include/linux/raid/md_k.h linux-2.6.29.5/include/linux/raid/md_k.h ---- linux-2.6.29.5/include/linux/raid/md_k.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/raid/md_k.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/raid/md_k.h linux-2.6.29.6/include/linux/raid/md_k.h +--- linux-2.6.29.6/include/linux/raid/md_k.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/raid/md_k.h 2009-07-09 22:13:39.000000000 -0400 @@ -293,7 +293,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -33980,9 +34080,9 @@ diff -urNp linux-2.6.29.5/include/linux/raid/md_k.h linux-2.6.29.5/include/linux } struct mdk_personality -diff -urNp linux-2.6.29.5/include/linux/random.h linux-2.6.29.5/include/linux/random.h ---- linux-2.6.29.5/include/linux/random.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/random.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/random.h linux-2.6.29.6/include/linux/random.h +--- linux-2.6.29.6/include/linux/random.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/random.h 2009-07-09 22:13:39.000000000 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -33995,9 +34095,9 @@ diff -urNp linux-2.6.29.5/include/linux/random.h linux-2.6.29.5/include/linux/ra #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.29.5/include/linux/reiserfs_fs_sb.h linux-2.6.29.5/include/linux/reiserfs_fs_sb.h ---- linux-2.6.29.5/include/linux/reiserfs_fs_sb.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/reiserfs_fs_sb.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/reiserfs_fs_sb.h linux-2.6.29.6/include/linux/reiserfs_fs_sb.h +--- linux-2.6.29.6/include/linux/reiserfs_fs_sb.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/reiserfs_fs_sb.h 2009-07-09 22:13:39.000000000 -0400 @@ -374,7 +374,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -34007,9 +34107,9 @@ diff -urNp linux-2.6.29.5/include/linux/reiserfs_fs_sb.h linux-2.6.29.5/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.29.5/include/linux/sched.h linux-2.6.29.5/include/linux/sched.h ---- linux-2.6.29.5/include/linux/sched.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/sched.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sched.h +--- linux-2.6.29.6/include/linux/sched.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/sched.h 2009-07-09 22:13:39.000000000 -0400 @@ -97,6 +97,7 @@ struct futex_pi_state; struct robust_list_head; struct bio; @@ -34153,9 +34253,9 @@ diff -urNp linux-2.6.29.5/include/linux/sched.h linux-2.6.29.5/include/linux/sch static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -diff -urNp linux-2.6.29.5/include/linux/screen_info.h linux-2.6.29.5/include/linux/screen_info.h ---- linux-2.6.29.5/include/linux/screen_info.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/screen_info.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/screen_info.h linux-2.6.29.6/include/linux/screen_info.h +--- linux-2.6.29.6/include/linux/screen_info.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/screen_info.h 2009-07-09 22:13:39.000000000 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -34166,9 +34266,9 @@ diff -urNp linux-2.6.29.5/include/linux/screen_info.h linux-2.6.29.5/include/lin } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.29.5/include/linux/security.h linux-2.6.29.5/include/linux/security.h ---- linux-2.6.29.5/include/linux/security.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/security.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/security.h linux-2.6.29.6/include/linux/security.h +--- linux-2.6.29.6/include/linux/security.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/security.h 2009-07-09 22:13:39.000000000 -0400 @@ -32,6 +32,7 @@ #include <linux/sched.h> #include <linux/key.h> @@ -34177,9 +34277,9 @@ diff -urNp linux-2.6.29.5/include/linux/security.h linux-2.6.29.5/include/linux/ #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.29.5/include/linux/shm.h linux-2.6.29.5/include/linux/shm.h ---- linux-2.6.29.5/include/linux/shm.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/shm.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/shm.h linux-2.6.29.6/include/linux/shm.h +--- linux-2.6.29.6/include/linux/shm.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/shm.h 2009-07-09 22:13:39.000000000 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -34191,9 +34291,9 @@ diff -urNp linux-2.6.29.5/include/linux/shm.h linux-2.6.29.5/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.29.5/include/linux/slab.h linux-2.6.29.5/include/linux/slab.h ---- linux-2.6.29.5/include/linux/slab.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/slab.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/slab.h linux-2.6.29.6/include/linux/slab.h +--- linux-2.6.29.6/include/linux/slab.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/slab.h 2009-07-09 22:13:39.000000000 -0400 @@ -73,10 +73,9 @@ * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can. * Both make kfree a no-op. @@ -34251,9 +34351,9 @@ diff -urNp linux-2.6.29.5/include/linux/slab.h linux-2.6.29.5/include/linux/slab + }) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.29.5/include/linux/slub_def.h linux-2.6.29.5/include/linux/slub_def.h ---- linux-2.6.29.5/include/linux/slub_def.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/slub_def.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/slub_def.h linux-2.6.29.6/include/linux/slub_def.h +--- linux-2.6.29.6/include/linux/slub_def.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/slub_def.h 2009-07-09 22:13:39.000000000 -0400 @@ -85,7 +85,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -34263,9 +34363,9 @@ diff -urNp linux-2.6.29.5/include/linux/slub_def.h linux-2.6.29.5/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.29.5/include/linux/sysctl.h linux-2.6.29.5/include/linux/sysctl.h ---- linux-2.6.29.5/include/linux/sysctl.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/sysctl.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/sysctl.h linux-2.6.29.6/include/linux/sysctl.h +--- linux-2.6.29.6/include/linux/sysctl.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/sysctl.h 2009-07-09 22:13:39.000000000 -0400 @@ -165,7 +165,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -34279,9 +34379,9 @@ diff -urNp linux-2.6.29.5/include/linux/sysctl.h linux-2.6.29.5/include/linux/sy /* CTL_VM names: */ enum -diff -urNp linux-2.6.29.5/include/linux/thread_info.h linux-2.6.29.5/include/linux/thread_info.h ---- linux-2.6.29.5/include/linux/thread_info.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/thread_info.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/thread_info.h linux-2.6.29.6/include/linux/thread_info.h +--- linux-2.6.29.6/include/linux/thread_info.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/thread_info.h 2009-07-09 22:13:39.000000000 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait */ @@ -34291,9 +34391,9 @@ diff -urNp linux-2.6.29.5/include/linux/thread_info.h linux-2.6.29.5/include/lin u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.29.5/include/linux/tty_ldisc.h linux-2.6.29.5/include/linux/tty_ldisc.h ---- linux-2.6.29.5/include/linux/tty_ldisc.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/tty_ldisc.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/tty_ldisc.h linux-2.6.29.6/include/linux/tty_ldisc.h +--- linux-2.6.29.6/include/linux/tty_ldisc.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/tty_ldisc.h 2009-07-09 22:13:39.000000000 -0400 @@ -139,12 +139,12 @@ struct tty_ldisc_ops { struct module *owner; @@ -34309,9 +34409,9 @@ diff -urNp linux-2.6.29.5/include/linux/tty_ldisc.h linux-2.6.29.5/include/linux }; #define TTY_LDISC_MAGIC 0x5403 -diff -urNp linux-2.6.29.5/include/linux/types.h linux-2.6.29.5/include/linux/types.h ---- linux-2.6.29.5/include/linux/types.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/types.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/types.h linux-2.6.29.6/include/linux/types.h +--- linux-2.6.29.6/include/linux/types.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/types.h 2009-07-09 22:13:39.000000000 -0400 @@ -198,10 +198,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -34339,9 +34439,9 @@ diff -urNp linux-2.6.29.5/include/linux/types.h linux-2.6.29.5/include/linux/typ #endif struct ustat { -diff -urNp linux-2.6.29.5/include/linux/uaccess.h linux-2.6.29.5/include/linux/uaccess.h ---- linux-2.6.29.5/include/linux/uaccess.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/uaccess.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/uaccess.h linux-2.6.29.6/include/linux/uaccess.h +--- linux-2.6.29.6/include/linux/uaccess.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/uaccess.h 2009-07-09 22:13:39.000000000 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -34356,9 +34456,9 @@ diff -urNp linux-2.6.29.5/include/linux/uaccess.h linux-2.6.29.5/include/linux/u ret; \ }) -diff -urNp linux-2.6.29.5/include/linux/vmalloc.h linux-2.6.29.5/include/linux/vmalloc.h ---- linux-2.6.29.5/include/linux/vmalloc.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/linux/vmalloc.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/linux/vmalloc.h linux-2.6.29.6/include/linux/vmalloc.h +--- linux-2.6.29.6/include/linux/vmalloc.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/linux/vmalloc.h 2009-07-09 22:13:39.000000000 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -34447,9 +34547,9 @@ diff -urNp linux-2.6.29.5/include/linux/vmalloc.h linux-2.6.29.5/include/linux/v + }) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.29.5/include/net/sctp/sctp.h linux-2.6.29.5/include/net/sctp/sctp.h ---- linux-2.6.29.5/include/net/sctp/sctp.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/net/sctp/sctp.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/net/sctp/sctp.h linux-2.6.29.6/include/net/sctp/sctp.h +--- linux-2.6.29.6/include/net/sctp/sctp.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/net/sctp/sctp.h 2009-07-09 22:13:39.000000000 -0400 @@ -310,8 +310,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -34461,9 +34561,9 @@ diff -urNp linux-2.6.29.5/include/net/sctp/sctp.h linux-2.6.29.5/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.29.5/include/sound/core.h linux-2.6.29.5/include/sound/core.h ---- linux-2.6.29.5/include/sound/core.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/sound/core.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/sound/core.h linux-2.6.29.6/include/sound/core.h +--- linux-2.6.29.6/include/sound/core.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/sound/core.h 2009-07-09 22:13:39.000000000 -0400 @@ -427,7 +427,7 @@ static inline int __snd_bug_on(int cond) */ #define snd_printdd(format, args...) snd_printk(format, ##args) @@ -34473,9 +34573,9 @@ diff -urNp linux-2.6.29.5/include/sound/core.h linux-2.6.29.5/include/sound/core #endif -diff -urNp linux-2.6.29.5/include/video/uvesafb.h linux-2.6.29.5/include/video/uvesafb.h ---- linux-2.6.29.5/include/video/uvesafb.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/include/video/uvesafb.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/include/video/uvesafb.h linux-2.6.29.6/include/video/uvesafb.h +--- linux-2.6.29.6/include/video/uvesafb.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/include/video/uvesafb.h 2009-07-09 22:13:39.000000000 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -34484,9 +34584,9 @@ diff -urNp linux-2.6.29.5/include/video/uvesafb.h linux-2.6.29.5/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.29.5/init/do_mounts.c linux-2.6.29.5/init/do_mounts.c ---- linux-2.6.29.5/init/do_mounts.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/do_mounts.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/do_mounts.c linux-2.6.29.6/init/do_mounts.c +--- linux-2.6.29.6/init/do_mounts.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/do_mounts.c 2009-07-09 22:13:39.000000000 -0400 @@ -215,11 +215,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -34533,9 +34633,9 @@ diff -urNp linux-2.6.29.5/init/do_mounts.c linux-2.6.29.5/init/do_mounts.c + sys_chroot((char __user *)"."); } -diff -urNp linux-2.6.29.5/init/do_mounts.h linux-2.6.29.5/init/do_mounts.h ---- linux-2.6.29.5/init/do_mounts.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/do_mounts.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/do_mounts.h linux-2.6.29.6/init/do_mounts.h +--- linux-2.6.29.6/init/do_mounts.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/do_mounts.h 2009-07-09 22:13:39.000000000 -0400 @@ -14,15 +14,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -34555,9 +34655,9 @@ diff -urNp linux-2.6.29.5/init/do_mounts.h linux-2.6.29.5/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.29.5/init/do_mounts_initrd.c linux-2.6.29.5/init/do_mounts_initrd.c ---- linux-2.6.29.5/init/do_mounts_initrd.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/do_mounts_initrd.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/do_mounts_initrd.c linux-2.6.29.6/init/do_mounts_initrd.c +--- linux-2.6.29.6/init/do_mounts_initrd.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/do_mounts_initrd.c 2009-07-09 22:13:39.000000000 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -34641,9 +34741,9 @@ diff -urNp linux-2.6.29.5/init/do_mounts_initrd.c linux-2.6.29.5/init/do_mounts_ + sys_unlink((const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.29.5/init/do_mounts_md.c linux-2.6.29.5/init/do_mounts_md.c ---- linux-2.6.29.5/init/do_mounts_md.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/do_mounts_md.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/do_mounts_md.c linux-2.6.29.6/init/do_mounts_md.c +--- linux-2.6.29.6/init/do_mounts_md.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/do_mounts_md.c 2009-07-09 22:13:39.000000000 -0400 @@ -171,7 +171,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -34671,9 +34771,9 @@ diff -urNp linux-2.6.29.5/init/do_mounts_md.c linux-2.6.29.5/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.29.5/init/initramfs.c linux-2.6.29.5/init/initramfs.c ---- linux-2.6.29.5/init/initramfs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/initramfs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c +--- linux-2.6.29.6/init/initramfs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/initramfs.c 2009-07-09 22:13:39.000000000 -0400 @@ -276,7 +276,7 @@ static int __init maybe_link(void) if (nlink >= 2) { char *old = find_link(major, minor, ino, mode, collected); @@ -34759,9 +34859,9 @@ diff -urNp linux-2.6.29.5/init/initramfs.c linux-2.6.29.5/init/initramfs.c do_utime(collected, mtime); state = SkipIt; next_state = Reset; -diff -urNp linux-2.6.29.5/init/Kconfig linux-2.6.29.5/init/Kconfig ---- linux-2.6.29.5/init/Kconfig 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/Kconfig 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/Kconfig linux-2.6.29.6/init/Kconfig +--- linux-2.6.29.6/init/Kconfig 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/Kconfig 2009-07-09 22:13:39.000000000 -0400 @@ -712,6 +712,7 @@ config SYSCTL_SYSCALL config KALLSYMS bool "Load all symbols for debugging/ksymoops" if EMBEDDED @@ -34791,9 +34891,9 @@ diff -urNp linux-2.6.29.5/init/Kconfig linux-2.6.29.5/init/Kconfig config RT_MUTEXES boolean -diff -urNp linux-2.6.29.5/init/main.c linux-2.6.29.5/init/main.c ---- linux-2.6.29.5/init/main.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/main.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c +--- linux-2.6.29.6/init/main.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/main.c 2009-07-09 22:13:39.000000000 -0400 @@ -96,6 +96,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -34889,9 +34989,9 @@ diff -urNp linux-2.6.29.5/init/main.c linux-2.6.29.5/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.29.5/init/noinitramfs.c linux-2.6.29.5/init/noinitramfs.c ---- linux-2.6.29.5/init/noinitramfs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/init/noinitramfs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/init/noinitramfs.c linux-2.6.29.6/init/noinitramfs.c +--- linux-2.6.29.6/init/noinitramfs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/init/noinitramfs.c 2009-07-09 22:13:39.000000000 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -34910,9 +35010,9 @@ diff -urNp linux-2.6.29.5/init/noinitramfs.c linux-2.6.29.5/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.29.5/ipc/ipc_sysctl.c linux-2.6.29.5/ipc/ipc_sysctl.c ---- linux-2.6.29.5/ipc/ipc_sysctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/ipc/ipc_sysctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/ipc/ipc_sysctl.c linux-2.6.29.6/ipc/ipc_sysctl.c +--- linux-2.6.29.6/ipc/ipc_sysctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/ipc/ipc_sysctl.c 2009-07-09 22:13:39.000000000 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -34931,9 +35031,9 @@ diff -urNp linux-2.6.29.5/ipc/ipc_sysctl.c linux-2.6.29.5/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.29.5/ipc/mqueue.c linux-2.6.29.5/ipc/mqueue.c ---- linux-2.6.29.5/ipc/mqueue.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/ipc/mqueue.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/ipc/mqueue.c linux-2.6.29.6/ipc/mqueue.c +--- linux-2.6.29.6/ipc/mqueue.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/ipc/mqueue.c 2009-07-09 22:13:39.000000000 -0400 @@ -151,6 +151,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -34942,9 +35042,9 @@ diff -urNp linux-2.6.29.5/ipc/mqueue.c linux-2.6.29.5/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.29.5/ipc/msg.c linux-2.6.29.5/ipc/msg.c ---- linux-2.6.29.5/ipc/msg.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/ipc/msg.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/ipc/msg.c linux-2.6.29.6/ipc/msg.c +--- linux-2.6.29.6/ipc/msg.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/ipc/msg.c 2009-07-09 22:13:39.000000000 -0400 @@ -314,6 +314,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops msg_ops; @@ -34974,9 +35074,9 @@ diff -urNp linux-2.6.29.5/ipc/msg.c linux-2.6.29.5/ipc/msg.c freeque(ns, ipcp); goto out_up; case IPC_SET: -diff -urNp linux-2.6.29.5/ipc/sem.c linux-2.6.29.5/ipc/sem.c ---- linux-2.6.29.5/ipc/sem.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/ipc/sem.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/ipc/sem.c linux-2.6.29.6/ipc/sem.c +--- linux-2.6.29.6/ipc/sem.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/ipc/sem.c 2009-07-09 22:13:39.000000000 -0400 @@ -313,6 +313,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops sem_ops; @@ -35006,9 +35106,9 @@ diff -urNp linux-2.6.29.5/ipc/sem.c linux-2.6.29.5/ipc/sem.c freeary(ns, ipcp); goto out_up; case IPC_SET: -diff -urNp linux-2.6.29.5/ipc/shm.c linux-2.6.29.5/ipc/shm.c ---- linux-2.6.29.5/ipc/shm.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/ipc/shm.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c +--- linux-2.6.29.6/ipc/shm.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/ipc/shm.c 2009-07-09 22:13:39.000000000 -0400 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -35091,10 +35191,10 @@ diff -urNp linux-2.6.29.5/ipc/shm.c linux-2.6.29.5/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.29.5/kernel/acct.c linux-2.6.29.5/kernel/acct.c ---- linux-2.6.29.5/kernel/acct.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/acct.c 2009-06-12 23:57:32.000000000 -0400 -@@ -572,7 +572,7 @@ static void do_acct_process(struct bsd_a +diff -urNp linux-2.6.29.6/kernel/acct.c linux-2.6.29.6/kernel/acct.c +--- linux-2.6.29.6/kernel/acct.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/acct.c 2009-07-09 22:13:39.000000000 -0400 +@@ -574,7 +574,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY; @@ -35103,9 +35203,9 @@ diff -urNp linux-2.6.29.5/kernel/acct.c linux-2.6.29.5/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.29.5/kernel/capability.c linux-2.6.29.5/kernel/capability.c ---- linux-2.6.29.5/kernel/capability.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/capability.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/capability.c linux-2.6.29.6/kernel/capability.c +--- linux-2.6.29.6/kernel/capability.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/capability.c 2009-07-09 22:13:39.000000000 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -35129,9 +35229,9 @@ diff -urNp linux-2.6.29.5/kernel/capability.c linux-2.6.29.5/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.29.5/kernel/configs.c linux-2.6.29.5/kernel/configs.c ---- linux-2.6.29.5/kernel/configs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/configs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/configs.c linux-2.6.29.6/kernel/configs.c +--- linux-2.6.29.6/kernel/configs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/configs.c 2009-07-09 22:13:39.000000000 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -35152,9 +35252,9 @@ diff -urNp linux-2.6.29.5/kernel/configs.c linux-2.6.29.5/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.29.5/kernel/cpu.c linux-2.6.29.5/kernel/cpu.c ---- linux-2.6.29.5/kernel/cpu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/cpu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/cpu.c linux-2.6.29.6/kernel/cpu.c +--- linux-2.6.29.6/kernel/cpu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/cpu.c 2009-07-09 22:13:39.000000000 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -35164,9 +35264,9 @@ diff -urNp linux-2.6.29.5/kernel/cpu.c linux-2.6.29.5/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.29.5/kernel/cred.c linux-2.6.29.5/kernel/cred.c ---- linux-2.6.29.5/kernel/cred.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/cred.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/cred.c linux-2.6.29.6/kernel/cred.c +--- linux-2.6.29.6/kernel/cred.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/cred.c 2009-07-09 22:13:39.000000000 -0400 @@ -366,6 +366,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -35176,9 +35276,9 @@ diff -urNp linux-2.6.29.5/kernel/cred.c linux-2.6.29.5/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.29.5/kernel/exit.c linux-2.6.29.5/kernel/exit.c ---- linux-2.6.29.5/kernel/exit.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/kernel/exit.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c +--- linux-2.6.29.6/kernel/exit.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/exit.c 2009-07-09 22:13:39.000000000 -0400 @@ -59,6 +59,10 @@ DEFINE_TRACE(sched_process_free); DEFINE_TRACE(sched_process_exit); DEFINE_TRACE(sched_process_wait); @@ -35259,9 +35359,9 @@ diff -urNp linux-2.6.29.5/kernel/exit.c linux-2.6.29.5/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.29.5/kernel/fork.c linux-2.6.29.5/kernel/fork.c ---- linux-2.6.29.5/kernel/fork.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/fork.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c +--- linux-2.6.29.6/kernel/fork.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/fork.c 2009-07-09 22:13:39.000000000 -0400 @@ -239,7 +239,7 @@ static struct task_struct *dup_task_stru setup_thread_stack(tsk, orig); @@ -35416,9 +35516,9 @@ diff -urNp linux-2.6.29.5/kernel/fork.c linux-2.6.29.5/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.29.5/kernel/futex.c linux-2.6.29.5/kernel/futex.c ---- linux-2.6.29.5/kernel/futex.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/kernel/futex.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/futex.c linux-2.6.29.6/kernel/futex.c +--- linux-2.6.29.6/kernel/futex.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/futex.c 2009-07-09 22:13:39.000000000 -0400 @@ -213,6 +213,11 @@ get_futex_key(u32 __user *uaddr, int fsh struct page *page; int err; @@ -35449,9 +35549,9 @@ diff -urNp linux-2.6.29.5/kernel/futex.c linux-2.6.29.5/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.29.5/kernel/irq/handle.c linux-2.6.29.5/kernel/irq/handle.c ---- linux-2.6.29.5/kernel/irq/handle.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/irq/handle.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/irq/handle.c linux-2.6.29.6/kernel/irq/handle.c +--- linux-2.6.29.6/kernel/irq/handle.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/irq/handle.c 2009-07-09 22:13:39.000000000 -0400 @@ -222,7 +222,8 @@ struct irq_desc irq_desc[NR_IRQS] __cach .depth = 1, .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), @@ -35462,9 +35562,9 @@ diff -urNp linux-2.6.29.5/kernel/irq/handle.c linux-2.6.29.5/kernel/irq/handle.c #endif } }; -diff -urNp linux-2.6.29.5/kernel/kallsyms.c linux-2.6.29.5/kernel/kallsyms.c ---- linux-2.6.29.5/kernel/kallsyms.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/kallsyms.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c +--- linux-2.6.29.6/kernel/kallsyms.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/kallsyms.c 2009-07-09 22:13:39.000000000 -0400 @@ -62,6 +62,18 @@ static inline int is_kernel_text(unsigne static inline int is_kernel(unsigned long addr) @@ -35517,9 +35617,9 @@ diff -urNp linux-2.6.29.5/kernel/kallsyms.c linux-2.6.29.5/kernel/kallsyms.c return 0; } __initcall(kallsyms_init); -diff -urNp linux-2.6.29.5/kernel/kmod.c linux-2.6.29.5/kernel/kmod.c ---- linux-2.6.29.5/kernel/kmod.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/kmod.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/kmod.c linux-2.6.29.6/kernel/kmod.c +--- linux-2.6.29.6/kernel/kmod.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/kmod.c 2009-07-09 22:13:39.000000000 -0400 @@ -108,7 +108,7 @@ int request_module(const char *fmt, ...) return -ENOMEM; } @@ -35529,9 +35629,9 @@ diff -urNp linux-2.6.29.5/kernel/kmod.c linux-2.6.29.5/kernel/kmod.c atomic_dec(&kmod_concurrent); return ret; } -diff -urNp linux-2.6.29.5/kernel/kprobes.c linux-2.6.29.5/kernel/kprobes.c ---- linux-2.6.29.5/kernel/kprobes.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/kprobes.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c +--- linux-2.6.29.6/kernel/kprobes.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/kprobes.c 2009-07-09 22:13:39.000000000 -0400 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. @@ -35550,9 +35650,9 @@ diff -urNp linux-2.6.29.5/kernel/kprobes.c linux-2.6.29.5/kernel/kprobes.c kfree(kip); } return 1; -diff -urNp linux-2.6.29.5/kernel/lockdep.c linux-2.6.29.5/kernel/lockdep.c ---- linux-2.6.29.5/kernel/lockdep.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/lockdep.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/lockdep.c linux-2.6.29.6/kernel/lockdep.c +--- linux-2.6.29.6/kernel/lockdep.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/lockdep.c 2009-07-09 22:13:39.000000000 -0400 @@ -631,6 +631,10 @@ static int static_obj(void *obj) int i; #endif @@ -35579,9 +35679,9 @@ diff -urNp linux-2.6.29.5/kernel/lockdep.c linux-2.6.29.5/kernel/lockdep.c if ((addr >= start) && (addr < end)) return 1; -diff -urNp linux-2.6.29.5/kernel/module.c linux-2.6.29.5/kernel/module.c ---- linux-2.6.29.5/kernel/module.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/module.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c +--- linux-2.6.29.6/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/module.c 2009-07-09 22:13:39.000000000 -0400 @@ -46,6 +46,11 @@ #include <linux/rculist.h> #include <asm/uaccess.h> @@ -36152,9 +36252,9 @@ diff -urNp linux-2.6.29.5/kernel/module.c linux-2.6.29.5/kernel/module.c return mod; return NULL; } -diff -urNp linux-2.6.29.5/kernel/mutex.c linux-2.6.29.5/kernel/mutex.c ---- linux-2.6.29.5/kernel/mutex.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/mutex.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/mutex.c linux-2.6.29.6/kernel/mutex.c +--- linux-2.6.29.6/kernel/mutex.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/mutex.c 2009-07-09 22:13:39.000000000 -0400 @@ -83,7 +83,7 @@ __mutex_lock_slowpath(atomic_t *lock_cou * * This function is similar to (but not equivalent to) down(). @@ -36164,21 +36264,22 @@ diff -urNp linux-2.6.29.5/kernel/mutex.c linux-2.6.29.5/kernel/mutex.c { might_sleep(); /* -diff -urNp linux-2.6.29.5/kernel/panic.c linux-2.6.29.5/kernel/panic.c ---- linux-2.6.29.5/kernel/panic.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/panic.c 2009-06-12 23:57:32.000000000 -0400 -@@ -361,6 +361,8 @@ EXPORT_SYMBOL(warn_slowpath); +diff -urNp linux-2.6.29.6/kernel/panic.c linux-2.6.29.6/kernel/panic.c +--- linux-2.6.29.6/kernel/panic.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/panic.c 2009-07-09 22:20:50.000000000 -0400 +@@ -361,7 +361,8 @@ EXPORT_SYMBOL(warn_slowpath); */ void __stack_chk_fail(void) { -+ print_symbol("stack corrupted in: %s\n", (unsigned long)__builtin_return_address(0)); +- panic("stack-protector: Kernel stack is corrupted"); + dump_stack(); - panic("stack-protector: Kernel stack is corrupted"); ++ panic("stack-protector: Kernel stack is corrupted in: %pS\n", __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.29.5/kernel/pid.c linux-2.6.29.5/kernel/pid.c ---- linux-2.6.29.5/kernel/pid.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/pid.c 2009-06-12 23:57:32.000000000 -0400 + #endif +diff -urNp linux-2.6.29.6/kernel/pid.c linux-2.6.29.6/kernel/pid.c +--- linux-2.6.29.6/kernel/pid.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/pid.c 2009-07-09 22:13:39.000000000 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -36212,9 +36313,9 @@ diff -urNp linux-2.6.29.5/kernel/pid.c linux-2.6.29.5/kernel/pid.c } EXPORT_SYMBOL(find_task_by_pid_type_ns); -diff -urNp linux-2.6.29.5/kernel/posix-cpu-timers.c linux-2.6.29.5/kernel/posix-cpu-timers.c ---- linux-2.6.29.5/kernel/posix-cpu-timers.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/posix-cpu-timers.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/posix-cpu-timers.c linux-2.6.29.6/kernel/posix-cpu-timers.c +--- linux-2.6.29.6/kernel/posix-cpu-timers.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/posix-cpu-timers.c 2009-07-09 22:13:39.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -36260,9 +36361,9 @@ diff -urNp linux-2.6.29.5/kernel/posix-cpu-timers.c linux-2.6.29.5/kernel/posix- cpu_timer_fire(timer); } spin_unlock(&timer->it_lock); -diff -urNp linux-2.6.29.5/kernel/power/poweroff.c linux-2.6.29.5/kernel/power/poweroff.c ---- linux-2.6.29.5/kernel/power/poweroff.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/power/poweroff.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/power/poweroff.c linux-2.6.29.6/kernel/power/poweroff.c +--- linux-2.6.29.6/kernel/power/poweroff.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/power/poweroff.c 2009-07-09 22:13:39.000000000 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -36272,9 +36373,9 @@ diff -urNp linux-2.6.29.5/kernel/power/poweroff.c linux-2.6.29.5/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.29.5/kernel/printk.c linux-2.6.29.5/kernel/printk.c ---- linux-2.6.29.5/kernel/printk.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/printk.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/printk.c linux-2.6.29.6/kernel/printk.c +--- linux-2.6.29.6/kernel/printk.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/printk.c 2009-07-09 22:13:39.000000000 -0400 @@ -253,6 +253,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -36287,9 +36388,9 @@ diff -urNp linux-2.6.29.5/kernel/printk.c linux-2.6.29.5/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.29.5/kernel/ptrace.c linux-2.6.29.5/kernel/ptrace.c ---- linux-2.6.29.5/kernel/ptrace.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/kernel/ptrace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c +--- linux-2.6.29.6/kernel/ptrace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/ptrace.c 2009-07-09 22:13:40.000000000 -0400 @@ -149,7 +149,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -36329,9 +36430,9 @@ diff -urNp linux-2.6.29.5/kernel/ptrace.c linux-2.6.29.5/kernel/ptrace.c ret = arch_ptrace(child, request, addr, data); if (ret < 0) goto out_put_task_struct; -diff -urNp linux-2.6.29.5/kernel/relay.c linux-2.6.29.5/kernel/relay.c ---- linux-2.6.29.5/kernel/relay.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/relay.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/relay.c linux-2.6.29.6/kernel/relay.c +--- linux-2.6.29.6/kernel/relay.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/relay.c 2009-07-09 22:13:40.000000000 -0400 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -36341,9 +36442,9 @@ diff -urNp linux-2.6.29.5/kernel/relay.c linux-2.6.29.5/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.29.5/kernel/resource.c linux-2.6.29.5/kernel/resource.c ---- linux-2.6.29.5/kernel/resource.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/resource.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/resource.c linux-2.6.29.6/kernel/resource.c +--- linux-2.6.29.6/kernel/resource.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/resource.c 2009-07-09 22:13:40.000000000 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -36363,9 +36464,9 @@ diff -urNp linux-2.6.29.5/kernel/resource.c linux-2.6.29.5/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.29.5/kernel/sched.c linux-2.6.29.5/kernel/sched.c ---- linux-2.6.29.5/kernel/sched.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/sched.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c +--- linux-2.6.29.6/kernel/sched.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/sched.c 2009-07-09 22:13:40.000000000 -0400 @@ -5175,6 +5175,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -36412,9 +36513,9 @@ diff -urNp linux-2.6.29.5/kernel/sched.c linux-2.6.29.5/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.29.5/kernel/signal.c linux-2.6.29.5/kernel/signal.c ---- linux-2.6.29.5/kernel/signal.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/signal.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c +--- linux-2.6.29.6/kernel/signal.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/signal.c 2009-07-09 22:13:40.000000000 -0400 @@ -198,6 +198,9 @@ static struct sigqueue *__sigqueue_alloc */ user = get_uid(__task_cred(t)->user); @@ -36474,9 +36575,9 @@ diff -urNp linux-2.6.29.5/kernel/signal.c linux-2.6.29.5/kernel/signal.c } return ret; -diff -urNp linux-2.6.29.5/kernel/softirq.c linux-2.6.29.5/kernel/softirq.c ---- linux-2.6.29.5/kernel/softirq.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/softirq.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/softirq.c linux-2.6.29.6/kernel/softirq.c +--- linux-2.6.29.6/kernel/softirq.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/softirq.c 2009-07-09 22:13:40.000000000 -0400 @@ -450,9 +450,9 @@ void tasklet_kill(struct tasklet_struct printk("Attempt to kill tasklet from interrupt\n"); @@ -36489,9 +36590,9 @@ diff -urNp linux-2.6.29.5/kernel/softirq.c linux-2.6.29.5/kernel/softirq.c } tasklet_unlock_wait(t); clear_bit(TASKLET_STATE_SCHED, &t->state); -diff -urNp linux-2.6.29.5/kernel/sys.c linux-2.6.29.5/kernel/sys.c ---- linux-2.6.29.5/kernel/sys.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/sys.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c +--- linux-2.6.29.6/kernel/sys.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/sys.c 2009-07-09 22:13:40.000000000 -0400 @@ -131,6 +131,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -36618,9 +36719,9 @@ diff -urNp linux-2.6.29.5/kernel/sys.c linux-2.6.29.5/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.29.5/kernel/sysctl.c linux-2.6.29.5/kernel/sysctl.c ---- linux-2.6.29.5/kernel/sysctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/sysctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c +--- linux-2.6.29.6/kernel/sysctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/sysctl.c 2009-07-09 22:13:40.000000000 -0400 @@ -61,6 +61,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -36743,9 +36844,35 @@ diff -urNp linux-2.6.29.5/kernel/sysctl.c linux-2.6.29.5/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.29.5/kernel/time/tick-broadcast.c linux-2.6.29.5/kernel/time/tick-broadcast.c ---- linux-2.6.29.5/kernel/time/tick-broadcast.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/time/tick-broadcast.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/taskstats.c linux-2.6.29.6/kernel/taskstats.c +--- linux-2.6.29.6/kernel/taskstats.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/taskstats.c 2009-07-10 05:28:01.000000000 -0400 +@@ -26,9 +26,12 @@ + #include <linux/cgroup.h> + #include <linux/fs.h> + #include <linux/file.h> ++#include <linux/grsecurity.h> + #include <net/genetlink.h> + #include <asm/atomic.h> + ++extern int gr_is_taskstats_denied(int pid); ++ + /* + * Maximum length of a cpumask that can be specified in + * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute +@@ -433,6 +436,9 @@ static int taskstats_user_cmd(struct sk_ + size_t size; + cpumask_var_t mask; + ++ if (gr_is_taskstats_denied(current->pid)) ++ return -EACCES; ++ + if (!alloc_cpumask_var(&mask, GFP_KERNEL)) + return -ENOMEM; + +diff -urNp linux-2.6.29.6/kernel/time/tick-broadcast.c linux-2.6.29.6/kernel/time/tick-broadcast.c +--- linux-2.6.29.6/kernel/time/tick-broadcast.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/time/tick-broadcast.c 2009-07-09 22:13:40.000000000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -36755,9 +36882,9 @@ diff -urNp linux-2.6.29.5/kernel/time/tick-broadcast.c linux-2.6.29.5/kernel/tim cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.29.5/kernel/time.c linux-2.6.29.5/kernel/time.c ---- linux-2.6.29.5/kernel/time.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/time.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/time.c linux-2.6.29.6/kernel/time.c +--- linux-2.6.29.6/kernel/time.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/time.c 2009-07-09 22:13:40.000000000 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -36795,9 +36922,9 @@ diff -urNp linux-2.6.29.5/kernel/time.c linux-2.6.29.5/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.29.5/kernel/trace/trace.c linux-2.6.29.5/kernel/trace/trace.c ---- linux-2.6.29.5/kernel/trace/trace.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/trace/trace.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/trace/trace.c linux-2.6.29.6/kernel/trace/trace.c +--- linux-2.6.29.6/kernel/trace/trace.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/trace/trace.c 2009-07-09 22:13:40.000000000 -0400 @@ -442,7 +442,7 @@ trace_seq_path(struct trace_seq *s, stru return 0; p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -36807,9 +36934,9 @@ diff -urNp linux-2.6.29.5/kernel/trace/trace.c linux-2.6.29.5/kernel/trace/trace if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.29.5/kernel/utsname_sysctl.c linux-2.6.29.5/kernel/utsname_sysctl.c ---- linux-2.6.29.5/kernel/utsname_sysctl.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/kernel/utsname_sysctl.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/kernel/utsname_sysctl.c linux-2.6.29.6/kernel/utsname_sysctl.c +--- linux-2.6.29.6/kernel/utsname_sysctl.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/kernel/utsname_sysctl.c 2009-07-09 22:13:40.000000000 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -36828,9 +36955,9 @@ diff -urNp linux-2.6.29.5/kernel/utsname_sysctl.c linux-2.6.29.5/kernel/utsname_ }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.29.5/lib/Kconfig.debug linux-2.6.29.5/lib/Kconfig.debug ---- linux-2.6.29.5/lib/Kconfig.debug 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/lib/Kconfig.debug 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/lib/Kconfig.debug linux-2.6.29.6/lib/Kconfig.debug +--- linux-2.6.29.6/lib/Kconfig.debug 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/lib/Kconfig.debug 2009-07-09 22:13:40.000000000 -0400 @@ -783,7 +783,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -36840,9 +36967,9 @@ diff -urNp linux-2.6.29.5/lib/Kconfig.debug linux-2.6.29.5/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.29.5/lib/parser.c linux-2.6.29.5/lib/parser.c ---- linux-2.6.29.5/lib/parser.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/lib/parser.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/lib/parser.c linux-2.6.29.6/lib/parser.c +--- linux-2.6.29.6/lib/parser.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/lib/parser.c 2009-07-09 22:13:40.000000000 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -36852,9 +36979,9 @@ diff -urNp linux-2.6.29.5/lib/parser.c linux-2.6.29.5/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.29.5/lib/radix-tree.c linux-2.6.29.5/lib/radix-tree.c ---- linux-2.6.29.5/lib/radix-tree.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/lib/radix-tree.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/lib/radix-tree.c linux-2.6.29.6/lib/radix-tree.c +--- linux-2.6.29.6/lib/radix-tree.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/lib/radix-tree.c 2009-07-09 22:13:40.000000000 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -36864,9 +36991,9 @@ diff -urNp linux-2.6.29.5/lib/radix-tree.c linux-2.6.29.5/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.29.5/lib/random32.c linux-2.6.29.5/lib/random32.c ---- linux-2.6.29.5/lib/random32.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/lib/random32.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/lib/random32.c linux-2.6.29.6/lib/random32.c +--- linux-2.6.29.6/lib/random32.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/lib/random32.c 2009-07-09 22:13:40.000000000 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -36876,14 +37003,14 @@ diff -urNp linux-2.6.29.5/lib/random32.c linux-2.6.29.5/lib/random32.c } /** -diff -urNp linux-2.6.29.5/localversion-grsec linux-2.6.29.5/localversion-grsec ---- linux-2.6.29.5/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.5/localversion-grsec 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/localversion-grsec linux-2.6.29.6/localversion-grsec +--- linux-2.6.29.6/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.29.6/localversion-grsec 2009-07-09 22:13:40.000000000 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.29.5/Makefile linux-2.6.29.5/Makefile ---- linux-2.6.29.5/Makefile 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/Makefile 2009-06-12 23:57:31.000000000 -0400 +diff -urNp linux-2.6.29.6/Makefile linux-2.6.29.6/Makefile +--- linux-2.6.29.6/Makefile 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/Makefile 2009-07-09 22:13:40.000000000 -0400 @@ -226,7 +226,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -36902,9 +37029,9 @@ diff -urNp linux-2.6.29.5/Makefile linux-2.6.29.5/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.29.5/mm/filemap.c linux-2.6.29.5/mm/filemap.c ---- linux-2.6.29.5/mm/filemap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/filemap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/filemap.c linux-2.6.29.6/mm/filemap.c +--- linux-2.6.29.6/mm/filemap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/filemap.c 2009-07-09 22:13:40.000000000 -0400 @@ -1615,7 +1615,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -36922,9 +37049,9 @@ diff -urNp linux-2.6.29.5/mm/filemap.c linux-2.6.29.5/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.29.5/mm/fremap.c linux-2.6.29.5/mm/fremap.c ---- linux-2.6.29.5/mm/fremap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/fremap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/fremap.c linux-2.6.29.6/mm/fremap.c +--- linux-2.6.29.6/mm/fremap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/fremap.c 2009-07-09 22:13:40.000000000 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -36937,9 +37064,9 @@ diff -urNp linux-2.6.29.5/mm/fremap.c linux-2.6.29.5/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.29.5/mm/hugetlb.c linux-2.6.29.5/mm/hugetlb.c ---- linux-2.6.29.5/mm/hugetlb.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/mm/hugetlb.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/hugetlb.c linux-2.6.29.6/mm/hugetlb.c +--- linux-2.6.29.6/mm/hugetlb.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/hugetlb.c 2009-07-09 22:13:40.000000000 -0400 @@ -1864,6 +1864,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -37019,9 +37146,9 @@ diff -urNp linux-2.6.29.5/mm/hugetlb.c linux-2.6.29.5/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.29.5/mm/madvise.c linux-2.6.29.5/mm/madvise.c ---- linux-2.6.29.5/mm/madvise.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/madvise.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/madvise.c linux-2.6.29.6/mm/madvise.c +--- linux-2.6.29.6/mm/madvise.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/madvise.c 2009-07-09 22:13:40.000000000 -0400 @@ -43,6 +43,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; int new_flags = vma->vm_flags; @@ -37082,9 +37209,9 @@ diff -urNp linux-2.6.29.5/mm/madvise.c linux-2.6.29.5/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.29.5/mm/memory.c linux-2.6.29.5/mm/memory.c ---- linux-2.6.29.5/mm/memory.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/memory.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c +--- linux-2.6.29.6/mm/memory.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/memory.c 2009-07-09 22:13:40.000000000 -0400 @@ -47,6 +47,7 @@ #include <linux/pagemap.h> #include <linux/rmap.h> @@ -37488,9 +37615,9 @@ diff -urNp linux-2.6.29.5/mm/memory.c linux-2.6.29.5/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.29.5/mm/mempolicy.c linux-2.6.29.5/mm/mempolicy.c ---- linux-2.6.29.5/mm/mempolicy.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/mempolicy.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/mempolicy.c linux-2.6.29.6/mm/mempolicy.c +--- linux-2.6.29.6/mm/mempolicy.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/mempolicy.c 2009-07-09 22:13:40.000000000 -0400 @@ -551,6 +551,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -37546,9 +37673,9 @@ diff -urNp linux-2.6.29.5/mm/mempolicy.c linux-2.6.29.5/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.29.5/mm/mlock.c linux-2.6.29.5/mm/mlock.c ---- linux-2.6.29.5/mm/mlock.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/mlock.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/mlock.c linux-2.6.29.6/mm/mlock.c +--- linux-2.6.29.6/mm/mlock.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/mlock.c 2009-07-09 22:13:40.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -37617,9 +37744,9 @@ diff -urNp linux-2.6.29.5/mm/mlock.c linux-2.6.29.5/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.29.5/mm/mmap.c linux-2.6.29.5/mm/mmap.c ---- linux-2.6.29.5/mm/mmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/mmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c +--- linux-2.6.29.6/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/mmap.c 2009-07-09 22:13:40.000000000 -0400 @@ -43,6 +43,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -38745,9 +38872,9 @@ diff -urNp linux-2.6.29.5/mm/mmap.c linux-2.6.29.5/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.29.5/mm/mprotect.c linux-2.6.29.5/mm/mprotect.c ---- linux-2.6.29.5/mm/mprotect.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/mprotect.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/mprotect.c linux-2.6.29.6/mm/mprotect.c +--- linux-2.6.29.6/mm/mprotect.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/mprotect.c 2009-07-09 22:13:40.000000000 -0400 @@ -23,10 +23,16 @@ #include <linux/swapops.h> #include <linux/mmu_notifier.h> @@ -38938,9 +39065,9 @@ diff -urNp linux-2.6.29.5/mm/mprotect.c linux-2.6.29.5/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.29.5/mm/mremap.c linux-2.6.29.5/mm/mremap.c ---- linux-2.6.29.5/mm/mremap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/mremap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/mremap.c linux-2.6.29.6/mm/mremap.c +--- linux-2.6.29.6/mm/mremap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/mremap.c 2009-07-09 22:13:40.000000000 -0400 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -39052,9 +39179,9 @@ diff -urNp linux-2.6.29.5/mm/mremap.c linux-2.6.29.5/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.29.5/mm/nommu.c linux-2.6.29.5/mm/nommu.c ---- linux-2.6.29.5/mm/nommu.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/nommu.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/nommu.c linux-2.6.29.6/mm/nommu.c +--- linux-2.6.29.6/mm/nommu.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/nommu.c 2009-07-09 22:13:40.000000000 -0400 @@ -770,15 +770,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -39071,9 +39198,9 @@ diff -urNp linux-2.6.29.5/mm/nommu.c linux-2.6.29.5/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.29.5/mm/page_alloc.c linux-2.6.29.5/mm/page_alloc.c ---- linux-2.6.29.5/mm/page_alloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/page_alloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/page_alloc.c linux-2.6.29.6/mm/page_alloc.c +--- linux-2.6.29.6/mm/page_alloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/page_alloc.c 2009-07-09 22:13:40.000000000 -0400 @@ -549,6 +549,10 @@ static void __free_pages_ok(struct page int i; int bad = 0; @@ -39121,9 +39248,9 @@ diff -urNp linux-2.6.29.5/mm/page_alloc.c linux-2.6.29.5/mm/page_alloc.c arch_free_page(page, 0); kernel_map_pages(page, 1, 0); -diff -urNp linux-2.6.29.5/mm/rmap.c linux-2.6.29.5/mm/rmap.c ---- linux-2.6.29.5/mm/rmap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/rmap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/rmap.c linux-2.6.29.6/mm/rmap.c +--- linux-2.6.29.6/mm/rmap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/rmap.c 2009-07-09 22:13:40.000000000 -0400 @@ -103,6 +103,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -39151,9 +39278,9 @@ diff -urNp linux-2.6.29.5/mm/rmap.c linux-2.6.29.5/mm/rmap.c vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.29.5/mm/shmem.c linux-2.6.29.5/mm/shmem.c ---- linux-2.6.29.5/mm/shmem.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/shmem.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/shmem.c linux-2.6.29.6/mm/shmem.c +--- linux-2.6.29.6/mm/shmem.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/shmem.c 2009-07-09 22:13:40.000000000 -0400 @@ -29,7 +29,7 @@ #include <linux/module.h> #include <linux/swap.h> @@ -39163,9 +39290,9 @@ diff -urNp linux-2.6.29.5/mm/shmem.c linux-2.6.29.5/mm/shmem.c #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.29.5/mm/slab.c linux-2.6.29.5/mm/slab.c ---- linux-2.6.29.5/mm/slab.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/slab.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c +--- linux-2.6.29.6/mm/slab.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/slab.c 2009-07-09 22:13:40.000000000 -0400 @@ -305,7 +305,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -39263,9 +39390,9 @@ diff -urNp linux-2.6.29.5/mm/slab.c linux-2.6.29.5/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.29.5/mm/slob.c linux-2.6.29.5/mm/slob.c ---- linux-2.6.29.5/mm/slob.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/slob.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c +--- linux-2.6.29.6/mm/slob.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/slob.c 2009-07-09 22:13:40.000000000 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -39564,9 +39691,9 @@ diff -urNp linux-2.6.29.5/mm/slob.c linux-2.6.29.5/mm/slob.c } } EXPORT_SYMBOL(kmem_cache_free); -diff -urNp linux-2.6.29.5/mm/slub.c linux-2.6.29.5/mm/slub.c ---- linux-2.6.29.5/mm/slub.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/mm/slub.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c +--- linux-2.6.29.6/mm/slub.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/slub.c 2009-07-09 22:13:40.000000000 -0400 @@ -1786,7 +1786,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will occur. * (Could be removed. This was introduced to pacify the merge skeptics.) @@ -39695,9 +39822,9 @@ diff -urNp linux-2.6.29.5/mm/slub.c linux-2.6.29.5/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.29.5/mm/util.c linux-2.6.29.5/mm/util.c ---- linux-2.6.29.5/mm/util.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/util.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/util.c linux-2.6.29.6/mm/util.c +--- linux-2.6.29.6/mm/util.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/util.c 2009-07-09 22:13:40.000000000 -0400 @@ -187,6 +187,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -39711,9 +39838,9 @@ diff -urNp linux-2.6.29.5/mm/util.c linux-2.6.29.5/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.29.5/mm/vmalloc.c linux-2.6.29.5/mm/vmalloc.c ---- linux-2.6.29.5/mm/vmalloc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/mm/vmalloc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c +--- linux-2.6.29.6/mm/vmalloc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/mm/vmalloc.c 2009-07-09 22:13:40.000000000 -0400 @@ -90,6 +90,11 @@ static int vmap_pte_range(pmd_t *pmd, un unsigned long end, pgprot_t prot, struct page **pages, int *nr) { @@ -39869,9 +39996,9 @@ diff -urNp linux-2.6.29.5/mm/vmalloc.c linux-2.6.29.5/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.29.5/net/atm/atm_misc.c linux-2.6.29.5/net/atm/atm_misc.c ---- linux-2.6.29.5/net/atm/atm_misc.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/atm/atm_misc.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/atm/atm_misc.c linux-2.6.29.6/net/atm/atm_misc.c +--- linux-2.6.29.6/net/atm/atm_misc.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/atm/atm_misc.c 2009-07-09 22:13:40.000000000 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -39890,9 +40017,9 @@ diff -urNp linux-2.6.29.5/net/atm/atm_misc.c linux-2.6.29.5/net/atm/atm_misc.c return NULL; } -diff -urNp linux-2.6.29.5/net/atm/resources.c linux-2.6.29.5/net/atm/resources.c ---- linux-2.6.29.5/net/atm/resources.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/atm/resources.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/atm/resources.c linux-2.6.29.6/net/atm/resources.c +--- linux-2.6.29.6/net/atm/resources.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/atm/resources.c 2009-07-09 22:13:40.000000000 -0400 @@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_ static void subtract_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -39902,9 +40029,9 @@ diff -urNp linux-2.6.29.5/net/atm/resources.c linux-2.6.29.5/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.29.5/net/bridge/br_stp_if.c linux-2.6.29.5/net/bridge/br_stp_if.c ---- linux-2.6.29.5/net/bridge/br_stp_if.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/bridge/br_stp_if.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/bridge/br_stp_if.c linux-2.6.29.6/net/bridge/br_stp_if.c +--- linux-2.6.29.6/net/bridge/br_stp_if.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/bridge/br_stp_if.c 2009-07-09 22:13:40.000000000 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -39914,9 +40041,9 @@ diff -urNp linux-2.6.29.5/net/bridge/br_stp_if.c linux-2.6.29.5/net/bridge/br_st printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.29.5/net/core/flow.c linux-2.6.29.5/net/core/flow.c ---- linux-2.6.29.5/net/core/flow.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/core/flow.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/core/flow.c linux-2.6.29.6/net/core/flow.c +--- linux-2.6.29.6/net/core/flow.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/core/flow.c 2009-07-09 22:13:40.000000000 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -39944,9 +40071,9 @@ diff -urNp linux-2.6.29.5/net/core/flow.c linux-2.6.29.5/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.29.5/net/dccp/ccids/ccid3.c linux-2.6.29.5/net/dccp/ccids/ccid3.c ---- linux-2.6.29.5/net/dccp/ccids/ccid3.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/dccp/ccids/ccid3.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/dccp/ccids/ccid3.c linux-2.6.29.6/net/dccp/ccids/ccid3.c +--- linux-2.6.29.6/net/dccp/ccids/ccid3.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/dccp/ccids/ccid3.c 2009-07-09 22:13:40.000000000 -0400 @@ -43,7 +43,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -39956,9 +40083,9 @@ diff -urNp linux-2.6.29.5/net/dccp/ccids/ccid3.c linux-2.6.29.5/net/dccp/ccids/c #endif /* -diff -urNp linux-2.6.29.5/net/dccp/dccp.h linux-2.6.29.5/net/dccp/dccp.h ---- linux-2.6.29.5/net/dccp/dccp.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/dccp/dccp.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/dccp/dccp.h linux-2.6.29.6/net/dccp/dccp.h +--- linux-2.6.29.6/net/dccp/dccp.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/dccp/dccp.h 2009-07-09 22:13:40.000000000 -0400 @@ -43,8 +43,8 @@ extern int dccp_debug; #define dccp_pr_debug(format, a...) DCCP_PR_DEBUG(dccp_debug, format, ##a) #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) @@ -39970,9 +40097,9 @@ diff -urNp linux-2.6.29.5/net/dccp/dccp.h linux-2.6.29.5/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.29.5/net/ipv4/inet_connection_sock.c linux-2.6.29.5/net/ipv4/inet_connection_sock.c ---- linux-2.6.29.5/net/ipv4/inet_connection_sock.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/inet_connection_sock.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/inet_connection_sock.c linux-2.6.29.6/net/ipv4/inet_connection_sock.c +--- linux-2.6.29.6/net/ipv4/inet_connection_sock.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/inet_connection_sock.c 2009-07-09 22:13:40.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/module.h> @@ -39981,9 +40108,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/inet_connection_sock.c linux-2.6.29.5/net/ipv #include <net/inet_connection_sock.h> #include <net/inet_hashtables.h> -diff -urNp linux-2.6.29.5/net/ipv4/inet_hashtables.c linux-2.6.29.5/net/ipv4/inet_hashtables.c ---- linux-2.6.29.5/net/ipv4/inet_hashtables.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/inet_hashtables.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/inet_hashtables.c linux-2.6.29.6/net/ipv4/inet_hashtables.c +--- linux-2.6.29.6/net/ipv4/inet_hashtables.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/inet_hashtables.c 2009-07-09 22:13:40.000000000 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -40008,9 +40135,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/inet_hashtables.c linux-2.6.29.5/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.29.5/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.29.5/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.29.5/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-09 22:13:40.000000000 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -40020,9 +40147,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.29.5/ if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.29.5/net/ipv4/tcp_ipv4.c linux-2.6.29.5/net/ipv4/tcp_ipv4.c ---- linux-2.6.29.5/net/ipv4/tcp_ipv4.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/tcp_ipv4.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/tcp_ipv4.c linux-2.6.29.6/net/ipv4/tcp_ipv4.c +--- linux-2.6.29.6/net/ipv4/tcp_ipv4.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/tcp_ipv4.c 2009-07-09 22:13:40.000000000 -0400 @@ -1512,6 +1512,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc return 0; @@ -40043,9 +40170,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/tcp_ipv4.c linux-2.6.29.5/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.29.5/net/ipv4/tcp_minisocks.c linux-2.6.29.5/net/ipv4/tcp_minisocks.c ---- linux-2.6.29.5/net/ipv4/tcp_minisocks.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/tcp_minisocks.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/tcp_minisocks.c linux-2.6.29.6/net/ipv4/tcp_minisocks.c +--- linux-2.6.29.6/net/ipv4/tcp_minisocks.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/tcp_minisocks.c 2009-07-09 22:13:40.000000000 -0400 @@ -695,8 +695,11 @@ listen_overflow: embryonic_reset: @@ -40058,9 +40185,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/tcp_minisocks.c linux-2.6.29.5/net/ipv4/tcp_m inet_csk_reqsk_queue_drop(sk, req, prev); return NULL; -diff -urNp linux-2.6.29.5/net/ipv4/udp.c linux-2.6.29.5/net/ipv4/udp.c ---- linux-2.6.29.5/net/ipv4/udp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv4/udp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c +--- linux-2.6.29.6/net/ipv4/udp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv4/udp.c 2009-07-09 22:13:40.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -40119,9 +40246,9 @@ diff -urNp linux-2.6.29.5/net/ipv4/udp.c linux-2.6.29.5/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.29.5/net/ipv6/exthdrs.c linux-2.6.29.5/net/ipv6/exthdrs.c ---- linux-2.6.29.5/net/ipv6/exthdrs.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv6/exthdrs.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv6/exthdrs.c linux-2.6.29.6/net/ipv6/exthdrs.c +--- linux-2.6.29.6/net/ipv6/exthdrs.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv6/exthdrs.c 2009-07-09 22:13:40.000000000 -0400 @@ -630,7 +630,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -40131,9 +40258,9 @@ diff -urNp linux-2.6.29.5/net/ipv6/exthdrs.c linux-2.6.29.5/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.29.5/net/ipv6/raw.c linux-2.6.29.5/net/ipv6/raw.c ---- linux-2.6.29.5/net/ipv6/raw.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv6/raw.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv6/raw.c linux-2.6.29.6/net/ipv6/raw.c +--- linux-2.6.29.6/net/ipv6/raw.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv6/raw.c 2009-07-09 22:13:40.000000000 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -40143,9 +40270,9 @@ diff -urNp linux-2.6.29.5/net/ipv6/raw.c linux-2.6.29.5/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.29.5/net/ipv6/tcp_ipv6.c linux-2.6.29.5/net/ipv6/tcp_ipv6.c ---- linux-2.6.29.5/net/ipv6/tcp_ipv6.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv6/tcp_ipv6.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv6/tcp_ipv6.c linux-2.6.29.6/net/ipv6/tcp_ipv6.c +--- linux-2.6.29.6/net/ipv6/tcp_ipv6.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv6/tcp_ipv6.c 2009-07-09 22:13:40.000000000 -0400 @@ -1576,6 +1576,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; @@ -40166,9 +40293,9 @@ diff -urNp linux-2.6.29.5/net/ipv6/tcp_ipv6.c linux-2.6.29.5/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.29.5/net/ipv6/udp.c linux-2.6.29.5/net/ipv6/udp.c ---- linux-2.6.29.5/net/ipv6/udp.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/ipv6/udp.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/ipv6/udp.c linux-2.6.29.6/net/ipv6/udp.c +--- linux-2.6.29.6/net/ipv6/udp.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/ipv6/udp.c 2009-07-09 22:13:40.000000000 -0400 @@ -558,6 +558,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -40179,9 +40306,9 @@ diff -urNp linux-2.6.29.5/net/ipv6/udp.c linux-2.6.29.5/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.29.5/net/mac80211/ieee80211_i.h linux-2.6.29.5/net/mac80211/ieee80211_i.h ---- linux-2.6.29.5/net/mac80211/ieee80211_i.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/mac80211/ieee80211_i.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/mac80211/ieee80211_i.h linux-2.6.29.6/net/mac80211/ieee80211_i.h +--- linux-2.6.29.6/net/mac80211/ieee80211_i.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/mac80211/ieee80211_i.h 2009-07-09 22:13:40.000000000 -0400 @@ -562,7 +562,7 @@ struct ieee80211_local { unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES]; spinlock_t queue_stop_reason_lock; @@ -40191,9 +40318,9 @@ diff -urNp linux-2.6.29.5/net/mac80211/ieee80211_i.h linux-2.6.29.5/net/mac80211 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss; -diff -urNp linux-2.6.29.5/net/mac80211/iface.c linux-2.6.29.5/net/mac80211/iface.c ---- linux-2.6.29.5/net/mac80211/iface.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/mac80211/iface.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface.c +--- linux-2.6.29.6/net/mac80211/iface.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/mac80211/iface.c 2009-07-09 22:13:40.000000000 -0400 @@ -146,7 +146,7 @@ static int ieee80211_open(struct net_dev break; } @@ -40257,9 +40384,9 @@ diff -urNp linux-2.6.29.5/net/mac80211/iface.c linux-2.6.29.5/net/mac80211/iface if (netif_running(local->mdev)) dev_close(local->mdev); -diff -urNp linux-2.6.29.5/net/mac80211/main.c linux-2.6.29.5/net/mac80211/main.c ---- linux-2.6.29.5/net/mac80211/main.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/mac80211/main.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/mac80211/main.c linux-2.6.29.6/net/mac80211/main.c +--- linux-2.6.29.6/net/mac80211/main.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/mac80211/main.c 2009-07-09 22:13:40.000000000 -0400 @@ -233,7 +233,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -40269,9 +40396,9 @@ diff -urNp linux-2.6.29.5/net/mac80211/main.c linux-2.6.29.5/net/mac80211/main.c ret = local->ops->config(local_to_hw(local), changed); /* * Goal: -diff -urNp linux-2.6.29.5/net/mac80211/rate.c linux-2.6.29.5/net/mac80211/rate.c ---- linux-2.6.29.5/net/mac80211/rate.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/mac80211/rate.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/mac80211/rate.c linux-2.6.29.6/net/mac80211/rate.c +--- linux-2.6.29.6/net/mac80211/rate.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/mac80211/rate.c 2009-07-09 22:13:40.000000000 -0400 @@ -256,7 +256,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -40281,9 +40408,9 @@ diff -urNp linux-2.6.29.5/net/mac80211/rate.c linux-2.6.29.5/net/mac80211/rate.c return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.29.5/net/sctp/socket.c linux-2.6.29.5/net/sctp/socket.c ---- linux-2.6.29.5/net/sctp/socket.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/sctp/socket.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/sctp/socket.c linux-2.6.29.6/net/sctp/socket.c +--- linux-2.6.29.6/net/sctp/socket.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/sctp/socket.c 2009-07-09 22:13:40.000000000 -0400 @@ -1434,7 +1434,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -40301,9 +40428,9 @@ diff -urNp linux-2.6.29.5/net/sctp/socket.c linux-2.6.29.5/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.29.5/net/socket.c linux-2.6.29.5/net/socket.c ---- linux-2.6.29.5/net/socket.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/socket.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c +--- linux-2.6.29.6/net/socket.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/socket.c 2009-07-09 22:13:40.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/audit.h> #include <linux/wireless.h> @@ -40457,9 +40584,9 @@ diff -urNp linux-2.6.29.5/net/socket.c linux-2.6.29.5/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.29.5/net/unix/af_unix.c linux-2.6.29.5/net/unix/af_unix.c ---- linux-2.6.29.5/net/unix/af_unix.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/net/unix/af_unix.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/net/unix/af_unix.c linux-2.6.29.6/net/unix/af_unix.c +--- linux-2.6.29.6/net/unix/af_unix.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/net/unix/af_unix.c 2009-07-09 22:13:40.000000000 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -40517,9 +40644,9 @@ diff -urNp linux-2.6.29.5/net/unix/af_unix.c linux-2.6.29.5/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 -urNp linux-2.6.29.5/scripts/mod/modpost.c linux-2.6.29.5/scripts/mod/modpost.c ---- linux-2.6.29.5/scripts/mod/modpost.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/scripts/mod/modpost.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/scripts/mod/modpost.c linux-2.6.29.6/scripts/mod/modpost.c +--- linux-2.6.29.6/scripts/mod/modpost.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/scripts/mod/modpost.c 2009-07-09 22:13:40.000000000 -0400 @@ -830,6 +830,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -40556,9 +40683,9 @@ diff -urNp linux-2.6.29.5/scripts/mod/modpost.c linux-2.6.29.5/scripts/mod/modpo case NO_MISMATCH: /* To get warnings on missing members */ break; -diff -urNp linux-2.6.29.5/scripts/pnmtologo.c linux-2.6.29.5/scripts/pnmtologo.c ---- linux-2.6.29.5/scripts/pnmtologo.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/scripts/pnmtologo.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/scripts/pnmtologo.c linux-2.6.29.6/scripts/pnmtologo.c +--- linux-2.6.29.6/scripts/pnmtologo.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/scripts/pnmtologo.c 2009-07-09 22:13:40.000000000 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -40585,9 +40712,9 @@ diff -urNp linux-2.6.29.5/scripts/pnmtologo.c linux-2.6.29.5/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.29.5/security/commoncap.c linux-2.6.29.5/security/commoncap.c ---- linux-2.6.29.5/security/commoncap.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/security/commoncap.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/security/commoncap.c linux-2.6.29.6/security/commoncap.c +--- linux-2.6.29.6/security/commoncap.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/security/commoncap.c 2009-07-09 22:13:40.000000000 -0400 @@ -28,9 +28,11 @@ #include <linux/prctl.h> #include <linux/securebits.h> @@ -40601,10 +40728,10 @@ diff -urNp linux-2.6.29.5/security/commoncap.c linux-2.6.29.5/security/commoncap return 0; } -diff -urNp linux-2.6.29.5/security/Kconfig linux-2.6.29.5/security/Kconfig ---- linux-2.6.29.5/security/Kconfig 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/security/Kconfig 2009-06-12 23:57:32.000000000 -0400 -@@ -4,6 +4,464 @@ +diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig +--- linux-2.6.29.6/security/Kconfig 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/security/Kconfig 2009-07-10 07:23:12.000000000 -0400 +@@ -4,6 +4,481 @@ menu "Security options" @@ -41062,6 +41189,23 @@ diff -urNp linux-2.6.29.5/security/Kconfig linux-2.6.29.5/security/Kconfig + + Note that the current implementation provides the strictest checks + for the SLUB allocator. ++ ++config PAX_SECURE_VSYSCALL ++ bool "Harden vsyscall against exploitation" ++ depends on X86_64 ++ default y ++ help ++ By saying Y here, the kernel will make the vsyscall mapping ++ non-executable and redirect users of the fixed-address ++ vsyscall mapping to a more secure vDSO. This removes the ++ vsyscall mappings as targets of exploitation, particularly in ++ abusing them to easily transition from interrupt to process ++ context. ++ ++ You should enable this feature if the kernel being built is ++ not being used as a guest within VMWare ESX Server, as we have ++ been informed that this feature is incompatible with their ++ product. +endmenu + +endmenu @@ -41069,9 +41213,9 @@ diff -urNp linux-2.6.29.5/security/Kconfig linux-2.6.29.5/security/Kconfig config KEYS bool "Enable access key retention support" help -diff -urNp linux-2.6.29.5/sound/core/oss/pcm_oss.c linux-2.6.29.5/sound/core/oss/pcm_oss.c ---- linux-2.6.29.5/sound/core/oss/pcm_oss.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/core/oss/pcm_oss.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/core/oss/pcm_oss.c linux-2.6.29.6/sound/core/oss/pcm_oss.c +--- linux-2.6.29.6/sound/core/oss/pcm_oss.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/core/oss/pcm_oss.c 2009-07-09 22:13:40.000000000 -0400 @@ -2929,8 +2929,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -41083,9 +41227,9 @@ diff -urNp linux-2.6.29.5/sound/core/oss/pcm_oss.c linux-2.6.29.5/sound/core/oss #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.29.5/sound/core/seq/seq_lock.h linux-2.6.29.5/sound/core/seq/seq_lock.h ---- linux-2.6.29.5/sound/core/seq/seq_lock.h 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/core/seq/seq_lock.h 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/core/seq/seq_lock.h linux-2.6.29.6/sound/core/seq/seq_lock.h +--- linux-2.6.29.6/sound/core/seq/seq_lock.h 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/core/seq/seq_lock.h 2009-07-09 22:13:40.000000000 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -41101,9 +41245,9 @@ diff -urNp linux-2.6.29.5/sound/core/seq/seq_lock.h linux-2.6.29.5/sound/core/se #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.29.5/sound/pci/ac97/ac97_patch.c linux-2.6.29.5/sound/pci/ac97/ac97_patch.c ---- linux-2.6.29.5/sound/pci/ac97/ac97_patch.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/pci/ac97/ac97_patch.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/pci/ac97/ac97_patch.c linux-2.6.29.6/sound/pci/ac97/ac97_patch.c +--- linux-2.6.29.6/sound/pci/ac97/ac97_patch.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/pci/ac97/ac97_patch.c 2009-07-09 22:13:40.000000000 -0400 @@ -1498,7 +1498,7 @@ static const struct snd_ac97_res_table a { AC97_VIDEO, 0x9f1f }, { AC97_AUX, 0x9f1f }, @@ -41122,9 +41266,9 @@ diff -urNp linux-2.6.29.5/sound/pci/ac97/ac97_patch.c linux-2.6.29.5/sound/pci/a }; static int patch_lm4550(struct snd_ac97 *ac97) -diff -urNp linux-2.6.29.5/sound/pci/ens1370.c linux-2.6.29.5/sound/pci/ens1370.c ---- linux-2.6.29.5/sound/pci/ens1370.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/pci/ens1370.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/pci/ens1370.c linux-2.6.29.6/sound/pci/ens1370.c +--- linux-2.6.29.6/sound/pci/ens1370.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/pci/ens1370.c 2009-07-09 22:13:40.000000000 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */ { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */ @@ -41134,9 +41278,9 @@ diff -urNp linux-2.6.29.5/sound/pci/ens1370.c linux-2.6.29.5/sound/pci/ens1370.c }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.29.5/sound/pci/intel8x0.c linux-2.6.29.5/sound/pci/intel8x0.c ---- linux-2.6.29.5/sound/pci/intel8x0.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/pci/intel8x0.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/pci/intel8x0.c linux-2.6.29.6/sound/pci/intel8x0.c +--- linux-2.6.29.6/sound/pci/intel8x0.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/pci/intel8x0.c 2009-07-09 22:13:40.000000000 -0400 @@ -443,7 +443,7 @@ static struct pci_device_id snd_intel8x0 { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */ @@ -41155,9 +41299,9 @@ diff -urNp linux-2.6.29.5/sound/pci/intel8x0.c linux-2.6.29.5/sound/pci/intel8x0 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.29.5/sound/pci/intel8x0m.c linux-2.6.29.5/sound/pci/intel8x0m.c ---- linux-2.6.29.5/sound/pci/intel8x0m.c 2009-05-18 19:52:34.000000000 -0400 -+++ linux-2.6.29.5/sound/pci/intel8x0m.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/sound/pci/intel8x0m.c linux-2.6.29.6/sound/pci/intel8x0m.c +--- linux-2.6.29.6/sound/pci/intel8x0m.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/sound/pci/intel8x0m.c 2009-07-09 22:13:40.000000000 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */ @@ -41176,9 +41320,9 @@ diff -urNp linux-2.6.29.5/sound/pci/intel8x0m.c linux-2.6.29.5/sound/pci/intel8x }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.29.5/virt/kvm/kvm_main.c linux-2.6.29.5/virt/kvm/kvm_main.c ---- linux-2.6.29.5/virt/kvm/kvm_main.c 2009-06-12 23:55:00.000000000 -0400 -+++ linux-2.6.29.5/virt/kvm/kvm_main.c 2009-06-12 23:57:32.000000000 -0400 +diff -urNp linux-2.6.29.6/virt/kvm/kvm_main.c linux-2.6.29.6/virt/kvm/kvm_main.c +--- linux-2.6.29.6/virt/kvm/kvm_main.c 2009-07-02 19:41:20.000000000 -0400 ++++ linux-2.6.29.6/virt/kvm/kvm_main.c 2009-07-09 22:13:40.000000000 -0400 @@ -2059,6 +2059,9 @@ static struct miscdevice kvm_dev = { KVM_MINOR, "kvm", |