diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-25 11:25:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-10-25 11:37:43 +0000 |
| commit | 301b8c91458b6c977e20e0ae06b2df5ba008c303 (patch) | |
| tree | 0e154b18bd5a171d17c47e5b7bcd3f359cccd7b4 /main | |
| parent | b609077771fef3922837982a088b8901bb3f4e90 (diff) | |
| download | aports-301b8c91458b6c977e20e0ae06b2df5ba008c303.tar.bz2 aports-301b8c91458b6c977e20e0ae06b2df5ba008c303.tar.xz | |
main/linux-grsec: fix firmware and upgrade to grsecurity-2.2.0-2.6.32.24-201010232009
Diffstat (limited to 'main')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 10 | ||||
| -rw-r--r-- | main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010232009.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010121028.patch) | 3196 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 3 |
3 files changed, 1845 insertions, 1364 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index e861009c74..3ec14830b3 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.32.24 _kernver=2.6.32 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= 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.2.0-2.6.32.24-201010121028.patch + grsecurity-2.2.0-2.6.32.24-201010232009.patch 0001-grsec-revert-conflicting-flow-cache-changes.patch 0002-gre-fix-hard-header-destination-address-checking.patch 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -85,7 +85,7 @@ build() { package() { cd "$srcdir"/build mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules - make modules_install install \ + make modules_install firmware_install install \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_PATH="$pkgdir"/boot @@ -150,7 +150,7 @@ firmware() { md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 e3346e3b4b92f048b8ecded829f45cdf patch-2.6.32.24.bz2 -09ea9b3a8d3f3df001d306ef56e26068 grsecurity-2.2.0-2.6.32.24-201010121028.patch +cee569fe23aac484a4352e3e97987d23 grsecurity-2.2.0-2.6.32.24-201010232009.patch 1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch @@ -175,4 +175,4 @@ ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch -f9b5bc9c592bf5a4a9ac4cd676c369d2 kernelconfig.x86" +888d09239837d7544034b60107fdd019 kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010121028.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010232009.patch index 52451a14f3..35712f0b36 100644 --- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010121028.patch +++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010232009.patch @@ -1,6 +1,6 @@ diff -urNp linux-2.6.32.24/arch/alpha/include/asm/elf.h linux-2.6.32.24/arch/alpha/include/asm/elf.h --- linux-2.6.32.24/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/alpha/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/alpha/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -17,7 +17,7 @@ diff -urNp linux-2.6.32.24/arch/alpha/include/asm/elf.h linux-2.6.32.24/arch/alp linker to call DT_FINI functions for shared libraries that have diff -urNp linux-2.6.32.24/arch/alpha/include/asm/pgtable.h linux-2.6.32.24/arch/alpha/include/asm/pgtable.h --- linux-2.6.32.24/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/alpha/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/alpha/include/asm/pgtable.h 2010-10-23 19:59:19.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) @@ -38,7 +38,7 @@ diff -urNp linux-2.6.32.24/arch/alpha/include/asm/pgtable.h linux-2.6.32.24/arch #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) diff -urNp linux-2.6.32.24/arch/alpha/kernel/module.c linux-2.6.32.24/arch/alpha/kernel/module.c --- linux-2.6.32.24/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/alpha/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/alpha/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -50,7 +50,7 @@ diff -urNp linux-2.6.32.24/arch/alpha/kernel/module.c linux-2.6.32.24/arch/alpha for (i = 0; i < n; i++) { diff -urNp linux-2.6.32.24/arch/alpha/kernel/osf_sys.c linux-2.6.32.24/arch/alpha/kernel/osf_sys.c --- linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-10-23 19:59:19.000000000 -0400 @@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -84,7 +84,7 @@ diff -urNp linux-2.6.32.24/arch/alpha/kernel/osf_sys.c linux-2.6.32.24/arch/alph diff -urNp linux-2.6.32.24/arch/alpha/mm/fault.c linux-2.6.32.24/arch/alpha/mm/fault.c --- linux-2.6.32.24/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/alpha/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/alpha/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -243,7 +243,7 @@ diff -urNp linux-2.6.32.24/arch/alpha/mm/fault.c linux-2.6.32.24/arch/alpha/mm/f if (!(vma->vm_flags & (VM_READ | VM_WRITE))) diff -urNp linux-2.6.32.24/arch/arm/include/asm/elf.h linux-2.6.32.24/arch/arm/include/asm/elf.h --- linux-2.6.32.24/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t 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. */ @@ -262,7 +262,7 @@ diff -urNp linux-2.6.32.24/arch/arm/include/asm/elf.h linux-2.6.32.24/arch/arm/i registered with atexit, as per the SVR4 ABI. A value of 0 means we diff -urNp linux-2.6.32.24/arch/arm/include/asm/kmap_types.h linux-2.6.32.24/arch/arm/include/asm/kmap_types.h --- linux-2.6.32.24/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/include/asm/kmap_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -273,7 +273,7 @@ diff -urNp linux-2.6.32.24/arch/arm/include/asm/kmap_types.h linux-2.6.32.24/arc diff -urNp linux-2.6.32.24/arch/arm/include/asm/uaccess.h linux-2.6.32.24/arch/arm/include/asm/uaccess.h --- linux-2.6.32.24/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) @@ -296,7 +296,7 @@ diff -urNp linux-2.6.32.24/arch/arm/include/asm/uaccess.h linux-2.6.32.24/arch/a return n; diff -urNp linux-2.6.32.24/arch/arm/kernel/kgdb.c linux-2.6.32.24/arch/arm/kernel/kgdb.c --- linux-2.6.32.24/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -308,7 +308,7 @@ diff -urNp linux-2.6.32.24/arch/arm/kernel/kgdb.c linux-2.6.32.24/arch/arm/kerne #else /* ! __ARMEB__ */ diff -urNp linux-2.6.32.24/arch/arm/mach-at91/pm.c linux-2.6.32.24/arch/arm/mach-at91/pm.c --- linux-2.6.32.24/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-at91/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-at91/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -320,7 +320,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-at91/pm.c linux-2.6.32.24/arch/arm/mach .enter = at91_pm_enter, diff -urNp linux-2.6.32.24/arch/arm/mach-omap1/pm.c linux-2.6.32.24/arch/arm/mach-omap1/pm.c --- linux-2.6.32.24/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-omap1/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-omap1/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -332,7 +332,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-omap1/pm.c linux-2.6.32.24/arch/arm/mac .finish = omap_pm_finish, diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c --- linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c 2010-10-23 19:59:19.000000000 -0400 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -344,7 +344,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.24/arch/arm .finish = omap2_pm_finish, diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c --- linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c 2010-10-23 19:59:19.000000000 -0400 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -356,7 +356,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.24/arch/arm .prepare = omap3_pm_prepare, diff -urNp linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c --- linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -368,7 +368,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c linux-2.6.32.24/arch/arm/m }; diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/pm.c linux-2.6.32.24/arch/arm/mach-pxa/pm.c --- linux-2.6.32.24/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-pxa/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-pxa/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -380,7 +380,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/pm.c linux-2.6.32.24/arch/arm/mach- .prepare = pxa_pm_prepare, diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c --- linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -392,7 +392,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.24/arch/a .enter = corgi_pxa_pm_enter, diff -urNp linux-2.6.32.24/arch/arm/mach-sa1100/pm.c linux-2.6.32.24/arch/arm/mach-sa1100/pm.c --- linux-2.6.32.24/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mach-sa1100/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mach-sa1100/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -404,7 +404,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mach-sa1100/pm.c linux-2.6.32.24/arch/arm/ma }; diff -urNp linux-2.6.32.24/arch/arm/mm/fault.c linux-2.6.32.24/arch/arm/mm/fault.c --- linux-2.6.32.24/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -455,7 +455,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mm/fault.c linux-2.6.32.24/arch/arm/mm/fault * diff -urNp linux-2.6.32.24/arch/arm/mm/mmap.c linux-2.6.32.24/arch/arm/mm/mmap.c --- linux-2.6.32.24/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/mm/mmap.c 2010-10-23 19:59:19.000000000 -0400 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -507,7 +507,7 @@ diff -urNp linux-2.6.32.24/arch/arm/mm/mmap.c linux-2.6.32.24/arch/arm/mm/mmap.c */ diff -urNp linux-2.6.32.24/arch/arm/plat-s3c/pm.c linux-2.6.32.24/arch/arm/plat-s3c/pm.c --- linux-2.6.32.24/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/arm/plat-s3c/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/arm/plat-s3c/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -519,7 +519,7 @@ diff -urNp linux-2.6.32.24/arch/arm/plat-s3c/pm.c linux-2.6.32.24/arch/arm/plat- .finish = s3c_pm_finish, diff -urNp linux-2.6.32.24/arch/avr32/include/asm/elf.h linux-2.6.32.24/arch/avr32/include/asm/elf.h --- linux-2.6.32.24/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/avr32/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/avr32/include/asm/elf.h 2010-10-23 19:59:19.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. */ @@ -538,7 +538,7 @@ diff -urNp linux-2.6.32.24/arch/avr32/include/asm/elf.h linux-2.6.32.24/arch/avr instruction set this CPU supports. This could be done in user space, diff -urNp linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h --- linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -551,7 +551,7 @@ diff -urNp linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h linux-2.6.32.24/a #undef D diff -urNp linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c --- linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -176,7 +176,7 @@ out: return 0; } @@ -563,7 +563,7 @@ diff -urNp linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c linux-2.6.32.24/arch/avr3 }; diff -urNp linux-2.6.32.24/arch/avr32/mm/fault.c linux-2.6.32.24/arch/avr32/mm/fault.c --- linux-2.6.32.24/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/avr32/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/avr32/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -607,7 +607,7 @@ diff -urNp linux-2.6.32.24/arch/avr32/mm/fault.c linux-2.6.32.24/arch/avr32/mm/f "sp %08lx ecr %lu\n", diff -urNp linux-2.6.32.24/arch/blackfin/kernel/kgdb.c linux-2.6.32.24/arch/blackfin/kernel/kgdb.c --- linux-2.6.32.24/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/blackfin/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/blackfin/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto return -1; /* this means that we do not want to exit from the handler */ } @@ -619,7 +619,7 @@ diff -urNp linux-2.6.32.24/arch/blackfin/kernel/kgdb.c linux-2.6.32.24/arch/blac .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, diff -urNp linux-2.6.32.24/arch/blackfin/mach-common/pm.c linux-2.6.32.24/arch/blackfin/mach-common/pm.c --- linux-2.6.32.24/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/blackfin/mach-common/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/blackfin/mach-common/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -631,7 +631,7 @@ diff -urNp linux-2.6.32.24/arch/blackfin/mach-common/pm.c linux-2.6.32.24/arch/b }; diff -urNp linux-2.6.32.24/arch/frv/include/asm/kmap_types.h linux-2.6.32.24/arch/frv/include/asm/kmap_types.h --- linux-2.6.32.24/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/frv/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/frv/include/asm/kmap_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -642,7 +642,7 @@ diff -urNp linux-2.6.32.24/arch/frv/include/asm/kmap_types.h linux-2.6.32.24/arc diff -urNp linux-2.6.32.24/arch/frv/mm/elf-fdpic.c linux-2.6.32.24/arch/frv/mm/elf-fdpic.c --- linux-2.6.32.24/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/frv/mm/elf-fdpic.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/frv/mm/elf-fdpic.c 2010-10-23 19:59:19.000000000 -0400 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr = PAGE_ALIGN(addr); @@ -673,7 +673,7 @@ diff -urNp linux-2.6.32.24/arch/frv/mm/elf-fdpic.c linux-2.6.32.24/arch/frv/mm/e } diff -urNp linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c --- linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -694,7 +694,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.24/arch return &swiotlb_dma_ops; diff -urNp linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c --- linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -715,7 +715,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.24/arch/ .map_page = sba_map_page, diff -urNp linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c --- linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c 2010-10-23 19:59:19.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)) @@ -732,7 +732,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.24/arch/ia diff -urNp linux-2.6.32.24/arch/ia64/ia32/ia32priv.h linux-2.6.32.24/arch/ia64/ia32/ia32priv.h --- linux-2.6.32.24/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/ia32/ia32priv.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/ia32/ia32priv.h 2010-10-23 19:59:19.000000000 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -751,7 +751,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/ia32/ia32priv.h linux-2.6.32.24/arch/ia64/i diff -urNp linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h --- linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h 2010-10-23 19:59:19.000000000 -0400 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -797,7 +797,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.24/a diff -urNp linux-2.6.32.24/arch/ia64/include/asm/elf.h linux-2.6.32.24/arch/ia64/include/asm/elf.h --- linux-2.6.32.24/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -814,7 +814,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/elf.h linux-2.6.32.24/arch/ia64 /* IA-64 relocations: */ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/machvec.h linux-2.6.32.24/arch/ia64/include/asm/machvec.h --- linux-2.6.32.24/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/include/asm/machvec.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/include/asm/machvec.h 2010-10-23 19:59:19.000000000 -0400 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -835,7 +835,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/machvec.h linux-2.6.32.24/arch/ * Define default versions so we can extend machvec for new platforms without having diff -urNp linux-2.6.32.24/arch/ia64/include/asm/pgtable.h linux-2.6.32.24/arch/ia64/include/asm/pgtable.h --- linux-2.6.32.24/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/include/asm/pgtable.h 2010-10-23 19:59:19.000000000 -0400 @@ -12,7 +12,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -865,7 +865,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/pgtable.h linux-2.6.32.24/arch/ #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) diff -urNp linux-2.6.32.24/arch/ia64/include/asm/uaccess.h linux-2.6.32.24/arch/ia64/include/asm/uaccess.h --- linux-2.6.32.24/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -886,7 +886,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/include/asm/uaccess.h linux-2.6.32.24/arch/ }) diff -urNp linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c --- linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c 2010-10-23 19:59:19.000000000 -0400 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -907,7 +907,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c linux-2.6.32.24/arch/i } diff -urNp linux-2.6.32.24/arch/ia64/kernel/module.c linux-2.6.32.24/arch/ia64/kernel/module.c --- linux-2.6.32.24/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -998,7 +998,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/module.c linux-2.6.32.24/arch/ia64/k } diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-dma.c linux-2.6.32.24/arch/ia64/kernel/pci-dma.c --- linux-2.6.32.24/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/pci-dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -1052,7 +1052,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-dma.c linux-2.6.32.24/arch/ia64/ * The order of these functions is important for diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c --- linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c 2010-10-23 19:59:19.000000000 -0400 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -1064,7 +1064,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.24/arch/i .map_page = swiotlb_map_page, diff -urNp linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c --- linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c 2010-10-23 19:59:19.000000000 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1099,7 +1099,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c linux-2.6.32.24/arch/ia64 return addr; diff -urNp linux-2.6.32.24/arch/ia64/kernel/topology.c linux-2.6.32.24/arch/ia64/kernel/topology.c --- linux-2.6.32.24/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/topology.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/topology.c 2010-10-23 19:59:19.000000000 -0400 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -1111,7 +1111,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/topology.c linux-2.6.32.24/arch/ia64 diff -urNp linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S --- linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S 2010-10-23 19:59:19.000000000 -0400 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1123,7 +1123,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.24/arch/i */ diff -urNp linux-2.6.32.24/arch/ia64/mm/fault.c linux-2.6.32.24/arch/ia64/mm/fault.c --- linux-2.6.32.24/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1175,7 +1175,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/mm/fault.c linux-2.6.32.24/arch/ia64/mm/fau * If for any reason at all we couldn't handle the fault, make diff -urNp linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c --- linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c 2010-10-23 19:59:19.000000000 -0400 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1187,7 +1187,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c linux-2.6.32.24/arch/ia64/ } diff -urNp linux-2.6.32.24/arch/ia64/mm/init.c linux-2.6.32.24/arch/ia64/mm/init.c --- linux-2.6.32.24/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/mm/init.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/mm/init.c 2010-10-23 19:59:19.000000000 -0400 @@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -1210,7 +1210,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/mm/init.c linux-2.6.32.24/arch/ia64/mm/init if (insert_vm_struct(current->mm, vma)) { diff -urNp linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c --- linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1222,7 +1222,7 @@ diff -urNp linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.24/arch/ia64/ .map_page = sn_dma_map_page, diff -urNp linux-2.6.32.24/arch/m32r/lib/usercopy.c linux-2.6.32.24/arch/m32r/lib/usercopy.c --- linux-2.6.32.24/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/m32r/lib/usercopy.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/m32r/lib/usercopy.c 2010-10-23 19:59:19.000000000 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1245,7 +1245,7 @@ diff -urNp linux-2.6.32.24/arch/m32r/lib/usercopy.c linux-2.6.32.24/arch/m32r/li __copy_user_zeroing(to,from,n); diff -urNp linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c --- linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1257,7 +1257,7 @@ diff -urNp linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c linux-2.6.32.24/arch .enter = db1x_pm_enter, diff -urNp linux-2.6.32.24/arch/mips/include/asm/elf.h linux-2.6.32.24/arch/mips/include/asm/elf.h --- linux-2.6.32.24/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1272,7 +1272,7 @@ diff -urNp linux-2.6.32.24/arch/mips/include/asm/elf.h linux-2.6.32.24/arch/mips #endif /* _ASM_ELF_H */ diff -urNp linux-2.6.32.24/arch/mips/include/asm/page.h linux-2.6.32.24/arch/mips/include/asm/page.h --- linux-2.6.32.24/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/include/asm/page.h 2010-10-23 19:59:19.000000000 -0400 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1284,7 +1284,7 @@ diff -urNp linux-2.6.32.24/arch/mips/include/asm/page.h linux-2.6.32.24/arch/mip #define pte_val(x) ((x).pte) diff -urNp linux-2.6.32.24/arch/mips/include/asm/system.h linux-2.6.32.24/arch/mips/include/asm/system.h --- linux-2.6.32.24/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/include/asm/system.h 2010-10-23 19:59:19.000000000 -0400 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1295,7 +1295,7 @@ diff -urNp linux-2.6.32.24/arch/mips/include/asm/system.h linux-2.6.32.24/arch/m #endif /* _ASM_SYSTEM_H */ diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c --- linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c 2010-10-23 19:59:19.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) @@ -1312,7 +1312,7 @@ diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.24/arch #include <linux/elfcore.h> diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c --- linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c 2010-10-23 19:59:19.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) @@ -1329,7 +1329,7 @@ diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.24/arch /* diff -urNp linux-2.6.32.24/arch/mips/kernel/kgdb.c linux-2.6.32.24/arch/mips/kernel/kgdb.c --- linux-2.6.32.24/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1340,7 +1340,7 @@ diff -urNp linux-2.6.32.24/arch/mips/kernel/kgdb.c linux-2.6.32.24/arch/mips/ker /* diff -urNp linux-2.6.32.24/arch/mips/kernel/process.c linux-2.6.32.24/arch/mips/kernel/process.c --- linux-2.6.32.24/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/kernel/process.c 2010-10-23 19:59:19.000000000 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1359,7 +1359,7 @@ diff -urNp linux-2.6.32.24/arch/mips/kernel/process.c linux-2.6.32.24/arch/mips/ -} diff -urNp linux-2.6.32.24/arch/mips/kernel/syscall.c linux-2.6.32.24/arch/mips/kernel/syscall.c --- linux-2.6.32.24/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/kernel/syscall.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/kernel/syscall.c 2010-10-23 19:59:19.000000000 -0400 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1396,13 +1396,13 @@ diff -urNp linux-2.6.32.24/arch/mips/kernel/syscall.c linux-2.6.32.24/arch/mips/ if (do_color_align) diff -urNp linux-2.6.32.24/arch/mips/mm/fault.c linux-2.6.32.24/arch/mips/mm/fault.c --- linux-2.6.32.24/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/mips/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/mips/mm/fault.c 2010-10-23 19:59:24.000000000 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ +#ifdef CONFIG_PAX_PAGEEXEC -+void pax_report_insns(void *pc) ++void pax_report_insns(void *pc, void *sp) +{ + unsigned long i; + @@ -1423,7 +1423,7 @@ diff -urNp linux-2.6.32.24/arch/mips/mm/fault.c linux-2.6.32.24/arch/mips/mm/fau * and the problem, and then passes it off to one of the appropriate diff -urNp linux-2.6.32.24/arch/parisc/include/asm/elf.h linux-2.6.32.24/arch/parisc/include/asm/elf.h --- linux-2.6.32.24/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1440,7 +1440,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/include/asm/elf.h linux-2.6.32.24/arch/pa but it's not easy, and we've already done it here. */ diff -urNp linux-2.6.32.24/arch/parisc/include/asm/pgtable.h linux-2.6.32.24/arch/parisc/include/asm/pgtable.h --- linux-2.6.32.24/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/include/asm/pgtable.h 2010-10-23 19:59:19.000000000 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1461,7 +1461,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/include/asm/pgtable.h linux-2.6.32.24/arc #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) diff -urNp linux-2.6.32.24/arch/parisc/kernel/module.c linux-2.6.32.24/arch/parisc/kernel/module.c --- linux-2.6.32.24/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1564,7 +1564,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/kernel/module.c linux-2.6.32.24/arch/pari me->arch.unwind_section, table, end, gp); diff -urNp linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c --- linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c 2010-10-23 19:59:19.000000000 -0400 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1594,7 +1594,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c linux-2.6.32.24/arch/ addr = get_shared_area(filp->f_mapping, addr, len, pgoff); diff -urNp linux-2.6.32.24/arch/parisc/kernel/traps.c linux-2.6.32.24/arch/parisc/kernel/traps.c --- linux-2.6.32.24/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/kernel/traps.c 2010-10-23 19:59:19.000000000 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1608,7 +1608,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/kernel/traps.c linux-2.6.32.24/arch/paris diff -urNp linux-2.6.32.24/arch/parisc/mm/fault.c linux-2.6.32.24/arch/parisc/mm/fault.c --- linux-2.6.32.24/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/parisc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/parisc/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1780,7 +1780,7 @@ diff -urNp linux-2.6.32.24/arch/parisc/mm/fault.c linux-2.6.32.24/arch/parisc/mm * If for any reason at all we couldn't handle the fault, make diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/device.h linux-2.6.32.24/arch/powerpc/include/asm/device.h --- linux-2.6.32.24/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/device.h 2010-10-23 19:59:19.000000000 -0400 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1792,7 +1792,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/device.h linux-2.6.32.24/arc * When an iommu is in use, dma_data is used as a ptr to the base of the diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h --- linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h 2010-10-23 19:59:19.000000000 -0400 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -1861,7 +1861,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2 return dma_ops->mapping_error(dev, dma_addr); diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/elf.h linux-2.6.32.24/arch/powerpc/include/asm/elf.h --- linux-2.6.32.24/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 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. */ @@ -1896,7 +1896,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/elf.h linux-2.6.32.24/arch/p /* diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/iommu.h linux-2.6.32.24/arch/powerpc/include/asm/iommu.h --- linux-2.6.32.24/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/iommu.h 2010-10-23 19:59:19.000000000 -0400 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi extern void iommu_init_early_dart(void); extern void iommu_init_early_pasemi(void); @@ -1909,7 +1909,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/iommu.h linux-2.6.32.24/arch extern void pci_direct_iommu_init(void); diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h --- linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1920,7 +1920,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.24 diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page_64.h linux-2.6.32.24/arch/powerpc/include/asm/page_64.h --- linux-2.6.32.24/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/page_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/page_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1944,7 +1944,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page_64.h linux-2.6.32.24/ar diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page.h linux-2.6.32.24/arch/powerpc/include/asm/page.h --- linux-2.6.32.24/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/page.h 2010-10-23 19:59:19.000000000 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1969,7 +1969,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page.h linux-2.6.32.24/arch/ #undef STRICT_MM_TYPECHECKS diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pci.h linux-2.6.32.24/arch/powerpc/include/asm/pci.h --- linux-2.6.32.24/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/pci.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/pci.h 2010-10-23 19:59:19.000000000 -0400 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1983,7 +1983,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pci.h linux-2.6.32.24/arch/p #define get_pci_dma_ops() NULL diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h --- linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h 2010-10-23 19:59:19.000000000 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -1994,7 +1994,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.24 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/reg.h linux-2.6.32.24/arch/powerpc/include/asm/reg.h --- linux-2.6.32.24/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/reg.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/reg.h 2010-10-23 19:59:19.000000000 -0400 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2005,7 +2005,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/reg.h linux-2.6.32.24/arch/p #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h --- linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h 2010-10-23 19:59:19.000000000 -0400 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -2017,7 +2017,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.24/ar diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h --- linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2197,7 +2197,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h linux-2.6.32.24/ar static inline unsigned long clear_user(void __user *addr, unsigned long size) diff -urNp linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c --- linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c 2010-10-23 19:59:19.000000000 -0400 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2209,7 +2209,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.24/arch/ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma.c linux-2.6.32.24/arch/powerpc/kernel/dma.c --- linux-2.6.32.24/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/dma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2221,7 +2221,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma.c linux-2.6.32.24/arch/powerp .map_sg = dma_direct_map_sg, diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c --- linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2233,7 +2233,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.24/arch/ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c --- linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c 2010-10-23 19:59:19.000000000 -0400 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2245,7 +2245,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.24/arc .map_sg = swiotlb_map_sg_attrs, diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S --- linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S 2010-10-23 19:59:19.000000000 -0400 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2266,7 +2266,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.24/ bl .bad_page_fault diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S --- linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S 2010-10-23 19:59:19.000000000 -0400 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2281,7 +2281,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.24/ lwz r4,_DAR(r1) diff -urNp linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c --- linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c 2010-10-23 19:59:19.000000000 -0400 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2293,7 +2293,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c linux-2.6.32.24/arch/po .map_sg = ibmebus_map_sg, diff -urNp linux-2.6.32.24/arch/powerpc/kernel/kgdb.c linux-2.6.32.24/arch/powerpc/kernel/kgdb.c --- linux-2.6.32.24/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2314,7 +2314,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/kgdb.c linux-2.6.32.24/arch/power diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module_32.c linux-2.6.32.24/arch/powerpc/kernel/module_32.c --- linux-2.6.32.24/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/module_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/module_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2346,7 +2346,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module_32.c linux-2.6.32.24/arch/ while (entry->jump[0]) { diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module.c linux-2.6.32.24/arch/powerpc/kernel/module.c --- linux-2.6.32.24/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2388,7 +2388,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module.c linux-2.6.32.24/arch/pow const char *name) diff -urNp linux-2.6.32.24/arch/powerpc/kernel/pci-common.c linux-2.6.32.24/arch/powerpc/kernel/pci-common.c --- linux-2.6.32.24/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/pci-common.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/pci-common.c 2010-10-23 19:59:19.000000000 -0400 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2409,7 +2409,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/pci-common.c linux-2.6.32.24/arch } diff -urNp linux-2.6.32.24/arch/powerpc/kernel/process.c linux-2.6.32.24/arch/powerpc/kernel/process.c --- linux-2.6.32.24/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/process.c 2010-10-23 19:59:19.000000000 -0400 @@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; @@ -2464,7 +2464,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/process.c linux-2.6.32.24/arch/po -} diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_32.c linux-2.6.32.24/arch/powerpc/kernel/signal_32.c --- linux-2.6.32.24/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/signal_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/signal_32.c 2010-10-23 19:59:19.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; @@ -2476,7 +2476,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_32.c linux-2.6.32.24/arch/ regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_64.c linux-2.6.32.24/arch/powerpc/kernel/signal_64.c --- linux-2.6.32.24/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/signal_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/signal_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2488,7 +2488,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_64.c linux-2.6.32.24/arch/ err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); diff -urNp linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c --- linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c 2010-10-23 19:59:19.000000000 -0400 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2504,7 +2504,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.24/arch/ } diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vdso.c linux-2.6.32.24/arch/powerpc/kernel/vdso.c --- linux-2.6.32.24/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/vdso.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/vdso.c 2010-10-23 19:59:19.000000000 -0400 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2533,7 +2533,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vdso.c linux-2.6.32.24/arch/power goto fail_mmapsem; diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vio.c linux-2.6.32.24/arch/powerpc/kernel/vio.c --- linux-2.6.32.24/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/kernel/vio.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/kernel/vio.c 2010-10-23 19:59:19.000000000 -0400 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2558,7 +2558,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vio.c linux-2.6.32.24/arch/powerp diff -urNp linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c --- linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2592,7 +2592,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c linux-2.6.32.24/arch/p diff -urNp linux-2.6.32.24/arch/powerpc/mm/fault.c linux-2.6.32.24/arch/powerpc/mm/fault.c --- linux-2.6.32.24/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/mm/fault.c 2010-10-23 19:59:19.000000000 -0400 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -2699,7 +2699,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/fault.c linux-2.6.32.24/arch/powerpc/ } diff -urNp linux-2.6.32.24/arch/powerpc/mm/mmap_64.c linux-2.6.32.24/arch/powerpc/mm/mmap_64.c --- linux-2.6.32.24/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/mm/mmap_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/mm/mmap_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2725,8 +2725,8 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/mmap_64.c linux-2.6.32.24/arch/powerp } diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/mm/slice.c --- linux-2.6.32.24/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/mm/slice.c 2010-09-17 18:34:04.000000000 -0400 -@@ -98,10 +98,9 @@ static int slice_area_is_free(struct mm_ ++++ linux-2.6.32.24/arch/powerpc/mm/slice.c 2010-10-23 20:03:00.000000000 -0400 +@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; vma = find_vma(mm, addr); @@ -2734,11 +2734,8 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/ + return check_heap_stack_gap(vma, addr, len); } --static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice) - { - return !slice_area_is_free(mm, slice << SLICE_LOW_SHIFT, - 1ul << SLICE_LOW_SHIFT); -@@ -256,7 +255,7 @@ full_search: + static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice) +@@ -256,7 +256,7 @@ full_search: addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT); continue; } @@ -2747,7 +2744,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/ /* * Remember the place where we stopped the search: */ -@@ -336,7 +335,7 @@ static unsigned long slice_find_area_top +@@ -336,7 +336,7 @@ static unsigned long slice_find_area_top * return with success: */ vma = find_vma(mm, addr); @@ -2756,7 +2753,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/ /* remember the address as a hint for next time */ if (use_cache) mm->free_area_cache = addr; -@@ -426,6 +425,11 @@ unsigned long slice_get_unmapped_area(un +@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2770,7 +2767,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/ addr = _ALIGN_UP(addr, 1ul << pshift); diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c --- linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2782,7 +2779,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 .prepare = lite5200_pm_prepare, diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c --- linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2794,7 +2791,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 .enter = mpc52xx_pm_enter, diff -urNp linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c --- linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c 2010-10-23 19:59:19.000000000 -0400 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2806,7 +2803,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.24 .enter = mpc83xx_suspend_enter, diff -urNp linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c --- linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -2818,7 +2815,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.24/a .map_sg = dma_fixed_map_sg, diff -urNp linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c --- linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c 2010-10-23 19:59:19.000000000 -0400 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2839,7 +2836,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. .map_sg = ps3_ioc0_map_sg, diff -urNp linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig --- linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig 2010-10-23 19:59:19.000000000 -0400 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -2851,7 +2848,7 @@ diff -urNp linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2 select RTAS_ERROR_LOGGING diff -urNp linux-2.6.32.24/arch/s390/include/asm/elf.h linux-2.6.32.24/arch/s390/include/asm/elf.h --- linux-2.6.32.24/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; that it will "exec", and that there is sufficient room for the brk. */ #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) @@ -2868,7 +2865,7 @@ diff -urNp linux-2.6.32.24/arch/s390/include/asm/elf.h linux-2.6.32.24/arch/s390 diff -urNp linux-2.6.32.24/arch/s390/include/asm/setup.h linux-2.6.32.24/arch/s390/include/asm/setup.h --- linux-2.6.32.24/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/include/asm/setup.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/include/asm/setup.h 2010-10-23 19:59:19.000000000 -0400 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -2887,7 +2884,7 @@ diff -urNp linux-2.6.32.24/arch/s390/include/asm/setup.h linux-2.6.32.24/arch/s3 #endif diff -urNp linux-2.6.32.24/arch/s390/include/asm/uaccess.h linux-2.6.32.24/arch/s390/include/asm/uaccess.h --- linux-2.6.32.24/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2922,7 +2919,7 @@ diff -urNp linux-2.6.32.24/arch/s390/include/asm/uaccess.h linux-2.6.32.24/arch/ else diff -urNp linux-2.6.32.24/arch/s390/Kconfig linux-2.6.32.24/arch/s390/Kconfig --- linux-2.6.32.24/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/Kconfig 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/Kconfig 2010-10-23 19:59:19.000000000 -0400 @@ -194,28 +194,26 @@ config AUDIT_ARCH config S390_SWITCH_AMODE @@ -2962,7 +2959,7 @@ diff -urNp linux-2.6.32.24/arch/s390/Kconfig linux-2.6.32.24/arch/s390/Kconfig diff -urNp linux-2.6.32.24/arch/s390/kernel/module.c linux-2.6.32.24/arch/s390/kernel/module.c --- linux-2.6.32.24/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -3036,7 +3033,7 @@ diff -urNp linux-2.6.32.24/arch/s390/kernel/module.c linux-2.6.32.24/arch/s390/k *(unsigned int *) loc = val; diff -urNp linux-2.6.32.24/arch/s390/kernel/setup.c linux-2.6.32.24/arch/s390/kernel/setup.c --- linux-2.6.32.24/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/kernel/setup.c 2010-10-23 19:59:19.000000000 -0400 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -3092,7 +3089,7 @@ diff -urNp linux-2.6.32.24/arch/s390/kernel/setup.c linux-2.6.32.24/arch/s390/ke if (s390_noexec) { diff -urNp linux-2.6.32.24/arch/s390/mm/mmap.c linux-2.6.32.24/arch/s390/mm/mmap.c --- linux-2.6.32.24/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/s390/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/s390/mm/mmap.c 2010-10-23 19:59:19.000000000 -0400 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3141,7 +3138,7 @@ diff -urNp linux-2.6.32.24/arch/s390/mm/mmap.c linux-2.6.32.24/arch/s390/mm/mmap } diff -urNp linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c --- linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -3153,7 +3150,7 @@ diff -urNp linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.24/arch/s }; diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c --- linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c 2010-10-23 19:59:19.000000000 -0400 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -3165,7 +3162,7 @@ diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.24/arch/sh/k }; diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c --- linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c 2010-10-23 19:59:19.000000000 -0400 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -3177,7 +3174,7 @@ diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.24/arch }; diff -urNp linux-2.6.32.24/arch/sh/kernel/kgdb.c linux-2.6.32.24/arch/sh/kernel/kgdb.c --- linux-2.6.32.24/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sh/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sh/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -3189,7 +3186,7 @@ diff -urNp linux-2.6.32.24/arch/sh/kernel/kgdb.c linux-2.6.32.24/arch/sh/kernel/ .gdb_bpt_instr = { 0x3c, 0xc3 }, diff -urNp linux-2.6.32.24/arch/sh/mm/mmap.c linux-2.6.32.24/arch/sh/mm/mmap.c --- linux-2.6.32.24/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sh/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/sh/mm/mmap.c 2010-10-23 19:59:19.000000000 -0400 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr = PAGE_ALIGN(addr); @@ -3239,7 +3236,7 @@ diff -urNp linux-2.6.32.24/arch/sh/mm/mmap.c linux-2.6.32.24/arch/sh/mm/mmap.c } diff -urNp linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h --- linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h 2010-09-15 02:34:10.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3392,7 +3389,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h linux-2.6.32.24/ar #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) diff -urNp linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h --- linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h 2010-10-23 19:59:19.000000000 -0400 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) #define dma_is_consistent(d, h) (1) @@ -3426,7 +3423,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.24/ ops->free_coherent(dev, size, cpu_addr, dma_handle); diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_32.h linux-2.6.32.24/arch/sparc/include/asm/elf_32.h --- linux-2.6.32.24/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/elf_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/elf_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3443,7 +3440,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_32.h linux-2.6.32.24/arch/ on Sparc. */ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_64.h linux-2.6.32.24/arch/sparc/include/asm/elf_64.h --- linux-2.6.32.24/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/elf_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/elf_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3459,7 +3456,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_64.h linux-2.6.32.24/arch/ instruction set this cpu supports. */ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h --- linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3493,7 +3490,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.24/a #ifdef MODULE diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h --- linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h 2010-10-23 19:59:19.000000000 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3510,7 +3507,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.24/arc diff -urNp linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h --- linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3564,7 +3561,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.24/ " bne,pn %%xcc, 1b\n" diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h --- linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) @@ -3618,7 +3615,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.24/a diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h --- linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3663,7 +3660,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.24/a return ret; diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess.h linux-2.6.32.24/arch/sparc/include/asm/uaccess.h --- linux-2.6.32.24/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -3680,7 +3677,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess.h linux-2.6.32.24/arch #else diff -urNp linux-2.6.32.24/arch/sparc/kernel/iommu.c linux-2.6.32.24/arch/sparc/kernel/iommu.c --- linux-2.6.32.24/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3701,7 +3698,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/iommu.c linux-2.6.32.24/arch/sparc/ extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); diff -urNp linux-2.6.32.24/arch/sparc/kernel/ioport.c linux-2.6.32.24/arch/sparc/kernel/ioport.c --- linux-2.6.32.24/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/ioport.c 2010-10-23 19:59:19.000000000 -0400 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3731,7 +3728,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/ioport.c linux-2.6.32.24/arch/sparc .map_page = pci32_map_page, diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c --- linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3743,7 +3740,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c linux-2.6.32.24/arch/spar }; diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c --- linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3755,7 +3752,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c linux-2.6.32.24/arch/spar }; diff -urNp linux-2.6.32.24/arch/sparc/kernel/Makefile linux-2.6.32.24/arch/sparc/kernel/Makefile --- linux-2.6.32.24/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -3,7 +3,7 @@ # @@ -3767,7 +3764,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/Makefile linux-2.6.32.24/arch/sparc extra-y += init_task.o diff -urNp linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c --- linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c 2010-10-23 19:59:19.000000000 -0400 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3779,7 +3776,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.24/arch/sp .map_page = dma_4v_map_page, diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c --- linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3800,7 +3797,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.24/arch if (flags & MAP_SHARED) diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c --- linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c 2010-10-23 19:59:19.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. @@ -3923,7 +3920,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.24/arch } diff -urNp linux-2.6.32.24/arch/sparc/kernel/traps_64.c linux-2.6.32.24/arch/sparc/kernel/traps_64.c --- linux-2.6.32.24/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/kernel/traps_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/kernel/traps_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3957,7 +3954,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/kernel/traps_64.c linux-2.6.32.24/arch/spa sprintf (buffer, "Bad trap %lx at tl>0", lvl); diff -urNp linux-2.6.32.24/arch/sparc/lib/atomic_64.S linux-2.6.32.24/arch/sparc/lib/atomic_64.S --- linux-2.6.32.24/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/lib/atomic_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/lib/atomic_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4194,7 +4191,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/lib/atomic_64.S linux-2.6.32.24/arch/sparc bne,pn %xcc, 2f diff -urNp linux-2.6.32.24/arch/sparc/lib/ksyms.c linux-2.6.32.24/arch/sparc/lib/ksyms.c --- linux-2.6.32.24/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/lib/ksyms.c 2010-09-17 17:45:39.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/lib/ksyms.c 2010-10-23 19:59:19.000000000 -0400 @@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -4215,7 +4212,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/lib/ksyms.c linux-2.6.32.24/arch/sparc/lib /* Atomic bit operations. */ diff -urNp linux-2.6.32.24/arch/sparc/lib/rwsem_64.S linux-2.6.32.24/arch/sparc/lib/rwsem_64.S --- linux-2.6.32.24/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/lib/rwsem_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/lib/rwsem_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -4316,7 +4313,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/lib/rwsem_64.S linux-2.6.32.24/arch/sparc/ bne,pn %icc, 1b diff -urNp linux-2.6.32.24/arch/sparc/Makefile linux-2.6.32.24/arch/sparc/Makefile --- linux-2.6.32.24/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -4328,7 +4325,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/Makefile linux-2.6.32.24/arch/sparc/Makefi diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_32.c linux-2.6.32.24/arch/sparc/mm/fault_32.c --- linux-2.6.32.24/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/fault_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/fault_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4634,7 +4631,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_32.c linux-2.6.32.24/arch/sparc/m goto bad_area; diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_64.c linux-2.6.32.24/arch/sparc/mm/fault_64.c --- linux-2.6.32.24/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/fault_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/fault_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -5134,7 +5131,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_64.c linux-2.6.32.24/arch/sparc/m * was no match. So in such a case we (carefully) read the diff -urNp linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c --- linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c 2010-10-23 19:59:19.000000000 -0400 @@ -69,7 +69,7 @@ full_search: } return -ENOMEM; @@ -5174,7 +5171,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c linux-2.6.32.24/arch/spar if (mm->get_unmapped_area == arch_get_unmapped_area) diff -urNp linux-2.6.32.24/arch/sparc/mm/init_32.c linux-2.6.32.24/arch/sparc/mm/init_32.c --- linux-2.6.32.24/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/init_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5211,7 +5208,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/init_32.c linux-2.6.32.24/arch/sparc/mm protection_map[14] = PAGE_SHARED; diff -urNp linux-2.6.32.24/arch/sparc/mm/Makefile linux-2.6.32.24/arch/sparc/mm/Makefile --- linux-2.6.32.24/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -2,7 +2,7 @@ # @@ -5223,7 +5220,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/Makefile linux-2.6.32.24/arch/sparc/mm/ obj-y += fault_$(BITS).o diff -urNp linux-2.6.32.24/arch/sparc/mm/srmmu.c linux-2.6.32.24/arch/sparc/mm/srmmu.c --- linux-2.6.32.24/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/sparc/mm/srmmu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/sparc/mm/srmmu.c 2010-10-23 19:59:19.000000000 -0400 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -5240,7 +5237,7 @@ diff -urNp linux-2.6.32.24/arch/sparc/mm/srmmu.c linux-2.6.32.24/arch/sparc/mm/s diff -urNp linux-2.6.32.24/arch/um/include/asm/kmap_types.h linux-2.6.32.24/arch/um/include/asm/kmap_types.h --- linux-2.6.32.24/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/um/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/um/include/asm/kmap_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5251,7 +5248,7 @@ diff -urNp linux-2.6.32.24/arch/um/include/asm/kmap_types.h linux-2.6.32.24/arch diff -urNp linux-2.6.32.24/arch/um/include/asm/page.h linux-2.6.32.24/arch/um/include/asm/page.h --- linux-2.6.32.24/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/um/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/um/include/asm/page.h 2010-10-23 19:59:19.000000000 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5264,7 +5261,7 @@ diff -urNp linux-2.6.32.24/arch/um/include/asm/page.h linux-2.6.32.24/arch/um/in struct page; diff -urNp linux-2.6.32.24/arch/um/sys-i386/syscalls.c linux-2.6.32.24/arch/um/sys-i386/syscalls.c --- linux-2.6.32.24/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/um/sys-i386/syscalls.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/um/sys-i386/syscalls.c 2010-10-23 19:59:19.000000000 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5289,7 +5286,7 @@ diff -urNp linux-2.6.32.24/arch/um/sys-i386/syscalls.c linux-2.6.32.24/arch/um/s * calls. Linux/i386 didn't use to be able to handle more than diff -urNp linux-2.6.32.24/arch/x86/boot/bitops.h linux-2.6.32.24/arch/x86/boot/bitops.h --- linux-2.6.32.24/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/bitops.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/bitops.h 2010-10-23 19:59:19.000000000 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -5310,7 +5307,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/bitops.h linux-2.6.32.24/arch/x86/boot/ #endif /* BOOT_BITOPS_H */ diff -urNp linux-2.6.32.24/arch/x86/boot/boot.h linux-2.6.32.24/arch/x86/boot/boot.h --- linux-2.6.32.24/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/boot.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/boot.h 2010-10-23 19:59:19.000000000 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5331,7 +5328,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/boot.h linux-2.6.32.24/arch/x86/boot/bo } diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_32.S linux-2.6.32.24/arch/x86/boot/compressed/head_32.S --- linux-2.6.32.24/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/compressed/head_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/compressed/head_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5362,7 +5359,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_32.S linux-2.6.32.24/ar 2: diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_64.S linux-2.6.32.24/arch/x86/boot/compressed/head_64.S --- linux-2.6.32.24/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/compressed/head_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/compressed/head_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5383,7 +5380,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_64.S linux-2.6.32.24/ar /* Target address to relocate to for decompression */ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/misc.c linux-2.6.32.24/arch/x86/boot/compressed/misc.c --- linux-2.6.32.24/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/compressed/misc.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/compressed/misc.c 2010-10-23 19:59:19.000000000 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5404,7 +5401,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/misc.c linux-2.6.32.24/arch/ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c --- linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c 2010-10-23 19:59:19.000000000 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -5416,7 +5413,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.24/ar printf(".section \".rodata.compressed\",\"a\",@progbits\n"); diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/relocs.c linux-2.6.32.24/arch/x86/boot/compressed/relocs.c --- linux-2.6.32.24/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/compressed/relocs.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/compressed/relocs.c 2010-10-23 19:59:19.000000000 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -5619,7 +5616,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/relocs.c linux-2.6.32.24/arc read_symtabs(fp); diff -urNp linux-2.6.32.24/arch/x86/boot/cpucheck.c linux-2.6.32.24/arch/x86/boot/cpucheck.c --- linux-2.6.32.24/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/cpucheck.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/cpucheck.c 2010-10-23 19:59:19.000000000 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5717,7 +5714,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/cpucheck.c linux-2.6.32.24/arch/x86/boo } diff -urNp linux-2.6.32.24/arch/x86/boot/header.S linux-2.6.32.24/arch/x86/boot/header.S --- linux-2.6.32.24/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/header.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/header.S 2010-10-23 19:59:19.000000000 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5729,7 +5726,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/header.S linux-2.6.32.24/arch/x86/boot/ #define VO_INIT_SIZE (VO__end - VO__text) diff -urNp linux-2.6.32.24/arch/x86/boot/memory.c linux-2.6.32.24/arch/x86/boot/memory.c --- linux-2.6.32.24/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/memory.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/memory.c 2010-10-23 19:59:19.000000000 -0400 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -5741,7 +5738,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/memory.c linux-2.6.32.24/arch/x86/boot/ static struct e820entry buf; /* static so it is zeroed */ diff -urNp linux-2.6.32.24/arch/x86/boot/video.c linux-2.6.32.24/arch/x86/boot/video.c --- linux-2.6.32.24/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/video.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/video.c 2010-10-23 19:59:19.000000000 -0400 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -5753,7 +5750,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/video.c linux-2.6.32.24/arch/x86/boot/v diff -urNp linux-2.6.32.24/arch/x86/boot/video-vesa.c linux-2.6.32.24/arch/x86/boot/video-vesa.c --- linux-2.6.32.24/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/boot/video-vesa.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/boot/video-vesa.c 2010-10-23 19:59:19.000000000 -0400 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5764,7 +5761,7 @@ diff -urNp linux-2.6.32.24/arch/x86/boot/video-vesa.c linux-2.6.32.24/arch/x86/b /* diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_aout.c linux-2.6.32.24/arch/x86/ia32/ia32_aout.c --- linux-2.6.32.24/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/ia32/ia32_aout.c 2010-09-23 20:28:50.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/ia32/ia32_aout.c 2010-10-23 19:59:19.000000000 -0400 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -5789,7 +5786,7 @@ diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_aout.c linux-2.6.32.24/arch/x86/ia return has_dumped; diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32entry.S linux-2.6.32.24/arch/x86/ia32/ia32entry.S --- linux-2.6.32.24/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/ia32/ia32entry.S 2010-09-15 02:02:53.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/ia32/ia32entry.S 2010-10-23 19:59:19.000000000 -0400 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -5886,7 +5883,7 @@ diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32entry.S linux-2.6.32.24/arch/x86/ia * disabled irqs and here we enable it straight after entry: diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_signal.c linux-2.6.32.24/arch/x86/ia32/ia32_signal.c --- linux-2.6.32.24/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/ia32/ia32_signal.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/ia32/ia32_signal.c 2010-10-23 19:59:24.000000000 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5905,9 +5902,23 @@ diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_signal.c linux-2.6.32.24/arch/x86/ }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); +@@ -533,9 +533,11 @@ int ia32_setup_rt_frame(int sig, struct + + if (ka->sa.sa_flags & SA_RESTORER) + restorer = ka->sa.sa_restorer; ++ else if (current->mm->context.vdso) ++ /* Return stub is in 32bit vsyscall page */ ++ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + else +- restorer = VDSO32_SYMBOL(current->mm->context.vdso, +- rt_sigreturn); ++ restorer = &frame->retcode; + put_user_ex(ptr_to_compat(restorer), &frame->pretcode); + + /* diff -urNp linux-2.6.32.24/arch/x86/include/asm/alternative.h linux-2.6.32.24/arch/x86/include/asm/alternative.h --- linux-2.6.32.24/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/alternative.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/alternative.h 2010-10-23 19:59:19.000000000 -0400 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5919,7 +5930,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/alternative.h linux-2.6.32.24/ar diff -urNp linux-2.6.32.24/arch/x86/include/asm/apm.h linux-2.6.32.24/arch/x86/include/asm/apm.h --- linux-2.6.32.24/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/apm.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/apm.h 2010-10-23 19:59:19.000000000 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5940,7 +5951,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/apm.h linux-2.6.32.24/arch/x86/i "popl %%edi\n\t" diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_32.h linux-2.6.32.24/arch/x86/include/asm/atomic_32.h --- linux-2.6.32.24/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/atomic_32.h 2010-09-26 22:16:58.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/atomic_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -6290,7 +6301,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_32.h linux-2.6.32.24/arch extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_64.h linux-2.6.32.24/arch/x86/include/asm/atomic_64.h --- linux-2.6.32.24/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/atomic_64.h 2010-09-26 22:30:45.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/atomic_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -6896,7 +6907,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_64.h linux-2.6.32.24/arch /** diff -urNp linux-2.6.32.24/arch/x86/include/asm/boot.h linux-2.6.32.24/arch/x86/include/asm/boot.h --- linux-2.6.32.24/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/boot.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/boot.h 2010-10-23 19:59:19.000000000 -0400 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6916,7 +6927,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/boot.h linux-2.6.32.24/arch/x86/ #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT diff -urNp linux-2.6.32.24/arch/x86/include/asm/cacheflush.h linux-2.6.32.24/arch/x86/include/asm/cacheflush.h --- linux-2.6.32.24/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/cacheflush.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/cacheflush.h 2010-10-23 19:59:19.000000000 -0400 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -6937,7 +6948,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/cacheflush.h linux-2.6.32.24/arc break; diff -urNp linux-2.6.32.24/arch/x86/include/asm/cache.h linux-2.6.32.24/arch/x86/include/asm/cache.h --- linux-2.6.32.24/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/cache.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/cache.h 2010-10-23 19:59:19.000000000 -0400 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6948,7 +6959,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/cache.h linux-2.6.32.24/arch/x86 /* vSMP Internode cacheline shift */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/checksum_32.h linux-2.6.32.24/arch/x86/include/asm/checksum_32.h --- linux-2.6.32.24/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/checksum_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/checksum_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6984,7 +6995,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/checksum_32.h linux-2.6.32.24/ar if (len) diff -urNp linux-2.6.32.24/arch/x86/include/asm/desc.h linux-2.6.32.24/arch/x86/include/asm/desc.h --- linux-2.6.32.24/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/desc.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/desc.h 2010-10-23 19:59:19.000000000 -0400 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -7156,7 +7167,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/desc.h linux-2.6.32.24/arch/x86/ #endif /* _ASM_X86_DESC_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/device.h linux-2.6.32.24/arch/x86/include/asm/device.h --- linux-2.6.32.24/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/device.h 2010-10-23 19:59:19.000000000 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -7168,7 +7179,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/device.h linux-2.6.32.24/arch/x8 void *iommu; /* hook for IOMMU specific extension */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h --- linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h 2010-10-23 19:59:19.000000000 -0400 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -7210,7 +7221,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h linux-2.6.32.24/ar diff -urNp linux-2.6.32.24/arch/x86/include/asm/e820.h linux-2.6.32.24/arch/x86/include/asm/e820.h --- linux-2.6.32.24/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/e820.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/e820.h 2010-10-23 19:59:19.000000000 -0400 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -7222,7 +7233,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/e820.h linux-2.6.32.24/arch/x86/ #ifdef __KERNEL__ diff -urNp linux-2.6.32.24/arch/x86/include/asm/elf.h linux-2.6.32.24/arch/x86/include/asm/elf.h --- linux-2.6.32.24/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/elf.h 2010-10-23 19:59:19.000000000 -0400 @@ -257,7 +257,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. */ @@ -7278,7 +7289,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/elf.h linux-2.6.32.24/arch/x86/i #endif /* _ASM_X86_ELF_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/futex.h linux-2.6.32.24/arch/x86/include/asm/futex.h --- linux-2.6.32.24/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/futex.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/futex.h 2010-10-23 19:59:19.000000000 -0400 @@ -11,17 +11,54 @@ #include <asm/processor.h> #include <asm/system.h> @@ -7417,7 +7428,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/futex.h linux-2.6.32.24/arch/x86 diff -urNp linux-2.6.32.24/arch/x86/include/asm/i387.h linux-2.6.32.24/arch/x86/include/asm/i387.h --- linux-2.6.32.24/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/i387.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/i387.h 2010-10-23 19:59:19.000000000 -0400 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7460,7 +7471,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/i387.h linux-2.6.32.24/arch/x86/ * These must be called with preempt disabled diff -urNp linux-2.6.32.24/arch/x86/include/asm/io_64.h linux-2.6.32.24/arch/x86/include/asm/io_64.h --- linux-2.6.32.24/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/io_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/io_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -7481,7 +7492,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/io_64.h linux-2.6.32.24/arch/x86 void __memcpy_fromio(void *, unsigned long, unsigned); diff -urNp linux-2.6.32.24/arch/x86/include/asm/iommu.h linux-2.6.32.24/arch/x86/include/asm/iommu.h --- linux-2.6.32.24/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/iommu.h 2010-10-23 19:59:19.000000000 -0400 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -7493,7 +7504,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/iommu.h linux-2.6.32.24/arch/x86 extern int iommu_pass_through; diff -urNp linux-2.6.32.24/arch/x86/include/asm/irqflags.h linux-2.6.32.24/arch/x86/include/asm/irqflags.h --- linux-2.6.32.24/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/irqflags.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/irqflags.h 2010-10-23 19:59:19.000000000 -0400 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -7508,7 +7519,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/irqflags.h linux-2.6.32.24/arch/ #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit diff -urNp linux-2.6.32.24/arch/x86/include/asm/kvm_host.h linux-2.6.32.24/arch/x86/include/asm/kvm_host.h --- linux-2.6.32.24/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/kvm_host.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/kvm_host.h 2010-10-23 19:59:19.000000000 -0400 @@ -533,7 +533,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -7520,7 +7531,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/kvm_host.h linux-2.6.32.24/arch/ void kvm_mmu_module_exit(void); diff -urNp linux-2.6.32.24/arch/x86/include/asm/local.h linux-2.6.32.24/arch/x86/include/asm/local.h --- linux-2.6.32.24/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/local.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/local.h 2010-10-23 19:59:19.000000000 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7747,7 +7758,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/local.h linux-2.6.32.24/arch/x86 return i + __i; diff -urNp linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h --- linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h 2010-10-23 19:59:19.000000000 -0400 @@ -81,8 +81,8 @@ static inline unsigned char current_lock #else #define lock_cmos_prefix(reg) do {} while (0) @@ -7761,7 +7772,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.24/ar #endif diff -urNp linux-2.6.32.24/arch/x86/include/asm/microcode.h linux-2.6.32.24/arch/x86/include/asm/microcode.h --- linux-2.6.32.24/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/microcode.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/microcode.h 2010-10-23 19:59:19.000000000 -0400 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -7804,7 +7815,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/microcode.h linux-2.6.32.24/arch } diff -urNp linux-2.6.32.24/arch/x86/include/asm/mman.h linux-2.6.32.24/arch/x86/include/asm/mman.h --- linux-2.6.32.24/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/mman.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/mman.h 2010-10-23 19:59:19.000000000 -0400 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -7822,7 +7833,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mman.h linux-2.6.32.24/arch/x86/ #endif /* _ASM_X86_MMAN_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu_context.h linux-2.6.32.24/arch/x86/include/asm/mmu_context.h --- linux-2.6.32.24/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/mmu_context.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/mmu_context.h 2010-10-23 19:59:19.000000000 -0400 @@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -7949,7 +7960,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu_context.h linux-2.6.32.24/ar #define activate_mm(prev, next) \ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu.h linux-2.6.32.24/arch/x86/include/asm/mmu.h --- linux-2.6.32.24/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/mmu.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/mmu.h 2010-10-23 19:59:19.000000000 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -7978,7 +7989,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu.h linux-2.6.32.24/arch/x86/i #ifdef CONFIG_SMP diff -urNp linux-2.6.32.24/arch/x86/include/asm/module.h linux-2.6.32.24/arch/x86/include/asm/module.h --- linux-2.6.32.24/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/module.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/module.h 2010-10-23 19:59:19.000000000 -0400 @@ -59,13 +59,31 @@ #error unknown processor family #endif @@ -8014,7 +8025,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/module.h linux-2.6.32.24/arch/x8 #endif /* _ASM_X86_MODULE_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/page_32_types.h linux-2.6.32.24/arch/x86/include/asm/page_32_types.h --- linux-2.6.32.24/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/page_32_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/page_32_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -8028,7 +8039,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/page_32_types.h linux-2.6.32.24/ #else diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt.h linux-2.6.32.24/arch/x86/include/asm/paravirt.h --- linux-2.6.32.24/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/paravirt.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/paravirt.h 2010-10-23 19:59:19.000000000 -0400 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -8084,7 +8095,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt.h linux-2.6.32.24/arch/ #endif /* __ASSEMBLY__ */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h --- linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -8100,7 +8111,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h linux-2.6.32.24 struct raw_spinlock; diff -urNp linux-2.6.32.24/arch/x86/include/asm/pci_x86.h linux-2.6.32.24/arch/x86/include/asm/pci_x86.h --- linux-2.6.32.24/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pci_x86.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pci_x86.h 2010-10-23 19:59:19.000000000 -0400 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -8125,7 +8136,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pci_x86.h linux-2.6.32.24/arch/x /* arch_initcall level */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgalloc.h linux-2.6.32.24/arch/x86/include/asm/pgalloc.h --- linux-2.6.32.24/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgalloc.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgalloc.h 2010-10-23 19:59:19.000000000 -0400 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -8142,7 +8153,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgalloc.h linux-2.6.32.24/arch/x diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h 2010-10-23 19:59:19.000000000 -0400 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8155,7 +8166,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.24 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -8199,7 +8210,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h linux-2.6.32.24/arc * SPARSEMEM and DISCONTIGMEM diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -8231,7 +8242,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. #define MODULES_LEN (MODULES_VADDR - MODULES_END) diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h 2010-10-23 19:59:19.000000000 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8251,7 +8262,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.24 /* diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -8290,7 +8301,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h linux-2.6.32.24/arc static inline void native_pgd_clear(pgd_t *pgd) diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -8304,7 +8315,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable.h linux-2.6.32.24/arch/x86/include/asm/pgtable.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable.h 2010-10-23 19:59:19.000000000 -0400 @@ -74,12 +74,51 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -8476,7 +8487,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable.h linux-2.6.32.24/arch/x #endif /* __ASSEMBLY__ */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h --- linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h 2010-10-23 19:59:19.000000000 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -8599,7 +8610,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h linux-2.6.32.24/ extern pgprot_t pgprot_writecombine(pgprot_t prot); diff -urNp linux-2.6.32.24/arch/x86/include/asm/processor.h linux-2.6.32.24/arch/x86/include/asm/processor.h --- linux-2.6.32.24/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/processor.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/processor.h 2010-10-23 19:59:19.000000000 -0400 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -8686,7 +8697,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/processor.h linux-2.6.32.24/arch /* Get/set a process' ability to use the timestamp counter instruction */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/ptrace.h linux-2.6.32.24/arch/x86/include/asm/ptrace.h --- linux-2.6.32.24/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/ptrace.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/ptrace.h 2010-10-23 19:59:19.000000000 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -8725,7 +8736,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/ptrace.h linux-2.6.32.24/arch/x8 diff -urNp linux-2.6.32.24/arch/x86/include/asm/reboot.h linux-2.6.32.24/arch/x86/include/asm/reboot.h --- linux-2.6.32.24/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/reboot.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/reboot.h 2010-10-23 19:59:19.000000000 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -8737,7 +8748,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/reboot.h linux-2.6.32.24/arch/x8 void nmi_shootdown_cpus(nmi_shootdown_cb callback); diff -urNp linux-2.6.32.24/arch/x86/include/asm/rwsem.h linux-2.6.32.24/arch/x86/include/asm/rwsem.h --- linux-2.6.32.24/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/rwsem.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/rwsem.h 2010-10-23 19:59:19.000000000 -0400 @@ -118,10 +118,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -8975,7 +8986,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/rwsem.h linux-2.6.32.24/arch/x86 diff -urNp linux-2.6.32.24/arch/x86/include/asm/segment.h linux-2.6.32.24/arch/x86/include/asm/segment.h --- linux-2.6.32.24/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/segment.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/segment.h 2010-10-23 19:59:19.000000000 -0400 @@ -62,8 +62,8 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -9044,9 +9055,21 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/segment.h linux-2.6.32.24/arch/x #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) +diff -urNp linux-2.6.32.24/arch/x86/include/asm/smp.h linux-2.6.32.24/arch/x86/include/asm/smp.h +--- linux-2.6.32.24/arch/x86/include/asm/smp.h 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/smp.h 2010-10-23 19:59:24.000000000 -0400 +@@ -24,7 +24,7 @@ extern unsigned int num_processors; + DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); + DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); + DECLARE_PER_CPU(u16, cpu_llc_id); +-DECLARE_PER_CPU(int, cpu_number); ++DECLARE_PER_CPU(unsigned int, cpu_number); + + static inline struct cpumask *cpu_sibling_mask(int cpu) + { diff -urNp linux-2.6.32.24/arch/x86/include/asm/spinlock.h linux-2.6.32.24/arch/x86/include/asm/spinlock.h --- linux-2.6.32.24/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/spinlock.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/spinlock.h 2010-10-23 19:59:19.000000000 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -9152,7 +9175,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/spinlock.h linux-2.6.32.24/arch/ diff -urNp linux-2.6.32.24/arch/x86/include/asm/system.h linux-2.6.32.24/arch/x86/include/asm/system.h --- linux-2.6.32.24/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/system.h 2010-10-23 19:59:19.000000000 -0400 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -9173,7 +9196,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/system.h linux-2.6.32.24/arch/x8 void default_idle(void); diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h --- linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h 2010-10-23 19:59:19.000000000 -0400 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) @@ -9305,7 +9328,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h linux-2.6.32.24/arc long __must_check __strncpy_from_user(char *dst, diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h --- linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h 2010-10-23 19:59:19.000000000 -0400 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #include <linux/lockdep.h> @@ -9499,7 +9522,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h linux-2.6.32.24/arc #endif /* _ASM_X86_UACCESS_64_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess.h linux-2.6.32.24/arch/x86/include/asm/uaccess.h --- linux-2.6.32.24/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/uaccess.h 2010-09-16 23:14:31.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/uaccess.h 2010-10-23 19:59:19.000000000 -0400 @@ -8,12 +8,15 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -9726,7 +9749,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess.h linux-2.6.32.24/arch/x #else diff -urNp linux-2.6.32.24/arch/x86/include/asm/vgtod.h linux-2.6.32.24/arch/x86/include/asm/vgtod.h --- linux-2.6.32.24/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/vgtod.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/vgtod.h 2010-10-23 19:59:19.000000000 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -9737,7 +9760,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/vgtod.h linux-2.6.32.24/arch/x86 cycle_t mask; diff -urNp linux-2.6.32.24/arch/x86/include/asm/vmi.h linux-2.6.32.24/arch/x86/include/asm/vmi.h --- linux-2.6.32.24/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/vmi.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/vmi.h 2010-10-23 19:59:19.000000000 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -9748,7 +9771,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/vmi.h linux-2.6.32.24/arch/x86/i struct pnp_header { diff -urNp linux-2.6.32.24/arch/x86/include/asm/vsyscall.h linux-2.6.32.24/arch/x86/include/asm/vsyscall.h --- linux-2.6.32.24/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/vsyscall.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/vsyscall.h 2010-10-23 19:59:19.000000000 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -9781,7 +9804,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/vsyscall.h linux-2.6.32.24/arch/ #endif /* _ASM_X86_VSYSCALL_H */ diff -urNp linux-2.6.32.24/arch/x86/include/asm/xsave.h linux-2.6.32.24/arch/x86/include/asm/xsave.h --- linux-2.6.32.24/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/include/asm/xsave.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/include/asm/xsave.h 2010-10-23 19:59:19.000000000 -0400 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -9809,7 +9832,7 @@ diff -urNp linux-2.6.32.24/arch/x86/include/asm/xsave.h linux-2.6.32.24/arch/x86 ".section .fixup,\"ax\"\n" diff -urNp linux-2.6.32.24/arch/x86/Kconfig linux-2.6.32.24/arch/x86/Kconfig --- linux-2.6.32.24/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/Kconfig 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/Kconfig 2010-10-23 19:59:19.000000000 -0400 @@ -997,7 +997,7 @@ choice config NOHIGHMEM @@ -9876,7 +9899,7 @@ diff -urNp linux-2.6.32.24/arch/x86/Kconfig linux-2.6.32.24/arch/x86/Kconfig ---help--- diff -urNp linux-2.6.32.24/arch/x86/Kconfig.cpu linux-2.6.32.24/arch/x86/Kconfig.cpu --- linux-2.6.32.24/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/Kconfig.cpu 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/Kconfig.cpu 2010-10-23 19:59:19.000000000 -0400 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -9906,7 +9929,7 @@ diff -urNp linux-2.6.32.24/arch/x86/Kconfig.cpu linux-2.6.32.24/arch/x86/Kconfig int diff -urNp linux-2.6.32.24/arch/x86/Kconfig.debug linux-2.6.32.24/arch/x86/Kconfig.debug --- linux-2.6.32.24/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/Kconfig.debug 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/Kconfig.debug 2010-10-23 19:59:19.000000000 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -9918,7 +9941,7 @@ diff -urNp linux-2.6.32.24/arch/x86/Kconfig.debug linux-2.6.32.24/arch/x86/Kconf in order to catch accidental (and incorrect) writes to such const diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/boot.c linux-2.6.32.24/arch/x86/kernel/acpi/boot.c --- linux-2.6.32.24/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/acpi/boot.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/acpi/boot.c 2010-10-23 19:59:19.000000000 -0400 @@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -9930,7 +9953,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/boot.c linux-2.6.32.24/arch/x86/ /* diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S --- linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S 2010-10-23 19:59:19.000000000 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -9942,7 +9965,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2 diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c --- linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c 2010-10-23 19:59:19.000000000 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -9989,7 +10012,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c linux-2.6.32.24/arch/x86 diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S --- linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S 2010-10-23 19:59:19.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 @@ -10008,7 +10031,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.24/arch jmp bogus_magic diff -urNp linux-2.6.32.24/arch/x86/kernel/alternative.c linux-2.6.32.24/arch/x86/kernel/alternative.c --- linux-2.6.32.24/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/alternative.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/alternative.c 2010-10-23 19:59:19.000000000 -0400 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -10093,7 +10116,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/alternative.c linux-2.6.32.24/arch/x8 } diff -urNp linux-2.6.32.24/arch/x86/kernel/amd_iommu.c linux-2.6.32.24/arch/x86/kernel/amd_iommu.c --- linux-2.6.32.24/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/amd_iommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/amd_iommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -10105,7 +10128,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/amd_iommu.c linux-2.6.32.24/arch/x86/ .map_page = map_page, diff -urNp linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c --- linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c 2010-10-23 19:59:19.000000000 -0400 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -10144,7 +10167,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c linux-2.6.32.24/arch/x } diff -urNp linux-2.6.32.24/arch/x86/kernel/apm_32.c linux-2.6.32.24/arch/x86/kernel/apm_32.c --- linux-2.6.32.24/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/apm_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/apm_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -10248,7 +10271,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/apm_32.c linux-2.6.32.24/arch/x86/ker diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c --- linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -115,6 +115,11 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); @@ -10263,7 +10286,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.24/arch #ifdef CONFIG_XEN diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c --- linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -63,6 +63,18 @@ int main(void) OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); @@ -10293,7 +10316,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.24/arch DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/common.c linux-2.6.32.24/arch/x86/kernel/cpu/common.c --- linux-2.6.32.24/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/common.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/common.c 2010-10-23 19:59:19.000000000 -0400 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -10404,7 +10427,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/common.c linux-2.6.32.24/arch/x86 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c --- linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-10-23 19:59:19.000000000 -0400 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -10416,7 +10439,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6. static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c --- linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-10-23 19:59:19.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 }, @@ -10428,7 +10451,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu #undef BANIAS diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel.c linux-2.6.32.24/arch/x86/kernel/cpu/intel.c --- linux-2.6.32.24/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/intel.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/intel.c 2010-10-23 19:59:19.000000000 -0400 @@ -161,7 +161,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. @@ -10440,7 +10463,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel.c linux-2.6.32.24/arch/x86/ #endif diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c --- linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-10-23 19:59:19.000000000 -0400 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -10452,7 +10475,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.24 }; diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/Makefile linux-2.6.32.24/arch/x86/kernel/cpu/Makefile --- linux-2.6.32.24/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -10466,7 +10489,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/Makefile linux-2.6.32.24/arch/x86 obj-y += vmware.o hypervisor.o sched.o diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-10-23 19:59:19.000000000 -0400 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -10478,7 +10501,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c 2010-10-23 19:59:19.000000000 -0400 @@ -187,7 +187,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -10533,7 +10556,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.24/arch /* diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c 2010-10-23 19:59:19.000000000 -0400 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -10545,7 +10568,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.24/arch/x .get = amd_get_mtrr, diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c 2010-10-23 19:59:19.000000000 -0400 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -10557,7 +10580,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.24/ar .get = centaur_get_mcr, diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-10-23 19:59:19.000000000 -0400 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -10569,7 +10592,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.24/arch .set = cyrix_set_arr, diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c 2010-10-23 19:59:19.000000000 -0400 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ @@ -10590,7 +10613,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.24/ar .get = generic_get_mtrr, diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c 2010-10-23 19:59:19.000000000 -0400 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -10611,7 +10634,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.24/arch/ mtrr_ops[ops->vendor] = ops; diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h --- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-10-23 19:59:19.000000000 -0400 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -10664,7 +10687,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.24/arch/ #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c --- linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-10-23 19:59:19.000000000 -0400 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -10700,7 +10723,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2 .unreserve = single_msr_unreserve, diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c --- linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c 2010-10-23 19:59:19.000000000 -0400 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs break; @@ -10712,7 +10735,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.24/arch diff -urNp linux-2.6.32.24/arch/x86/kernel/crash.c linux-2.6.32.24/arch/x86/kernel/crash.c --- linux-2.6.32.24/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/crash.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/crash.c 2010-10-23 19:59:19.000000000 -0400 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -10724,7 +10747,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/crash.c linux-2.6.32.24/arch/x86/kern } diff -urNp linux-2.6.32.24/arch/x86/kernel/doublefault_32.c linux-2.6.32.24/arch/x86/kernel/doublefault_32.c --- linux-2.6.32.24/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/doublefault_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/doublefault_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -10758,7 +10781,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/doublefault_32.c linux-2.6.32.24/arch .__cr3 = __pa_nodebug(swapper_pg_dir), diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c --- linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -112,11 +112,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.. @@ -10805,7 +10828,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c linux-2.6.32.24/arch/x if (probe_kernel_address((unsigned short *)ip, ud2)) diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack.c linux-2.6.32.24/arch/x86/kernel/dumpstack.c --- linux-2.6.32.24/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/dumpstack.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/dumpstack.c 2010-10-23 19:59:19.000000000 -0400 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -10835,7 +10858,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack.c linux-2.6.32.24/arch/x86/ if (__die(str, regs, err)) diff -urNp linux-2.6.32.24/arch/x86/kernel/e820.c linux-2.6.32.24/arch/x86/kernel/e820.c --- linux-2.6.32.24/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/e820.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/e820.c 2010-10-23 19:59:19.000000000 -0400 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -10847,7 +10870,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/e820.c linux-2.6.32.24/arch/x86/kerne static int __init find_overlapped_early(u64 start, u64 end) diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_32.c linux-2.6.32.24/arch/x86/kernel/efi_32.c --- linux-2.6.32.24/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/efi_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/efi_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -38,70 +38,38 @@ */ @@ -10930,7 +10953,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_32.c linux-2.6.32.24/arch/x86/ker * After the lock is released, the original page table is restored. diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S --- linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -6,6 +6,7 @@ */ @@ -11031,7 +11054,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S linux-2.6.32.24/arch/x8 efi_rt_function_ptr: diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_32.S linux-2.6.32.24/arch/x86/kernel/entry_32.S --- linux-2.6.32.24/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/entry_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/entry_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -191,7 +191,67 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -11344,7 +11367,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_32.S linux-2.6.32.24/arch/x86/k CFI_ADJUST_CFA_OFFSET -24 diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_64.S linux-2.6.32.24/arch/x86/kernel/entry_64.S --- linux-2.6.32.24/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/entry_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/entry_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -53,6 +53,7 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -11804,7 +11827,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_64.S linux-2.6.32.24/arch/x86/k nmi_userspace: diff -urNp linux-2.6.32.24/arch/x86/kernel/ftrace.c linux-2.6.32.24/arch/x86/kernel/ftrace.c --- linux-2.6.32.24/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/ftrace.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/ftrace.c 2010-10-23 19:59:19.000000000 -0400 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -11872,7 +11895,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/ftrace.c linux-2.6.32.24/arch/x86/ker diff -urNp linux-2.6.32.24/arch/x86/kernel/head32.c linux-2.6.32.24/arch/x86/kernel/head32.c --- linux-2.6.32.24/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/head32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/head32.c 2010-10-23 19:59:19.000000000 -0400 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -11892,7 +11915,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/head32.c linux-2.6.32.24/arch/x86/ker /* Reserve INITRD */ diff -urNp linux-2.6.32.24/arch/x86/kernel/head_32.S linux-2.6.32.24/arch/x86/kernel/head_32.S --- linux-2.6.32.24/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/head_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/head_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -12341,7 +12364,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/head_32.S linux-2.6.32.24/arch/x86/ke + .endr diff -urNp linux-2.6.32.24/arch/x86/kernel/head_64.S linux-2.6.32.24/arch/x86/kernel/head_64.S --- linux-2.6.32.24/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/head_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/head_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -12614,7 +12637,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/head_64.S linux-2.6.32.24/arch/x86/ke .align PAGE_SIZE diff -urNp linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c --- linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -12638,7 +12661,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.24/arch/ +#endif diff -urNp linux-2.6.32.24/arch/x86/kernel/init_task.c linux-2.6.32.24/arch/x86/kernel/init_task.c --- linux-2.6.32.24/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/init_task.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/init_task.c 2010-10-23 19:59:19.000000000 -0400 @@ -38,5 +38,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. @@ -12649,7 +12672,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/init_task.c linux-2.6.32.24/arch/x86/ +EXPORT_SYMBOL(init_tss); diff -urNp linux-2.6.32.24/arch/x86/kernel/ioport.c linux-2.6.32.24/arch/x86/kernel/ioport.c --- linux-2.6.32.24/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/ioport.c 2010-10-23 19:59:19.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -12695,7 +12718,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/ioport.c linux-2.6.32.24/arch/x86/ker } diff -urNp linux-2.6.32.24/arch/x86/kernel/irq_32.c linux-2.6.32.24/arch/x86/kernel/irq_32.c --- linux-2.6.32.24/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/irq_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/irq_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -12716,7 +12739,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/irq_32.c linux-2.6.32.24/arch/x86/ker /* diff -urNp linux-2.6.32.24/arch/x86/kernel/kgdb.c linux-2.6.32.24/arch/x86/kernel/kgdb.c --- linux-2.6.32.24/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/kgdb.c 2010-10-23 19:59:19.000000000 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -12728,7 +12751,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/kgdb.c linux-2.6.32.24/arch/x86/kerne .flags = KGDB_HW_BREAKPOINT, diff -urNp linux-2.6.32.24/arch/x86/kernel/kprobes.c linux-2.6.32.24/arch/x86/kernel/kprobes.c --- linux-2.6.32.24/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/kprobes.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/kprobes.c 2010-10-23 19:59:19.000000000 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -12823,7 +12846,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/kprobes.c linux-2.6.32.24/arch/x86/ke switch (val) { diff -urNp linux-2.6.32.24/arch/x86/kernel/ldt.c linux-2.6.32.24/arch/x86/kernel/ldt.c --- linux-2.6.32.24/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/ldt.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/ldt.c 2010-10-23 19:59:24.000000000 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -12855,7 +12878,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/ldt.c linux-2.6.32.24/arch/x86/kernel } + + if (tsk == current) { -+ mm->context.vdso = ~0UL; ++ mm->context.vdso = 0; + +#ifdef CONFIG_X86_32 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) @@ -12890,7 +12913,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/ldt.c linux-2.6.32.24/arch/x86/kernel ldt.avl = 0; diff -urNp linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c --- linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -12920,7 +12943,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.24/ar page_list[PA_CONTROL_PAGE] = __pa(control_page); diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_amd.c linux-2.6.32.24/arch/x86/kernel/microcode_amd.c --- linux-2.6.32.24/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/microcode_amd.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/microcode_amd.c 2010-10-23 19:59:19.000000000 -0400 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -12941,7 +12964,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_amd.c linux-2.6.32.24/arch/ } diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_core.c linux-2.6.32.24/arch/x86/kernel/microcode_core.c --- linux-2.6.32.24/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/microcode_core.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/microcode_core.c 2010-10-23 19:59:19.000000000 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -12953,7 +12976,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_core.c linux-2.6.32.24/arch * Synchronization. diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_intel.c linux-2.6.32.24/arch/x86/kernel/microcode_intel.c --- linux-2.6.32.24/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/microcode_intel.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/microcode_intel.c 2010-10-23 19:59:19.000000000 -0400 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -12990,7 +13013,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_intel.c linux-2.6.32.24/arc } diff -urNp linux-2.6.32.24/arch/x86/kernel/module.c linux-2.6.32.24/arch/x86/kernel/module.c --- linux-2.6.32.24/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/module.c 2010-10-23 19:59:19.000000000 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -13133,7 +13156,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/module.c linux-2.6.32.24/arch/x86/ker goto overflow; diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt.c linux-2.6.32.24/arch/x86/kernel/paravirt.c --- linux-2.6.32.24/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/paravirt.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/paravirt.c 2010-10-23 19:59:19.000000000 -0400 @@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu * corresponding structure. */ static void *get_call_destination(u8 type) @@ -13239,7 +13262,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt.c linux-2.6.32.24/arch/x86/k EXPORT_SYMBOL_GPL(pv_time_ops); diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c --- linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c 2010-10-23 19:59:19.000000000 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -13251,7 +13274,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.24/ .spin_is_contended = __ticket_spin_is_contended, diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c --- linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -13263,7 +13286,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.24/arch .map_sg = calgary_map_sg, diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-dma.c linux-2.6.32.24/arch/x86/kernel/pci-dma.c --- linux-2.6.32.24/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/pci-dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -13284,7 +13307,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-dma.c linux-2.6.32.24/arch/x86/ke if (mask > 0xffffffff && forbid_dac > 0) { diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c --- linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -13296,7 +13319,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c linux-2.6.32.24/arch/x8 .map_page = gart_map_page, diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-nommu.c linux-2.6.32.24/arch/x86/kernel/pci-nommu.c --- linux-2.6.32.24/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/pci-nommu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/pci-nommu.c 2010-10-23 19:59:19.000000000 -0400 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -13308,7 +13331,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-nommu.c linux-2.6.32.24/arch/x86/ .map_sg = nommu_map_sg, diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c --- linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c 2010-10-23 19:59:19.000000000 -0400 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -13320,7 +13343,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.24/arch/x8 .free_coherent = swiotlb_free_coherent, diff -urNp linux-2.6.32.24/arch/x86/kernel/process_32.c linux-2.6.32.24/arch/x86/kernel/process_32.c --- linux-2.6.32.24/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/process_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/process_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -13417,7 +13440,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/process_32.c linux-2.6.32.24/arch/x86 +#endif diff -urNp linux-2.6.32.24/arch/x86/kernel/process_64.c linux-2.6.32.24/arch/x86/kernel/process_64.c --- linux-2.6.32.24/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/process_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/process_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -13462,7 +13485,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/process_64.c linux-2.6.32.24/arch/x86 if (!in_sched_functions(ip)) diff -urNp linux-2.6.32.24/arch/x86/kernel/process.c linux-2.6.32.24/arch/x86/kernel/process.c --- linux-2.6.32.24/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/process.c 2010-10-23 19:59:19.000000000 -0400 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -13502,7 +13525,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/process.c linux-2.6.32.24/arch/x86/ke - diff -urNp linux-2.6.32.24/arch/x86/kernel/ptrace.c linux-2.6.32.24/arch/x86/kernel/ptrace.c --- linux-2.6.32.24/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/ptrace.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/ptrace.c 2010-10-23 19:59:19.000000000 -0400 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { @@ -13573,7 +13596,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/ptrace.c linux-2.6.32.24/arch/x86/ker force_sig_info(SIGTRAP, &info, tsk); diff -urNp linux-2.6.32.24/arch/x86/kernel/reboot.c linux-2.6.32.24/arch/x86/kernel/reboot.c --- linux-2.6.32.24/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/reboot.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/reboot.c 2010-10-23 19:59:19.000000000 -0400 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -13652,7 +13675,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/reboot.c linux-2.6.32.24/arch/x86/ker load_idt(&real_mode_idt); diff -urNp linux-2.6.32.24/arch/x86/kernel/setup.c linux-2.6.32.24/arch/x86/kernel/setup.c --- linux-2.6.32.24/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/setup.c 2010-10-23 19:59:19.000000000 -0400 @@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -13675,13 +13698,14 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/setup.c linux-2.6.32.24/arch/x86/kern bss_resource.end = virt_to_phys(&__bss_stop)-1; diff -urNp linux-2.6.32.24/arch/x86/kernel/setup_percpu.c linux-2.6.32.24/arch/x86/kernel/setup_percpu.c --- linux-2.6.32.24/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/setup_percpu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/setup_percpu.c 2010-10-23 19:59:24.000000000 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif +-DEFINE_PER_CPU(int, cpu_number); +#ifdef CONFIG_SMP - DEFINE_PER_CPU(int, cpu_number); ++DEFINE_PER_CPU(unsigned int, cpu_number); EXPORT_PER_CPU_SYMBOL(cpu_number); +#endif @@ -13740,7 +13764,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/setup_percpu.c linux-2.6.32.24/arch/x * area. Reload any changed state for the boot CPU. diff -urNp linux-2.6.32.24/arch/x86/kernel/signal.c linux-2.6.32.24/arch/x86/kernel/signal.c --- linux-2.6.32.24/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/signal.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/signal.c 2010-10-23 19:59:24.000000000 -0400 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. @@ -13785,16 +13809,19 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/signal.c linux-2.6.32.24/arch/x86/ker if (err) return -EFAULT; -@@ -377,7 +377,7 @@ static int __setup_rt_frame(int sig, str +@@ -377,7 +377,10 @@ static int __setup_rt_frame(int sig, str err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); /* Set up to return from userspace. */ - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); -+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ if (current->mm->context.vdso) ++ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ else ++ restorer = (void __user *)&frame->retcode; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); -@@ -389,7 +389,7 @@ static int __setup_rt_frame(int sig, str +@@ -389,7 +392,7 @@ static int __setup_rt_frame(int sig, str * reasons and because gdb uses it as a signature to notice * signal handler stack frames. */ @@ -13803,7 +13830,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/signal.c linux-2.6.32.24/arch/x86/ker } put_user_catch(err); if (err) -@@ -789,7 +789,7 @@ static void do_signal(struct pt_regs *re +@@ -789,7 +792,7 @@ static void do_signal(struct pt_regs *re * X86_32: vm86 regs switched out by assembly code before reaching * here, so testing against kernel CS suffices. */ @@ -13814,7 +13841,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/signal.c linux-2.6.32.24/arch/x86/ker if (current_thread_info()->status & TS_RESTORE_SIGMASK) diff -urNp linux-2.6.32.24/arch/x86/kernel/smpboot.c linux-2.6.32.24/arch/x86/kernel/smpboot.c --- linux-2.6.32.24/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/smpboot.c 2010-09-17 17:44:35.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/smpboot.c 2010-10-23 19:59:19.000000000 -0400 @@ -95,14 +95,14 @@ static DEFINE_PER_CPU(struct task_struct */ static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); @@ -13861,7 +13888,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/smpboot.c linux-2.6.32.24/arch/x86/ke clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, diff -urNp linux-2.6.32.24/arch/x86/kernel/step.c linux-2.6.32.24/arch/x86/kernel/step.c --- linux-2.6.32.24/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/step.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/step.c 2010-10-23 19:59:19.000000000 -0400 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -13896,7 +13923,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/step.c linux-2.6.32.24/arch/x86/kerne /* 64-bit mode: REX prefix */ diff -urNp linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S --- linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) @@ -13904,7 +13931,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S linux-2.6.32.24/ar .long sys_exit diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c --- linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c 2010-09-26 22:08:46.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -14160,7 +14187,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c linux-2.6.32.24/arch/x8 if (!segment_eq(get_fs(), get_ds())) diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c --- linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -32,8 +32,8 @@ out: return error; } @@ -14284,7 +14311,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c linux-2.6.32.24/arch/x86 return addr; diff -urNp linux-2.6.32.24/arch/x86/kernel/time.c linux-2.6.32.24/arch/x86/kernel/time.c --- linux-2.6.32.24/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/time.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/time.c 2010-10-23 19:59:19.000000000 -0400 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -14325,7 +14352,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/time.c linux-2.6.32.24/arch/x86/kerne } diff -urNp linux-2.6.32.24/arch/x86/kernel/tls.c linux-2.6.32.24/arch/x86/kernel/tls.c --- linux-2.6.32.24/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/tls.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/tls.c 2010-10-23 19:59:19.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; @@ -14340,7 +14367,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/tls.c linux-2.6.32.24/arch/x86/kernel return 0; diff -urNp linux-2.6.32.24/arch/x86/kernel/trampoline_32.S linux-2.6.32.24/arch/x86/kernel/trampoline_32.S --- linux-2.6.32.24/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/trampoline_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/trampoline_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -14363,9 +14390,30 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/trampoline_32.S linux-2.6.32.24/arch/ # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S +diff -urNp linux-2.6.32.24/arch/x86/kernel/trampoline_64.S linux-2.6.32.24/arch/x86/kernel/trampoline_64.S +--- linux-2.6.32.24/arch/x86/kernel/trampoline_64.S 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/trampoline_64.S 2010-10-23 19:59:24.000000000 -0400 +@@ -91,7 +91,7 @@ startup_32: + movl $__KERNEL_DS, %eax # Initialize the %ds segment register + movl %eax, %ds + +- movl $X86_CR4_PAE, %eax ++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax + movl %eax, %cr4 # Enable PAE mode + + # Setup trampoline 4 level pagetables +@@ -138,7 +138,7 @@ tidt: + # so the kernel can live anywhere + .balign 4 + tgdt: +- .short tgdt_end - tgdt # gdt limit ++ .short tgdt_end - tgdt - 1 # gdt limit + .long tgdt - r_base + .short 0 + .quad 0x00cf9b000000ffff # __KERNEL32_CS diff -urNp linux-2.6.32.24/arch/x86/kernel/traps.c linux-2.6.32.24/arch/x86/kernel/traps.c --- linux-2.6.32.24/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/traps.c 2010-10-23 19:59:19.000000000 -0400 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -14517,7 +14565,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/traps.c linux-2.6.32.24/arch/x86/kern } diff -urNp linux-2.6.32.24/arch/x86/kernel/tsc.c linux-2.6.32.24/arch/x86/kernel/tsc.c --- linux-2.6.32.24/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/tsc.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/tsc.c 2010-10-23 19:59:19.000000000 -0400 @@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -14529,7 +14577,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/tsc.c linux-2.6.32.24/arch/x86/kernel static void __init check_system_tsc_reliable(void) diff -urNp linux-2.6.32.24/arch/x86/kernel/vm86_32.c linux-2.6.32.24/arch/x86/kernel/vm86_32.c --- linux-2.6.32.24/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/vm86_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/vm86_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -14596,7 +14644,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/vm86_32.c linux-2.6.32.24/arch/x86/ke if ((segoffs >> 16) == BIOSSEG) diff -urNp linux-2.6.32.24/arch/x86/kernel/vmi_32.c linux-2.6.32.24/arch/x86/kernel/vmi_32.c --- linux-2.6.32.24/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/vmi_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/vmi_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -14758,7 +14806,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/vmi_32.c linux-2.6.32.24/arch/x86/ker local_irq_save(flags); diff -urNp linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S --- linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S 2010-09-17 17:29:28.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S 2010-10-23 19:59:19.000000000 -0400 @@ -26,6 +26,13 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -15044,7 +15092,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.24/arch/x8 #ifdef CONFIG_SMP diff -urNp linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c --- linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -15080,7 +15128,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c linux-2.6.32.24/arch/x8 diff -urNp linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c --- linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -15092,7 +15140,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.24/arch EXPORT_SYMBOL(copy_page); diff -urNp linux-2.6.32.24/arch/x86/kernel/xsave.c linux-2.6.32.24/arch/x86/kernel/xsave.c --- linux-2.6.32.24/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kernel/xsave.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kernel/xsave.c 2010-10-23 19:59:19.000000000 -0400 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -15122,7 +15170,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kernel/xsave.c linux-2.6.32.24/arch/x86/kern /* diff -urNp linux-2.6.32.24/arch/x86/kvm/emulate.c linux-2.6.32.24/arch/x86/kvm/emulate.c --- linux-2.6.32.24/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kvm/emulate.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kvm/emulate.c 2010-10-23 19:59:19.000000000 -0400 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #define Src2ImmByte (2<<29) @@ -15161,7 +15209,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kvm/emulate.c linux-2.6.32.24/arch/x86/kvm/e ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ diff -urNp linux-2.6.32.24/arch/x86/kvm/lapic.c linux-2.6.32.24/arch/x86/kvm/lapic.c --- linux-2.6.32.24/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kvm/lapic.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kvm/lapic.c 2010-10-23 19:59:19.000000000 -0400 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -15173,7 +15221,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kvm/lapic.c linux-2.6.32.24/arch/x86/kvm/lap /* 14 is the version for Xeon and Pentium 8.4.8*/ diff -urNp linux-2.6.32.24/arch/x86/kvm/svm.c linux-2.6.32.24/arch/x86/kvm/svm.c --- linux-2.6.32.24/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kvm/svm.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kvm/svm.c 2010-10-23 19:59:19.000000000 -0400 @@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -15199,7 +15247,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kvm/svm.c linux-2.6.32.24/arch/x86/kvm/svm.c .hardware_setup = svm_hardware_setup, diff -urNp linux-2.6.32.24/arch/x86/kvm/vmx.c linux-2.6.32.24/arch/x86/kvm/vmx.c --- linux-2.6.32.24/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kvm/vmx.c 2010-09-28 18:19:37.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kvm/vmx.c 2010-10-23 19:59:19.000000000 -0400 @@ -569,7 +569,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -15283,7 +15331,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kvm/vmx.c linux-2.6.32.24/arch/x86/kvm/vmx.c .hardware_setup = hardware_setup, diff -urNp linux-2.6.32.24/arch/x86/kvm/x86.c linux-2.6.32.24/arch/x86/kvm/x86.c --- linux-2.6.32.24/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/kvm/x86.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/kvm/x86.c 2010-10-23 19:59:19.000000000 -0400 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -15387,7 +15435,7 @@ diff -urNp linux-2.6.32.24/arch/x86/kvm/x86.c linux-2.6.32.24/arch/x86/kvm/x86.c printk(KERN_ERR "kvm: already loaded the other module\n"); diff -urNp linux-2.6.32.24/arch/x86/lib/checksum_32.S linux-2.6.32.24/arch/x86/lib/checksum_32.S --- linux-2.6.32.24/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/checksum_32.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/checksum_32.S 2010-10-23 19:59:19.000000000 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -15635,7 +15683,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/checksum_32.S linux-2.6.32.24/arch/x86/l #undef ROUND1 diff -urNp linux-2.6.32.24/arch/x86/lib/clear_page_64.S linux-2.6.32.24/arch/x86/lib/clear_page_64.S --- linux-2.6.32.24/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/clear_page_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/clear_page_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -15647,7 +15695,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/clear_page_64.S linux-2.6.32.24/arch/x86 2: diff -urNp linux-2.6.32.24/arch/x86/lib/copy_page_64.S linux-2.6.32.24/arch/x86/lib/copy_page_64.S --- linux-2.6.32.24/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/copy_page_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/copy_page_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -15659,7 +15707,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/copy_page_64.S linux-2.6.32.24/arch/x86/ 2: diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_64.S linux-2.6.32.24/arch/x86/lib/copy_user_64.S --- linux-2.6.32.24/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/copy_user_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/copy_user_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -15,13 +15,14 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15736,7 +15784,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_64.S linux-2.6.32.24/arch/x86/ rep diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S --- linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -14,6 +14,7 @@ #include <asm/current.h> #include <asm/asm-offsets.h> @@ -15763,7 +15811,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.24/a ALIGN_DESTINATION diff -urNp linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c --- linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -15784,7 +15832,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.24/arch/ } diff -urNp linux-2.6.32.24/arch/x86/lib/getuser.S linux-2.6.32.24/arch/x86/lib/getuser.S --- linux-2.6.32.24/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/getuser.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/getuser.S 2010-10-23 19:59:19.000000000 -0400 @@ -33,14 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -15923,7 +15971,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/getuser.S linux-2.6.32.24/arch/x86/lib/g ret diff -urNp linux-2.6.32.24/arch/x86/lib/memcpy_64.S linux-2.6.32.24/arch/x86/lib/memcpy_64.S --- linux-2.6.32.24/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/memcpy_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/memcpy_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -15935,7 +15983,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/memcpy_64.S linux-2.6.32.24/arch/x86/lib 2: diff -urNp linux-2.6.32.24/arch/x86/lib/memset_64.S linux-2.6.32.24/arch/x86/lib/memset_64.S --- linux-2.6.32.24/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/memset_64.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/memset_64.S 2010-10-23 19:59:19.000000000 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -15947,7 +15995,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/memset_64.S linux-2.6.32.24/arch/x86/lib 2: diff -urNp linux-2.6.32.24/arch/x86/lib/mmx_32.c linux-2.6.32.24/arch/x86/lib/mmx_32.c --- linux-2.6.32.24/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/mmx_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/mmx_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -16265,7 +16313,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/mmx_32.c linux-2.6.32.24/arch/x86/lib/mm to += 64; diff -urNp linux-2.6.32.24/arch/x86/lib/putuser.S linux-2.6.32.24/arch/x86/lib/putuser.S --- linux-2.6.32.24/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/putuser.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/putuser.S 2010-10-23 19:59:19.000000000 -0400 @@ -15,7 +15,8 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -16448,7 +16496,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/putuser.S linux-2.6.32.24/arch/x86/lib/p END(bad_put_user) diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_32.c linux-2.6.32.24/arch/x86/lib/usercopy_32.c --- linux-2.6.32.24/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/usercopy_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/usercopy_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -17419,7 +17467,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_32.c linux-2.6.32.24/arch/x86/l +EXPORT_SYMBOL(set_fs); diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_64.c linux-2.6.32.24/arch/x86/lib/usercopy_64.c --- linux-2.6.32.24/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/lib/usercopy_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -42,6 +42,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -17458,7 +17506,7 @@ diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_64.c linux-2.6.32.24/arch/x86/l diff -urNp linux-2.6.32.24/arch/x86/Makefile linux-2.6.32.24/arch/x86/Makefile --- linux-2.6.32.24/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -17474,7 +17522,7 @@ diff -urNp linux-2.6.32.24/arch/x86/Makefile linux-2.6.32.24/arch/x86/Makefile + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) diff -urNp linux-2.6.32.24/arch/x86/mm/extable.c linux-2.6.32.24/arch/x86/mm/extable.c --- linux-2.6.32.24/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/extable.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/extable.c 2010-10-23 19:59:19.000000000 -0400 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -17550,7 +17598,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/extable.c linux-2.6.32.24/arch/x86/mm/ext pnp_bios_is_utter_crap = 1; diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault.c --- linux-2.6.32.24/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/fault.c 2010-10-23 19:59:24.000000000 -0400 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -17746,7 +17794,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault + struct mm_struct *mm = tsk->mm; + +#ifdef CONFIG_X86_64 -+ if (mm && (error_code & PF_INSTR)) { ++ if (mm && (error_code & PF_INSTR) && mm->context.vdso) { + if (regs->ip == (unsigned long)vgettimeofday) { + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday); + return; @@ -17765,7 +17813,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault + unsigned long ip = regs->ip; + + if (v8086_mode(regs)) -+ ip = ((regs->cs & 0xffff) << 4) + (regs->ip & 0xffff); ++ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff); + + /* + * It's possible to have interrupts off here: @@ -17774,7 +17822,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault + +#ifdef CONFIG_PAX_PAGEEXEC + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && -+ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && regs->ip == address))) { ++ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && ip == address))) { + +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { @@ -17783,13 +17831,13 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault + } +#endif + -+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); ++ pax_report_fault(regs, (void *)ip, (void *)regs->sp); + do_group_exit(SIGKILL); + } +#endif + +#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (regs->ip + SEGMEXEC_TASK_SIZE == address)) { ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address)) { + +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { @@ -17798,7 +17846,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault + } +#endif + -+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); ++ pax_report_fault(regs, (void *)ip, (void *)regs->sp); + do_group_exit(SIGKILL); + } +#endif @@ -18220,7 +18268,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault +} diff -urNp linux-2.6.32.24/arch/x86/mm/gup.c linux-2.6.32.24/arch/x86/mm/gup.c --- linux-2.6.32.24/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/gup.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/gup.c 2010-10-23 19:59:19.000000000 -0400 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -18232,7 +18280,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/gup.c linux-2.6.32.24/arch/x86/mm/gup.c diff -urNp linux-2.6.32.24/arch/x86/mm/highmem_32.c linux-2.6.32.24/arch/x86/mm/highmem_32.c --- linux-2.6.32.24/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/highmem_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/highmem_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -18246,7 +18294,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/highmem_32.c linux-2.6.32.24/arch/x86/mm/ } diff -urNp linux-2.6.32.24/arch/x86/mm/hugetlbpage.c linux-2.6.32.24/arch/x86/mm/hugetlbpage.c --- linux-2.6.32.24/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/hugetlbpage.c 2010-09-26 22:08:46.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/hugetlbpage.c 2010-10-23 19:59:19.000000000 -0400 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -18452,7 +18500,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/hugetlbpage.c linux-2.6.32.24/arch/x86/mm if (mm->get_unmapped_area == arch_get_unmapped_area) diff -urNp linux-2.6.32.24/arch/x86/mm/init_32.c linux-2.6.32.24/arch/x86/mm/init_32.c --- linux-2.6.32.24/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/init_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -18758,7 +18806,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/init_32.c linux-2.6.32.24/arch/x86/mm/ini size >> 10); diff -urNp linux-2.6.32.24/arch/x86/mm/init_64.c linux-2.6.32.24/arch/x86/mm/init_64.c --- linux-2.6.32.24/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/init_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/init_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -18821,7 +18869,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/init_64.c linux-2.6.32.24/arch/x86/mm/ini return "[vsyscall]"; diff -urNp linux-2.6.32.24/arch/x86/mm/init.c linux-2.6.32.24/arch/x86/mm/init.c --- linux-2.6.32.24/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/init.c 2010-09-16 22:50:17.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/init.c 2010-10-23 19:59:19.000000000 -0400 @@ -69,11 +69,7 @@ static void __init find_early_table_spac * cause a hotspot and fill up ZONE_DMA. The page tables * need roughly 0.5KB per GB. @@ -18950,7 +18998,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/init.c linux-2.6.32.24/arch/x86/mm/init.c (unsigned long)(&__init_end)); diff -urNp linux-2.6.32.24/arch/x86/mm/iomap_32.c linux-2.6.32.24/arch/x86/mm/iomap_32.c --- linux-2.6.32.24/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/iomap_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/iomap_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -18965,7 +19013,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/iomap_32.c linux-2.6.32.24/arch/x86/mm/io return (void *)vaddr; diff -urNp linux-2.6.32.24/arch/x86/mm/ioremap.c linux-2.6.32.24/arch/x86/mm/ioremap.c --- linux-2.6.32.24/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/ioremap.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/ioremap.c 2010-10-23 19:59:19.000000000 -0400 @@ -41,8 +41,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. @@ -19014,7 +19062,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/ioremap.c linux-2.6.32.24/arch/x86/mm/ior * The boot-ioremap range spans multiple pmds, for which diff -urNp linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c --- linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c 2010-10-23 19:59:19.000000000 -0400 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg * memory (e.g. tracked pages)? For now, we need this to avoid * invoking kmemcheck for PnP BIOS calls. @@ -19029,7 +19077,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.24/arc pte = kmemcheck_pte_lookup(address); diff -urNp linux-2.6.32.24/arch/x86/mm/mmap.c linux-2.6.32.24/arch/x86/mm/mmap.c --- linux-2.6.32.24/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/mmap.c 2010-10-23 19:59:19.000000000 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -19113,7 +19161,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/mmap.c linux-2.6.32.24/arch/x86/mm/mmap.c } diff -urNp linux-2.6.32.24/arch/x86/mm/numa_32.c linux-2.6.32.24/arch/x86/mm/numa_32.c --- linux-2.6.32.24/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/numa_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/numa_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -19124,7 +19172,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/numa_32.c linux-2.6.32.24/arch/x86/mm/num #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr.c linux-2.6.32.24/arch/x86/mm/pageattr.c --- linux-2.6.32.24/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/pageattr.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/pageattr.c 2010-10-23 19:59:19.000000000 -0400 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. */ @@ -19203,7 +19251,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr.c linux-2.6.32.24/arch/x86/mm/pa static int diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr-test.c linux-2.6.32.24/arch/x86/mm/pageattr-test.c --- linux-2.6.32.24/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/pageattr-test.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/pageattr-test.c 2010-10-23 19:59:19.000000000 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -19215,7 +19263,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr-test.c linux-2.6.32.24/arch/x86/ struct split_state { diff -urNp linux-2.6.32.24/arch/x86/mm/pat.c linux-2.6.32.24/arch/x86/mm/pat.c --- linux-2.6.32.24/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/pat.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/pat.c 2010-10-23 19:59:19.000000000 -0400 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -19265,7 +19313,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pat.c linux-2.6.32.24/arch/x86/mm/pat.c (unsigned long long)(paddr + size), diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable_32.c linux-2.6.32.24/arch/x86/mm/pgtable_32.c --- linux-2.6.32.24/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/pgtable_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/pgtable_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -19282,8 +19330,8 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable_32.c linux-2.6.32.24/arch/x86/mm/ * It's enough to flush this one mapping. diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgtable.c --- linux-2.6.32.24/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/pgtable.c 2010-09-04 15:54:51.000000000 -0400 -@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p ++++ linux-2.6.32.24/arch/x86/mm/pgtable.c 2010-10-23 19:59:24.000000000 -0400 +@@ -83,8 +83,58 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -19296,7 +19344,6 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt +{ + while (count--) + *dst++ = __pgd((pgd_val(*src++) | _PAGE_NX) & ~_PAGE_USER); -+ +} +#endif + @@ -19345,7 +19392,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt static void pgd_ctor(pgd_t *pgd) { -@@ -119,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd) +@@ -119,6 +169,7 @@ static void pgd_dtor(pgd_t *pgd) pgd_list_del(pgd); spin_unlock_irqrestore(&pgd_lock, flags); } @@ -19353,7 +19400,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt /* * List of all pgd's needed for non-PAE so it can invalidate entries -@@ -131,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd) +@@ -131,7 +182,7 @@ static void pgd_dtor(pgd_t *pgd) * -- wli */ @@ -19362,7 +19409,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt /* * In PAE mode, we need to do a cr3 reload (=tlb flush) when * updating the top-level pagetable entries to guarantee the -@@ -143,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd) +@@ -143,7 +194,7 @@ static void pgd_dtor(pgd_t *pgd) * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate * and initialize the kernel pmds here. */ @@ -19371,7 +19418,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) { -@@ -162,36 +214,38 @@ void pud_populate(struct mm_struct *mm, +@@ -162,36 +213,38 @@ void pud_populate(struct mm_struct *mm, if (mm == current->active_mm) write_cr3(read_cr3()); } @@ -19421,7 +19468,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt return -ENOMEM; } -@@ -204,51 +258,56 @@ static int preallocate_pmds(pmd_t *pmds[ +@@ -204,51 +257,56 @@ static int preallocate_pmds(pmd_t *pmds[ * preallocate which never got a corresponding vma will need to be * freed manually. */ @@ -19495,7 +19542,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt unsigned long flags; pgd = (pgd_t *)__get_free_page(PGALLOC_GFP); -@@ -258,11 +317,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) +@@ -258,11 +316,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) mm->pgd = pgd; @@ -19509,7 +19556,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt /* * Make sure that pre-populating the pmds is atomic with -@@ -272,14 +331,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) +@@ -272,14 +330,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) spin_lock_irqsave(&pgd_lock, flags); pgd_ctor(pgd); @@ -19527,7 +19574,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt out_free_pgd: free_page((unsigned long)pgd); out: -@@ -288,7 +347,7 @@ out: +@@ -288,7 +346,7 @@ out: void pgd_free(struct mm_struct *mm, pgd_t *pgd) { @@ -19538,7 +19585,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgt free_page((unsigned long)pgd); diff -urNp linux-2.6.32.24/arch/x86/mm/setup_nx.c linux-2.6.32.24/arch/x86/mm/setup_nx.c --- linux-2.6.32.24/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/setup_nx.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/setup_nx.c 2010-10-23 19:59:19.000000000 -0400 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -19606,7 +19653,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/setup_nx.c linux-2.6.32.24/arch/x86/mm/se #endif diff -urNp linux-2.6.32.24/arch/x86/mm/tlb.c linux-2.6.32.24/arch/x86/mm/tlb.c --- linux-2.6.32.24/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/mm/tlb.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/mm/tlb.c 2010-10-23 19:59:19.000000000 -0400 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -19630,7 +19677,7 @@ diff -urNp linux-2.6.32.24/arch/x86/mm/tlb.c linux-2.6.32.24/arch/x86/mm/tlb.c diff -urNp linux-2.6.32.24/arch/x86/oprofile/backtrace.c linux-2.6.32.24/arch/x86/oprofile/backtrace.c --- linux-2.6.32.24/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/oprofile/backtrace.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/oprofile/backtrace.c 2010-10-23 19:59:19.000000000 -0400 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -19651,7 +19698,7 @@ diff -urNp linux-2.6.32.24/arch/x86/oprofile/backtrace.c linux-2.6.32.24/arch/x8 dump_trace(NULL, regs, (unsigned long *)stack, 0, diff -urNp linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c --- linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c 2010-10-23 19:59:19.000000000 -0400 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -19663,7 +19710,7 @@ diff -urNp linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c linux-2.6.32.24/arch/ return smp_num_siblings == 2 ? 2 : 1; diff -urNp linux-2.6.32.24/arch/x86/pci/common.c linux-2.6.32.24/arch/x86/pci/common.c --- linux-2.6.32.24/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/common.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/common.c 2010-10-23 19:59:19.000000000 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -19686,7 +19733,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/common.c linux-2.6.32.24/arch/x86/pci/co void __init dmi_check_pciprobe(void) diff -urNp linux-2.6.32.24/arch/x86/pci/direct.c linux-2.6.32.24/arch/x86/pci/direct.c --- linux-2.6.32.24/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/direct.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/direct.c 2010-10-23 19:59:19.000000000 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -19716,7 +19763,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/direct.c linux-2.6.32.24/arch/x86/pci/di int year, devfn; diff -urNp linux-2.6.32.24/arch/x86/pci/fixup.c linux-2.6.32.24/arch/x86/pci/fixup.c --- linux-2.6.32.24/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/fixup.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/fixup.c 2010-10-23 19:59:19.000000000 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -19737,7 +19784,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/fixup.c linux-2.6.32.24/arch/x86/pci/fix static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) diff -urNp linux-2.6.32.24/arch/x86/pci/irq.c linux-2.6.32.24/arch/x86/pci/irq.c --- linux-2.6.32.24/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/irq.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/irq.c 2010-10-23 19:59:19.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) }, @@ -19758,7 +19805,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/irq.c linux-2.6.32.24/arch/x86/pci/irq.c int __init pcibios_irq_init(void) diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_32.c linux-2.6.32.24/arch/x86/pci/mmconfig_32.c --- linux-2.6.32.24/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/mmconfig_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/mmconfig_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19770,7 +19817,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_32.c linux-2.6.32.24/arch/x86/p }; diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_64.c linux-2.6.32.24/arch/x86/pci/mmconfig_64.c --- linux-2.6.32.24/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/mmconfig_64.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/mmconfig_64.c 2010-10-23 19:59:19.000000000 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -19782,7 +19829,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_64.c linux-2.6.32.24/arch/x86/p }; diff -urNp linux-2.6.32.24/arch/x86/pci/numaq_32.c linux-2.6.32.24/arch/x86/pci/numaq_32.c --- linux-2.6.32.24/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/numaq_32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/numaq_32.c 2010-10-23 19:59:19.000000000 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -19794,7 +19841,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/numaq_32.c linux-2.6.32.24/arch/x86/pci/ }; diff -urNp linux-2.6.32.24/arch/x86/pci/olpc.c linux-2.6.32.24/arch/x86/pci/olpc.c --- linux-2.6.32.24/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/olpc.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/olpc.c 2010-10-23 19:59:19.000000000 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -19806,7 +19853,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/olpc.c linux-2.6.32.24/arch/x86/pci/olpc }; diff -urNp linux-2.6.32.24/arch/x86/pci/pcbios.c linux-2.6.32.24/arch/x86/pci/pcbios.c --- linux-2.6.32.24/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/pci/pcbios.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/pci/pcbios.c 2010-10-23 19:59:19.000000000 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -20131,7 +20178,7 @@ diff -urNp linux-2.6.32.24/arch/x86/pci/pcbios.c linux-2.6.32.24/arch/x86/pci/pc EXPORT_SYMBOL(pcibios_set_irq_routing); diff -urNp linux-2.6.32.24/arch/x86/power/cpu.c linux-2.6.32.24/arch/x86/power/cpu.c --- linux-2.6.32.24/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/power/cpu.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/power/cpu.c 2010-10-23 19:59:19.000000000 -0400 @@ -129,7 +129,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -20153,7 +20200,7 @@ diff -urNp linux-2.6.32.24/arch/x86/power/cpu.c linux-2.6.32.24/arch/x86/power/c #endif diff -urNp linux-2.6.32.24/arch/x86/vdso/Makefile linux-2.6.32.24/arch/x86/vdso/Makefile --- linux-2.6.32.24/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/Makefile 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/Makefile 2010-10-23 19:59:19.000000000 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -20165,7 +20212,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/Makefile linux-2.6.32.24/arch/x86/vdso/ # diff -urNp linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c --- linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c 2010-10-23 19:59:19.000000000 -0400 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -20266,7 +20313,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c linux-2.6.32.24/arch/x __attribute__((weak, alias("__vdso_gettimeofday"))); diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c --- linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c 2010-10-23 19:59:19.000000000 -0400 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -20369,7 +20416,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c linux-2.6.32.24/arch/x86 } diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso.lds.S linux-2.6.32.24/arch/x86/vdso/vdso.lds.S --- linux-2.6.32.24/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/vdso.lds.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/vdso.lds.S 2010-10-23 19:59:19.000000000 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -20382,7 +20429,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso.lds.S linux-2.6.32.24/arch/x86/vds +#undef VEXTERN diff -urNp linux-2.6.32.24/arch/x86/vdso/vextern.h linux-2.6.32.24/arch/x86/vdso/vextern.h --- linux-2.6.32.24/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/vextern.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/vextern.h 2010-10-23 19:59:19.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. */ @@ -20392,7 +20439,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/vextern.h linux-2.6.32.24/arch/x86/vdso VEXTERN(vsyscall_gtod_data) diff -urNp linux-2.6.32.24/arch/x86/vdso/vma.c linux-2.6.32.24/arch/x86/vdso/vma.c --- linux-2.6.32.24/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/vdso/vma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/vdso/vma.c 2010-10-23 19:59:19.000000000 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -20441,7 +20488,7 @@ diff -urNp linux-2.6.32.24/arch/x86/vdso/vma.c linux-2.6.32.24/arch/x86/vdso/vma -__setup("vdso=", vdso_setup); diff -urNp linux-2.6.32.24/arch/x86/xen/enlighten.c linux-2.6.32.24/arch/x86/xen/enlighten.c --- linux-2.6.32.24/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/xen/enlighten.c 2010-09-17 17:30:16.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/xen/enlighten.c 2010-10-23 19:59:19.000000000 -0400 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -20499,7 +20546,7 @@ diff -urNp linux-2.6.32.24/arch/x86/xen/enlighten.c linux-2.6.32.24/arch/x86/xen pgd = (pgd_t *)xen_start_info->pt_base; diff -urNp linux-2.6.32.24/arch/x86/xen/mmu.c linux-2.6.32.24/arch/x86/xen/mmu.c --- linux-2.6.32.24/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/xen/mmu.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/xen/mmu.c 2010-10-23 19:59:19.000000000 -0400 @@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -20522,7 +20569,7 @@ diff -urNp linux-2.6.32.24/arch/x86/xen/mmu.c linux-2.6.32.24/arch/x86/xen/mmu.c diff -urNp linux-2.6.32.24/arch/x86/xen/smp.c linux-2.6.32.24/arch/x86/xen/smp.c --- linux-2.6.32.24/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/xen/smp.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/xen/smp.c 2010-10-23 19:59:19.000000000 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -20548,7 +20595,7 @@ diff -urNp linux-2.6.32.24/arch/x86/xen/smp.c linux-2.6.32.24/arch/x86/xen/smp.c ctxt->user_regs.fs = __KERNEL_PERCPU; diff -urNp linux-2.6.32.24/arch/x86/xen/xen-head.S linux-2.6.32.24/arch/x86/xen/xen-head.S --- linux-2.6.32.24/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/xen/xen-head.S 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/xen/xen-head.S 2010-10-23 19:59:19.000000000 -0400 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -20569,7 +20616,7 @@ diff -urNp linux-2.6.32.24/arch/x86/xen/xen-head.S linux-2.6.32.24/arch/x86/xen/ mov $init_thread_union+THREAD_SIZE,%rsp diff -urNp linux-2.6.32.24/arch/x86/xen/xen-ops.h linux-2.6.32.24/arch/x86/xen/xen-ops.h --- linux-2.6.32.24/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/arch/x86/xen/xen-ops.h 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/arch/x86/xen/xen-ops.h 2010-10-23 19:59:19.000000000 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -20581,7 +20628,7 @@ diff -urNp linux-2.6.32.24/arch/x86/xen/xen-ops.h linux-2.6.32.24/arch/x86/xen/x diff -urNp linux-2.6.32.24/block/blk-integrity.c linux-2.6.32.24/block/blk-integrity.c --- linux-2.6.32.24/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/blk-integrity.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/blk-integrity.c 2010-10-23 19:59:19.000000000 -0400 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -20593,7 +20640,7 @@ diff -urNp linux-2.6.32.24/block/blk-integrity.c linux-2.6.32.24/block/blk-integ }; diff -urNp linux-2.6.32.24/block/blk-iopoll.c linux-2.6.32.24/block/blk-iopoll.c --- linux-2.6.32.24/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/blk-iopoll.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/blk-iopoll.c 2010-10-23 19:59:19.000000000 -0400 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -20605,7 +20652,7 @@ diff -urNp linux-2.6.32.24/block/blk-iopoll.c linux-2.6.32.24/block/blk-iopoll.c int rearm = 0, budget = blk_iopoll_budget; diff -urNp linux-2.6.32.24/block/blk-map.c linux-2.6.32.24/block/blk-map.c --- linux-2.6.32.24/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/blk-map.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/blk-map.c 2010-10-23 19:59:19.000000000 -0400 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -20626,7 +20673,7 @@ diff -urNp linux-2.6.32.24/block/blk-map.c linux-2.6.32.24/block/blk-map.c else diff -urNp linux-2.6.32.24/block/blk-softirq.c linux-2.6.32.24/block/blk-softirq.c --- linux-2.6.32.24/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/blk-softirq.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/blk-softirq.c 2010-10-23 19:59:19.000000000 -0400 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, * Softirq action handler - move entries to local list and loop over them * while passing them to the queue registered handler. @@ -20638,7 +20685,7 @@ diff -urNp linux-2.6.32.24/block/blk-softirq.c linux-2.6.32.24/block/blk-softirq diff -urNp linux-2.6.32.24/block/blk-sysfs.c linux-2.6.32.24/block/blk-sysfs.c --- linux-2.6.32.24/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/blk-sysfs.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/blk-sysfs.c 2010-10-23 19:59:19.000000000 -0400 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -20650,7 +20697,7 @@ diff -urNp linux-2.6.32.24/block/blk-sysfs.c linux-2.6.32.24/block/blk-sysfs.c }; diff -urNp linux-2.6.32.24/block/elevator.c linux-2.6.32.24/block/elevator.c --- linux-2.6.32.24/block/elevator.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/block/elevator.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/block/elevator.c 2010-10-23 19:59:19.000000000 -0400 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -20662,7 +20709,7 @@ diff -urNp linux-2.6.32.24/block/elevator.c linux-2.6.32.24/block/elevator.c }; diff -urNp linux-2.6.32.24/crypto/lrw.c linux-2.6.32.24/crypto/lrw.c --- linux-2.6.32.24/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/crypto/lrw.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/crypto/lrw.c 2010-10-23 19:59:19.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; @@ -20674,7 +20721,7 @@ diff -urNp linux-2.6.32.24/crypto/lrw.c linux-2.6.32.24/crypto/lrw.c crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); diff -urNp linux-2.6.32.24/Documentation/dontdiff linux-2.6.32.24/Documentation/dontdiff --- linux-2.6.32.24/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/Documentation/dontdiff 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/Documentation/dontdiff 2010-10-23 19:59:19.000000000 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -20794,7 +20841,7 @@ diff -urNp linux-2.6.32.24/Documentation/dontdiff linux-2.6.32.24/Documentation/ +zoffset.h diff -urNp linux-2.6.32.24/Documentation/kernel-parameters.txt linux-2.6.32.24/Documentation/kernel-parameters.txt --- linux-2.6.32.24/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/Documentation/kernel-parameters.txt 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/Documentation/kernel-parameters.txt 2010-10-23 19:59:19.000000000 -0400 @@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -20810,7 +20857,7 @@ diff -urNp linux-2.6.32.24/Documentation/kernel-parameters.txt linux-2.6.32.24/D pcd. [PARIDE] diff -urNp linux-2.6.32.24/drivers/acpi/acpi_pad.c linux-2.6.32.24/drivers/acpi/acpi_pad.c --- linux-2.6.32.24/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/acpi_pad.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/acpi_pad.c 2010-10-23 19:59:19.000000000 -0400 @@ -30,7 +30,7 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> @@ -20822,7 +20869,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/acpi_pad.c linux-2.6.32.24/drivers/acpi/ static DEFINE_MUTEX(isolated_cpus_lock); diff -urNp linux-2.6.32.24/drivers/acpi/battery.c linux-2.6.32.24/drivers/acpi/battery.c --- linux-2.6.32.24/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/battery.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/battery.c 2010-10-23 19:59:19.000000000 -0400 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -20834,7 +20881,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/battery.c linux-2.6.32.24/drivers/acpi/b } acpi_battery_file[] = { diff -urNp linux-2.6.32.24/drivers/acpi/blacklist.c linux-2.6.32.24/drivers/acpi/blacklist.c --- linux-2.6.32.24/drivers/acpi/blacklist.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/blacklist.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/blacklist.c 2010-10-23 19:59:19.000000000 -0400 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -20846,7 +20893,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/blacklist.c linux-2.6.32.24/drivers/acpi #if CONFIG_ACPI_BLACKLIST_YEAR diff -urNp linux-2.6.32.24/drivers/acpi/dock.c linux-2.6.32.24/drivers/acpi/dock.c --- linux-2.6.32.24/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/dock.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/dock.c 2010-10-23 19:59:19.000000000 -0400 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -20867,7 +20914,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/dock.c linux-2.6.32.24/drivers/acpi/dock struct dock_dependent_device *dd; diff -urNp linux-2.6.32.24/drivers/acpi/osl.c linux-2.6.32.24/drivers/acpi/osl.c --- linux-2.6.32.24/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/osl.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/osl.c 2010-10-23 19:59:19.000000000 -0400 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -20888,7 +20935,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/osl.c linux-2.6.32.24/drivers/acpi/osl.c case 8: diff -urNp linux-2.6.32.24/drivers/acpi/power_meter.c linux-2.6.32.24/drivers/acpi/power_meter.c --- linux-2.6.32.24/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/power_meter.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/power_meter.c 2010-10-23 19:59:19.000000000 -0400 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; @@ -20900,7 +20947,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/power_meter.c linux-2.6.32.24/drivers/ac resource->trip[attr->index - 7] = temp; diff -urNp linux-2.6.32.24/drivers/acpi/proc.c linux-2.6.32.24/drivers/acpi/proc.c --- linux-2.6.32.24/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/proc.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/proc.c 2010-10-23 19:59:19.000000000 -0400 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -20938,7 +20985,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/proc.c linux-2.6.32.24/drivers/acpi/proc found_dev = dev; diff -urNp linux-2.6.32.24/drivers/acpi/processor_core.c linux-2.6.32.24/drivers/acpi/processor_core.c --- linux-2.6.32.24/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/processor_core.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/processor_core.c 2010-10-23 19:59:19.000000000 -0400 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -20950,7 +20997,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/processor_core.c linux-2.6.32.24/drivers * Buggy BIOS check diff -urNp linux-2.6.32.24/drivers/acpi/processor_idle.c linux-2.6.32.24/drivers/acpi/processor_idle.c --- linux-2.6.32.24/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/processor_idle.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/processor_idle.c 2010-10-23 19:59:19.000000000 -0400 @@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, @@ -20962,7 +21009,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/processor_idle.c linux-2.6.32.24/drivers diff -urNp linux-2.6.32.24/drivers/acpi/sbshc.c linux-2.6.32.24/drivers/acpi/sbshc.c --- linux-2.6.32.24/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/sbshc.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/sbshc.c 2010-10-23 19:59:19.000000000 -0400 @@ -17,7 +17,7 @@ #define PREFIX "ACPI: " @@ -20974,7 +21021,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/sbshc.c linux-2.6.32.24/drivers/acpi/sbs struct acpi_smb_hc { diff -urNp linux-2.6.32.24/drivers/acpi/sleep.c linux-2.6.32.24/drivers/acpi/sleep.c --- linux-2.6.32.24/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/sleep.c 2010-10-23 19:59:19.000000000 -0400 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp } } @@ -21013,7 +21060,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/sleep.c linux-2.6.32.24/drivers/acpi/sle .pre_snapshot = acpi_hibernation_pre_snapshot_old, diff -urNp linux-2.6.32.24/drivers/acpi/video.c linux-2.6.32.24/drivers/acpi/video.c --- linux-2.6.32.24/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/acpi/video.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/acpi/video.c 2010-10-23 19:59:19.000000000 -0400 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -21025,7 +21072,7 @@ diff -urNp linux-2.6.32.24/drivers/acpi/video.c linux-2.6.32.24/drivers/acpi/vid }; diff -urNp linux-2.6.32.24/drivers/ata/ahci.c linux-2.6.32.24/drivers/ata/ahci.c --- linux-2.6.32.24/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/ahci.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/ahci.c 2010-10-23 19:59:19.000000000 -0400 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -21067,7 +21114,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/ahci.c linux-2.6.32.24/drivers/ata/ahci.c diff -urNp linux-2.6.32.24/drivers/ata/ata_generic.c linux-2.6.32.24/drivers/ata/ata_generic.c --- linux-2.6.32.24/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/ata_generic.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/ata_generic.c 2010-10-23 19:59:19.000000000 -0400 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -21079,7 +21126,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/ata_generic.c linux-2.6.32.24/drivers/ata .set_mode = generic_set_mode, diff -urNp linux-2.6.32.24/drivers/ata/ata_piix.c linux-2.6.32.24/drivers/ata/ata_piix.c --- linux-2.6.32.24/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/ata_piix.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/ata_piix.c 2010-10-23 19:59:19.000000000 -0400 @@ -300,7 +300,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (CPT) */ @@ -21145,7 +21192,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/ata_piix.c linux-2.6.32.24/drivers/ata/at "Tecra M3,", diff -urNp linux-2.6.32.24/drivers/ata/libata-acpi.c linux-2.6.32.24/drivers/ata/libata-acpi.c --- linux-2.6.32.24/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/libata-acpi.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/libata-acpi.c 2010-10-23 19:59:19.000000000 -0400 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -21163,7 +21210,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/libata-acpi.c linux-2.6.32.24/drivers/ata }; diff -urNp linux-2.6.32.24/drivers/ata/libata-core.c linux-2.6.32.24/drivers/ata/libata-core.c --- linux-2.6.32.24/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/libata-core.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/libata-core.c 2010-10-23 19:59:24.000000000 -0400 @@ -900,7 +900,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 }, @@ -21191,6 +21238,24 @@ diff -urNp linux-2.6.32.24/drivers/ata/libata-core.c linux-2.6.32.24/drivers/ata }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) +@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd * + struct ata_port *ap; + unsigned int tag; + +- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ ++ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ + ap = qc->ap; + + qc->flags = 0; +@@ -4970,7 +4970,7 @@ void __ata_qc_complete(struct ata_queued + struct ata_port *ap; + struct ata_link *link; + +- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ ++ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */ + WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); + ap = qc->ap; + link = qc->dev->link; @@ -5981,7 +5981,7 @@ static void ata_host_stop(struct device * LOCKING: * None. @@ -21239,7 +21304,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/libata-core.c linux-2.6.32.24/drivers/ata .error_handler = ata_dummy_error_handler, diff -urNp linux-2.6.32.24/drivers/ata/libata-eh.c linux-2.6.32.24/drivers/ata/libata-eh.c --- linux-2.6.32.24/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/libata-eh.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/libata-eh.c 2010-10-23 19:59:19.000000000 -0400 @@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) @@ -21251,7 +21316,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/libata-eh.c linux-2.6.32.24/drivers/ata/l /* ignore built-in hardreset if SCR access is not available */ diff -urNp linux-2.6.32.24/drivers/ata/libata-pmp.c linux-2.6.32.24/drivers/ata/libata-pmp.c --- linux-2.6.32.24/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/libata-pmp.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/libata-pmp.c 2010-10-23 19:59:19.000000000 -0400 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -21263,7 +21328,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/libata-pmp.c linux-2.6.32.24/drivers/ata/ struct ata_device *pmp_dev = pmp_link->device; diff -urNp linux-2.6.32.24/drivers/ata/pata_acpi.c linux-2.6.32.24/drivers/ata/pata_acpi.c --- linux-2.6.32.24/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_acpi.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_acpi.c 2010-10-23 19:59:19.000000000 -0400 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -21275,7 +21340,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_acpi.c linux-2.6.32.24/drivers/ata/p .cable_detect = pacpi_cable_detect, diff -urNp linux-2.6.32.24/drivers/ata/pata_ali.c linux-2.6.32.24/drivers/ata/pata_ali.c --- linux-2.6.32.24/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_ali.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_ali.c 2010-10-23 19:59:19.000000000 -0400 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -21323,7 +21388,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_ali.c linux-2.6.32.24/drivers/ata/pa .dev_config = ali_warn_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/pata_amd.c linux-2.6.32.24/drivers/ata/pata_amd.c --- linux-2.6.32.24/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_amd.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_amd.c 2010-10-23 19:59:19.000000000 -0400 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -21375,7 +21440,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_amd.c linux-2.6.32.24/drivers/ata/pa .set_dmamode = nv133_set_dmamode, diff -urNp linux-2.6.32.24/drivers/ata/pata_artop.c linux-2.6.32.24/drivers/ata/pata_artop.c --- linux-2.6.32.24/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_artop.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_artop.c 2010-10-23 19:59:19.000000000 -0400 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -21396,7 +21461,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_artop.c linux-2.6.32.24/drivers/ata/ .set_piomode = artop6260_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_at32.c linux-2.6.32.24/drivers/ata/pata_at32.c --- linux-2.6.32.24/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_at32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_at32.c 2010-10-23 19:59:19.000000000 -0400 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21408,7 +21473,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_at32.c linux-2.6.32.24/drivers/ata/p .set_piomode = pata_at32_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_at91.c linux-2.6.32.24/drivers/ata/pata_at91.c --- linux-2.6.32.24/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_at91.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_at91.c 2010-10-23 19:59:19.000000000 -0400 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -21420,7 +21485,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_at91.c linux-2.6.32.24/drivers/ata/p .sff_data_xfer = pata_at91_data_xfer_noirq, diff -urNp linux-2.6.32.24/drivers/ata/pata_atiixp.c linux-2.6.32.24/drivers/ata/pata_atiixp.c --- linux-2.6.32.24/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_atiixp.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_atiixp.c 2010-10-23 19:59:19.000000000 -0400 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21432,7 +21497,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_atiixp.c linux-2.6.32.24/drivers/ata .qc_prep = ata_sff_dumb_qc_prep, diff -urNp linux-2.6.32.24/drivers/ata/pata_atp867x.c linux-2.6.32.24/drivers/ata/pata_atp867x.c --- linux-2.6.32.24/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_atp867x.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_atp867x.c 2010-10-23 19:59:19.000000000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -21444,7 +21509,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_atp867x.c linux-2.6.32.24/drivers/at .set_piomode = atp867x_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_bf54x.c linux-2.6.32.24/drivers/ata/pata_bf54x.c --- linux-2.6.32.24/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_bf54x.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_bf54x.c 2010-10-23 19:59:19.000000000 -0400 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -21456,7 +21521,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_bf54x.c linux-2.6.32.24/drivers/ata/ .set_piomode = bfin_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd640.c linux-2.6.32.24/drivers/ata/pata_cmd640.c --- linux-2.6.32.24/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cmd640.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cmd640.c 2010-10-23 19:59:19.000000000 -0400 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21468,7 +21533,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd640.c linux-2.6.32.24/drivers/ata .sff_data_xfer = ata_sff_data_xfer_noirq, diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd64x.c linux-2.6.32.24/drivers/ata/pata_cmd64x.c --- linux-2.6.32.24/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cmd64x.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cmd64x.c 2010-10-23 19:59:19.000000000 -0400 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -21493,7 +21558,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd64x.c linux-2.6.32.24/drivers/ata .cable_detect = cmd648_cable_detect, diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5520.c linux-2.6.32.24/drivers/ata/pata_cs5520.c --- linux-2.6.32.24/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cs5520.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cs5520.c 2010-10-23 19:59:19.000000000 -0400 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21505,7 +21570,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5520.c linux-2.6.32.24/drivers/ata .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5530.c linux-2.6.32.24/drivers/ata/pata_cs5530.c --- linux-2.6.32.24/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cs5530.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cs5530.c 2010-10-23 19:59:19.000000000 -0400 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -21517,7 +21582,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5530.c linux-2.6.32.24/drivers/ata .qc_prep = ata_sff_dumb_qc_prep, diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5535.c linux-2.6.32.24/drivers/ata/pata_cs5535.c --- linux-2.6.32.24/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cs5535.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cs5535.c 2010-10-23 19:59:19.000000000 -0400 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21529,7 +21594,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5535.c linux-2.6.32.24/drivers/ata .set_piomode = cs5535_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5536.c linux-2.6.32.24/drivers/ata/pata_cs5536.c --- linux-2.6.32.24/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cs5536.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cs5536.c 2010-10-23 19:59:19.000000000 -0400 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21541,7 +21606,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5536.c linux-2.6.32.24/drivers/ata .set_piomode = cs5536_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_cypress.c linux-2.6.32.24/drivers/ata/pata_cypress.c --- linux-2.6.32.24/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_cypress.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_cypress.c 2010-10-23 19:59:19.000000000 -0400 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21553,7 +21618,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_cypress.c linux-2.6.32.24/drivers/at .set_piomode = cy82c693_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_efar.c linux-2.6.32.24/drivers/ata/pata_efar.c --- linux-2.6.32.24/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_efar.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_efar.c 2010-10-23 19:59:19.000000000 -0400 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -21565,7 +21630,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_efar.c linux-2.6.32.24/drivers/ata/p .set_piomode = efar_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt366.c linux-2.6.32.24/drivers/ata/pata_hpt366.c --- linux-2.6.32.24/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_hpt366.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_hpt366.c 2010-10-23 19:59:19.000000000 -0400 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -21577,7 +21642,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt366.c linux-2.6.32.24/drivers/ata .mode_filter = hpt366_filter, diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt37x.c linux-2.6.32.24/drivers/ata/pata_hpt37x.c --- linux-2.6.32.24/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_hpt37x.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_hpt37x.c 2010-10-23 19:59:19.000000000 -0400 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -21616,7 +21681,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt37x.c linux-2.6.32.24/drivers/ata }; diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c --- linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c 2010-10-23 19:59:19.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -21628,7 +21693,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c linux-2.6.32.24/drivers/at .bmdma_stop = hpt3x2n_bmdma_stop, diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x3.c linux-2.6.32.24/drivers/ata/pata_hpt3x3.c --- linux-2.6.32.24/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_hpt3x3.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_hpt3x3.c 2010-10-23 19:59:19.000000000 -0400 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21640,7 +21705,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x3.c linux-2.6.32.24/drivers/ata .set_piomode = hpt3x3_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_icside.c linux-2.6.32.24/drivers/ata/pata_icside.c --- linux-2.6.32.24/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_icside.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_icside.c 2010-10-23 19:59:19.000000000 -0400 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -21652,7 +21717,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_icside.c linux-2.6.32.24/drivers/ata .qc_prep = ata_noop_qc_prep, diff -urNp linux-2.6.32.24/drivers/ata/pata_isapnp.c linux-2.6.32.24/drivers/ata/pata_isapnp.c --- linux-2.6.32.24/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_isapnp.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_isapnp.c 2010-10-23 19:59:19.000000000 -0400 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -21670,7 +21735,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_isapnp.c linux-2.6.32.24/drivers/ata /* No altstatus so we don't want to use the lost interrupt poll */ diff -urNp linux-2.6.32.24/drivers/ata/pata_it8213.c linux-2.6.32.24/drivers/ata/pata_it8213.c --- linux-2.6.32.24/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_it8213.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_it8213.c 2010-10-23 19:59:19.000000000 -0400 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -21682,7 +21747,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_it8213.c linux-2.6.32.24/drivers/ata .set_piomode = it8213_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_it821x.c linux-2.6.32.24/drivers/ata/pata_it821x.c --- linux-2.6.32.24/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_it821x.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_it821x.c 2010-10-23 19:59:19.000000000 -0400 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -21712,7 +21777,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_it821x.c linux-2.6.32.24/drivers/ata .check_atapi_dma= it821x_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c --- linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c 2010-10-23 19:59:19.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -21724,7 +21789,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.24/drivers/ .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_jmicron.c linux-2.6.32.24/drivers/ata/pata_jmicron.c --- linux-2.6.32.24/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_jmicron.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_jmicron.c 2010-10-23 19:59:19.000000000 -0400 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -21736,7 +21801,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_jmicron.c linux-2.6.32.24/drivers/at }; diff -urNp linux-2.6.32.24/drivers/ata/pata_legacy.c linux-2.6.32.24/drivers/ata/pata_legacy.c --- linux-2.6.32.24/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_legacy.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_legacy.c 2010-10-23 19:59:19.000000000 -0400 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -21850,7 +21915,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_legacy.c linux-2.6.32.24/drivers/ata struct ata_port *ap; diff -urNp linux-2.6.32.24/drivers/ata/pata_marvell.c linux-2.6.32.24/drivers/ata/pata_marvell.c --- linux-2.6.32.24/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_marvell.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_marvell.c 2010-10-23 19:59:19.000000000 -0400 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21862,7 +21927,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_marvell.c linux-2.6.32.24/drivers/at .prereset = marvell_pre_reset, diff -urNp linux-2.6.32.24/drivers/ata/pata_mpc52xx.c linux-2.6.32.24/drivers/ata/pata_mpc52xx.c --- linux-2.6.32.24/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_mpc52xx.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_mpc52xx.c 2010-10-23 19:59:19.000000000 -0400 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -21874,7 +21939,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_mpc52xx.c linux-2.6.32.24/drivers/at .set_piomode = mpc52xx_ata_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_mpiix.c linux-2.6.32.24/drivers/ata/pata_mpiix.c --- linux-2.6.32.24/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_mpiix.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_mpiix.c 2010-10-23 19:59:19.000000000 -0400 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -21886,7 +21951,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_mpiix.c linux-2.6.32.24/drivers/ata/ .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_netcell.c linux-2.6.32.24/drivers/ata/pata_netcell.c --- linux-2.6.32.24/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_netcell.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_netcell.c 2010-10-23 19:59:19.000000000 -0400 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -21898,7 +21963,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_netcell.c linux-2.6.32.24/drivers/at .read_id = netcell_read_id, diff -urNp linux-2.6.32.24/drivers/ata/pata_ninja32.c linux-2.6.32.24/drivers/ata/pata_ninja32.c --- linux-2.6.32.24/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_ninja32.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_ninja32.c 2010-10-23 19:59:19.000000000 -0400 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -21910,7 +21975,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_ninja32.c linux-2.6.32.24/drivers/at .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87410.c linux-2.6.32.24/drivers/ata/pata_ns87410.c --- linux-2.6.32.24/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_ns87410.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_ns87410.c 2010-10-23 19:59:19.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -21922,7 +21987,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87410.c linux-2.6.32.24/drivers/at .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87415.c linux-2.6.32.24/drivers/ata/pata_ns87415.c --- linux-2.6.32.24/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_ns87415.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_ns87415.c 2010-10-23 19:59:19.000000000 -0400 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -21943,7 +22008,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87415.c linux-2.6.32.24/drivers/at .sff_check_status = ns87560_check_status, diff -urNp linux-2.6.32.24/drivers/ata/pata_octeon_cf.c linux-2.6.32.24/drivers/ata/pata_octeon_cf.c --- linux-2.6.32.24/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_octeon_cf.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_octeon_cf.c 2010-10-23 19:59:19.000000000 -0400 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -21954,7 +22019,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_octeon_cf.c linux-2.6.32.24/drivers/ .check_atapi_dma = octeon_cf_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/pata_oldpiix.c linux-2.6.32.24/drivers/ata/pata_oldpiix.c --- linux-2.6.32.24/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_oldpiix.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_oldpiix.c 2010-10-23 19:59:19.000000000 -0400 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -21966,7 +22031,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_oldpiix.c linux-2.6.32.24/drivers/at .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_opti.c linux-2.6.32.24/drivers/ata/pata_opti.c --- linux-2.6.32.24/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_opti.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_opti.c 2010-10-23 19:59:19.000000000 -0400 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -21978,7 +22043,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_opti.c linux-2.6.32.24/drivers/ata/p .set_piomode = opti_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_optidma.c linux-2.6.32.24/drivers/ata/pata_optidma.c --- linux-2.6.32.24/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_optidma.c 2010-09-04 15:54:51.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_optidma.c 2010-10-23 19:59:19.000000000 -0400 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -21999,7 +22064,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_optidma.c linux-2.6.32.24/drivers/at .set_dmamode = optiplus_set_dma_mode, diff -urNp linux-2.6.32.24/drivers/ata/pata_palmld.c linux-2.6.32.24/drivers/ata/pata_palmld.c --- linux-2.6.32.24/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_palmld.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_palmld.c 2010-10-23 19:59:19.000000000 -0400 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -22011,7 +22076,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_palmld.c linux-2.6.32.24/drivers/ata .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pata_pcmcia.c linux-2.6.32.24/drivers/ata/pata_pcmcia.c --- linux-2.6.32.24/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_pcmcia.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_pcmcia.c 2010-10-23 19:59:19.000000000 -0400 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -22040,7 +22105,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_pcmcia.c linux-2.6.32.24/drivers/ata if (info == NULL) diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc2027x.c linux-2.6.32.24/drivers/ata/pata_pdc2027x.c --- linux-2.6.32.24/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_pdc2027x.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_pdc2027x.c 2010-10-23 19:59:19.000000000 -0400 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22060,7 +22125,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc2027x.c linux-2.6.32.24/drivers/a .set_piomode = pdc2027x_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c --- linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c 2010-09-28 18:21:13.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c 2010-10-23 19:59:19.000000000 -0400 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -22081,7 +22146,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.24/drive .check_atapi_dma = pdc2026x_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/pata_platform.c linux-2.6.32.24/drivers/ata/pata_platform.c --- linux-2.6.32.24/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_platform.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_platform.c 2010-10-23 19:59:19.000000000 -0400 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -22093,7 +22158,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_platform.c linux-2.6.32.24/drivers/a .cable_detect = ata_cable_unknown, diff -urNp linux-2.6.32.24/drivers/ata/pata_qdi.c linux-2.6.32.24/drivers/ata/pata_qdi.c --- linux-2.6.32.24/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_qdi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_qdi.c 2010-10-23 19:59:19.000000000 -0400 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -22114,7 +22179,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_qdi.c linux-2.6.32.24/drivers/ata/pa }; diff -urNp linux-2.6.32.24/drivers/ata/pata_radisys.c linux-2.6.32.24/drivers/ata/pata_radisys.c --- linux-2.6.32.24/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_radisys.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_radisys.c 2010-10-23 19:59:19.000000000 -0400 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -22126,7 +22191,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_radisys.c linux-2.6.32.24/drivers/at .cable_detect = ata_cable_unknown, diff -urNp linux-2.6.32.24/drivers/ata/pata_rb532_cf.c linux-2.6.32.24/drivers/ata/pata_rb532_cf.c --- linux-2.6.32.24/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_rb532_cf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_rb532_cf.c 2010-10-23 19:59:19.000000000 -0400 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -22138,7 +22203,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_rb532_cf.c linux-2.6.32.24/drivers/a }; diff -urNp linux-2.6.32.24/drivers/ata/pata_rdc.c linux-2.6.32.24/drivers/ata/pata_rdc.c --- linux-2.6.32.24/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_rdc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_rdc.c 2010-10-23 19:59:19.000000000 -0400 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -22150,7 +22215,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_rdc.c linux-2.6.32.24/drivers/ata/pa .set_piomode = rdc_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_rz1000.c linux-2.6.32.24/drivers/ata/pata_rz1000.c --- linux-2.6.32.24/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_rz1000.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_rz1000.c 2010-10-23 19:59:19.000000000 -0400 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -22162,7 +22227,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_rz1000.c linux-2.6.32.24/drivers/ata .set_mode = rz1000_set_mode, diff -urNp linux-2.6.32.24/drivers/ata/pata_sc1200.c linux-2.6.32.24/drivers/ata/pata_sc1200.c --- linux-2.6.32.24/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_sc1200.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_sc1200.c 2010-10-23 19:59:19.000000000 -0400 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -22174,7 +22239,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_sc1200.c linux-2.6.32.24/drivers/ata .qc_issue = sc1200_qc_issue, diff -urNp linux-2.6.32.24/drivers/ata/pata_scc.c linux-2.6.32.24/drivers/ata/pata_scc.c --- linux-2.6.32.24/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_scc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_scc.c 2010-10-23 19:59:19.000000000 -0400 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22186,7 +22251,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_scc.c linux-2.6.32.24/drivers/ata/pa .set_piomode = scc_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_sch.c linux-2.6.32.24/drivers/ata/pata_sch.c --- linux-2.6.32.24/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_sch.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_sch.c 2010-10-23 19:59:19.000000000 -0400 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22198,7 +22263,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_sch.c linux-2.6.32.24/drivers/ata/pa .set_piomode = sch_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_serverworks.c linux-2.6.32.24/drivers/ata/pata_serverworks.c --- linux-2.6.32.24/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_serverworks.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_serverworks.c 2010-10-23 19:59:19.000000000 -0400 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -22219,7 +22284,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_serverworks.c linux-2.6.32.24/driver }; diff -urNp linux-2.6.32.24/drivers/ata/pata_sil680.c linux-2.6.32.24/drivers/ata/pata_sil680.c --- linux-2.6.32.24/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_sil680.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_sil680.c 2010-10-23 19:59:19.000000000 -0400 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -22231,7 +22296,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_sil680.c linux-2.6.32.24/drivers/ata .set_piomode = sil680_set_piomode, diff -urNp linux-2.6.32.24/drivers/ata/pata_sis.c linux-2.6.32.24/drivers/ata/pata_sis.c --- linux-2.6.32.24/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_sis.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_sis.c 2010-10-23 19:59:19.000000000 -0400 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22289,7 +22354,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_sis.c linux-2.6.32.24/drivers/ata/pa .set_dmamode = sis_old_set_dmamode, diff -urNp linux-2.6.32.24/drivers/ata/pata_sl82c105.c linux-2.6.32.24/drivers/ata/pata_sl82c105.c --- linux-2.6.32.24/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_sl82c105.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_sl82c105.c 2010-10-23 19:59:19.000000000 -0400 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -22301,7 +22366,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_sl82c105.c linux-2.6.32.24/drivers/a .bmdma_start = sl82c105_bmdma_start, diff -urNp linux-2.6.32.24/drivers/ata/pata_triflex.c linux-2.6.32.24/drivers/ata/pata_triflex.c --- linux-2.6.32.24/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_triflex.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_triflex.c 2010-10-23 19:59:19.000000000 -0400 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -22313,7 +22378,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_triflex.c linux-2.6.32.24/drivers/at .bmdma_stop = triflex_bmdma_stop, diff -urNp linux-2.6.32.24/drivers/ata/pata_via.c linux-2.6.32.24/drivers/ata/pata_via.c --- linux-2.6.32.24/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_via.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_via.c 2010-10-23 19:59:19.000000000 -0400 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22334,7 +22399,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_via.c linux-2.6.32.24/drivers/ata/pa }; diff -urNp linux-2.6.32.24/drivers/ata/pata_winbond.c linux-2.6.32.24/drivers/ata/pata_winbond.c --- linux-2.6.32.24/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pata_winbond.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pata_winbond.c 2010-10-23 19:59:19.000000000 -0400 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -22346,7 +22411,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pata_winbond.c linux-2.6.32.24/drivers/at .cable_detect = ata_cable_40wire, diff -urNp linux-2.6.32.24/drivers/ata/pdc_adma.c linux-2.6.32.24/drivers/ata/pdc_adma.c --- linux-2.6.32.24/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/pdc_adma.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/pdc_adma.c 2010-10-23 19:59:19.000000000 -0400 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -22358,7 +22423,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/pdc_adma.c linux-2.6.32.24/drivers/ata/pd .lost_interrupt = ATA_OP_NULL, diff -urNp linux-2.6.32.24/drivers/ata/sata_fsl.c linux-2.6.32.24/drivers/ata/sata_fsl.c --- linux-2.6.32.24/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_fsl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_fsl.c 2010-10-23 19:59:19.000000000 -0400 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -22370,7 +22435,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_fsl.c linux-2.6.32.24/drivers/ata/sa .qc_defer = ata_std_qc_defer, diff -urNp linux-2.6.32.24/drivers/ata/sata_inic162x.c linux-2.6.32.24/drivers/ata/sata_inic162x.c --- linux-2.6.32.24/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_inic162x.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_inic162x.c 2010-10-23 19:59:19.000000000 -0400 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -22382,7 +22447,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_inic162x.c linux-2.6.32.24/drivers/a .check_atapi_dma = inic_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/sata_mv.c linux-2.6.32.24/drivers/ata/sata_mv.c --- linux-2.6.32.24/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_mv.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_mv.c 2010-10-23 19:59:19.000000000 -0400 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -22412,7 +22477,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_mv.c linux-2.6.32.24/drivers/ata/sat .qc_prep = mv_qc_prep_iie, diff -urNp linux-2.6.32.24/drivers/ata/sata_nv.c linux-2.6.32.24/drivers/ata/sata_nv.c --- linux-2.6.32.24/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_nv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_nv.c 2010-10-23 19:59:19.000000000 -0400 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc * cases. Define nv_hardreset() which only kicks in for post-boot * probing and use it for all variants. @@ -22457,7 +22522,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_nv.c linux-2.6.32.24/drivers/ata/sat .qc_defer = ata_std_qc_defer, diff -urNp linux-2.6.32.24/drivers/ata/sata_promise.c linux-2.6.32.24/drivers/ata/sata_promise.c --- linux-2.6.32.24/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_promise.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_promise.c 2010-10-23 19:59:19.000000000 -0400 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -22486,7 +22551,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_promise.c linux-2.6.32.24/drivers/at .freeze = pdc_freeze, diff -urNp linux-2.6.32.24/drivers/ata/sata_qstor.c linux-2.6.32.24/drivers/ata/sata_qstor.c --- linux-2.6.32.24/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_qstor.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_qstor.c 2010-10-23 19:59:19.000000000 -0400 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -22498,7 +22563,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_qstor.c linux-2.6.32.24/drivers/ata/ .check_atapi_dma = qs_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/sata_sil24.c linux-2.6.32.24/drivers/ata/sata_sil24.c --- linux-2.6.32.24/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_sil24.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_sil24.c 2010-10-23 19:59:19.000000000 -0400 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -22510,7 +22575,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_sil24.c linux-2.6.32.24/drivers/ata/ .qc_defer = sil24_qc_defer, diff -urNp linux-2.6.32.24/drivers/ata/sata_sil.c linux-2.6.32.24/drivers/ata/sata_sil.c --- linux-2.6.32.24/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_sil.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_sil.c 2010-10-23 19:59:19.000000000 -0400 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -22522,7 +22587,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_sil.c linux-2.6.32.24/drivers/ata/sa .set_mode = sil_set_mode, diff -urNp linux-2.6.32.24/drivers/ata/sata_sis.c linux-2.6.32.24/drivers/ata/sata_sis.c --- linux-2.6.32.24/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_sis.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_sis.c 2010-10-23 19:59:19.000000000 -0400 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22534,7 +22599,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_sis.c linux-2.6.32.24/drivers/ata/sa .scr_write = sis_scr_write, diff -urNp linux-2.6.32.24/drivers/ata/sata_svw.c linux-2.6.32.24/drivers/ata/sata_svw.c --- linux-2.6.32.24/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_svw.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_svw.c 2010-10-23 19:59:19.000000000 -0400 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -22546,7 +22611,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_svw.c linux-2.6.32.24/drivers/ata/sa .sff_tf_read = k2_sata_tf_read, diff -urNp linux-2.6.32.24/drivers/ata/sata_sx4.c linux-2.6.32.24/drivers/ata/sata_sx4.c --- linux-2.6.32.24/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_sx4.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_sx4.c 2010-10-23 19:59:19.000000000 -0400 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -22558,7 +22623,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_sx4.c linux-2.6.32.24/drivers/ata/sa .check_atapi_dma = pdc_check_atapi_dma, diff -urNp linux-2.6.32.24/drivers/ata/sata_uli.c linux-2.6.32.24/drivers/ata/sata_uli.c --- linux-2.6.32.24/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_uli.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_uli.c 2010-10-23 19:59:19.000000000 -0400 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -22570,7 +22635,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_uli.c linux-2.6.32.24/drivers/ata/sa .scr_write = uli_scr_write, diff -urNp linux-2.6.32.24/drivers/ata/sata_via.c linux-2.6.32.24/drivers/ata/sata_via.c --- linux-2.6.32.24/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_via.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_via.c 2010-10-23 19:59:19.000000000 -0400 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -22610,7 +22675,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_via.c linux-2.6.32.24/drivers/ata/sa .scr_read = vt8251_scr_read, diff -urNp linux-2.6.32.24/drivers/ata/sata_vsc.c linux-2.6.32.24/drivers/ata/sata_vsc.c --- linux-2.6.32.24/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ata/sata_vsc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ata/sata_vsc.c 2010-10-23 19:59:19.000000000 -0400 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -22622,7 +22687,7 @@ diff -urNp linux-2.6.32.24/drivers/ata/sata_vsc.c linux-2.6.32.24/drivers/ata/sa cannot use the default lost interrupt handler */ diff -urNp linux-2.6.32.24/drivers/atm/adummy.c linux-2.6.32.24/drivers/atm/adummy.c --- linux-2.6.32.24/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/adummy.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/adummy.c 2010-10-23 19:59:19.000000000 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -22634,7 +22699,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/adummy.c linux-2.6.32.24/drivers/atm/adum } diff -urNp linux-2.6.32.24/drivers/atm/ambassador.c linux-2.6.32.24/drivers/atm/ambassador.c --- linux-2.6.32.24/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/ambassador.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/ambassador.c 2010-10-23 19:59:19.000000000 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -22673,7 +22738,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/ambassador.c linux-2.6.32.24/drivers/atm/ diff -urNp linux-2.6.32.24/drivers/atm/atmtcp.c linux-2.6.32.24/drivers/atm/atmtcp.c --- linux-2.6.32.24/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/atmtcp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/atmtcp.c 2010-10-23 19:59:19.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); @@ -22725,7 +22790,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/atmtcp.c linux-2.6.32.24/drivers/atm/atmt else dev_kfree_skb(skb); diff -urNp linux-2.6.32.24/drivers/atm/eni.c linux-2.6.32.24/drivers/atm/eni.c --- linux-2.6.32.24/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/eni.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/eni.c 2010-10-23 19:59:19.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); @@ -22773,7 +22838,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/eni.c linux-2.6.32.24/drivers/atm/eni.c } diff -urNp linux-2.6.32.24/drivers/atm/firestream.c linux-2.6.32.24/drivers/atm/firestream.c --- linux-2.6.32.24/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/firestream.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/firestream.c 2010-10-23 19:59:19.000000000 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -22809,7 +22874,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/firestream.c linux-2.6.32.24/drivers/atm/ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", diff -urNp linux-2.6.32.24/drivers/atm/fore200e.c linux-2.6.32.24/drivers/atm/fore200e.c --- linux-2.6.32.24/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/fore200e.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/fore200e.c 2010-10-23 19:59:19.000000000 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -22868,7 +22933,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/fore200e.c linux-2.6.32.24/drivers/atm/fo DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", diff -urNp linux-2.6.32.24/drivers/atm/he.c linux-2.6.32.24/drivers/atm/he.c --- linux-2.6.32.24/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/he.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/he.c 2010-10-23 19:59:19.000000000 -0400 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -22952,7 +23017,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/he.c linux-2.6.32.24/drivers/atm/he.c } diff -urNp linux-2.6.32.24/drivers/atm/horizon.c linux-2.6.32.24/drivers/atm/horizon.c --- linux-2.6.32.24/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/horizon.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/horizon.c 2010-10-23 19:59:19.000000000 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -22973,7 +23038,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/horizon.c linux-2.6.32.24/drivers/atm/hor hrz_kfree_skb (skb); diff -urNp linux-2.6.32.24/drivers/atm/idt77252.c linux-2.6.32.24/drivers/atm/idt77252.c --- linux-2.6.32.24/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/idt77252.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/idt77252.c 2010-10-23 19:59:19.000000000 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -23130,7 +23195,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/idt77252.c linux-2.6.32.24/drivers/atm/id atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); diff -urNp linux-2.6.32.24/drivers/atm/iphase.c linux-2.6.32.24/drivers/atm/iphase.c --- linux-2.6.32.24/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/iphase.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/iphase.c 2010-10-23 19:59:19.000000000 -0400 @@ -1123,7 +1123,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)) @@ -23229,7 +23294,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/iphase.c linux-2.6.32.24/drivers/atm/ipha printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); diff -urNp linux-2.6.32.24/drivers/atm/lanai.c linux-2.6.32.24/drivers/atm/lanai.c --- linux-2.6.32.24/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/lanai.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/lanai.c 2010-10-23 19:59:19.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); @@ -23286,7 +23351,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/lanai.c linux-2.6.32.24/drivers/atm/lanai cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); diff -urNp linux-2.6.32.24/drivers/atm/nicstar.c linux-2.6.32.24/drivers/atm/nicstar.c --- linux-2.6.32.24/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/nicstar.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/nicstar.c 2010-10-23 19:59:19.000000000 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -23491,7 +23556,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/nicstar.c linux-2.6.32.24/drivers/atm/nic diff -urNp linux-2.6.32.24/drivers/atm/solos-pci.c linux-2.6.32.24/drivers/atm/solos-pci.c --- linux-2.6.32.24/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/solos-pci.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/solos-pci.c 2010-10-23 19:59:19.000000000 -0400 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -23512,7 +23577,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/solos-pci.c linux-2.6.32.24/drivers/atm/s dev_kfree_skb_irq(oldskb); diff -urNp linux-2.6.32.24/drivers/atm/suni.c linux-2.6.32.24/drivers/atm/suni.c --- linux-2.6.32.24/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/suni.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/suni.c 2010-10-23 19:59:19.000000000 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -23526,7 +23591,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/suni.c linux-2.6.32.24/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) diff -urNp linux-2.6.32.24/drivers/atm/uPD98402.c linux-2.6.32.24/drivers/atm/uPD98402.c --- linux-2.6.32.24/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/uPD98402.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/uPD98402.c 2010-10-23 19:59:19.000000000 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -23573,7 +23638,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/uPD98402.c linux-2.6.32.24/drivers/atm/uP diff -urNp linux-2.6.32.24/drivers/atm/zatm.c linux-2.6.32.24/drivers/atm/zatm.c --- linux-2.6.32.24/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/atm/zatm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/atm/zatm.c 2010-10-23 19:59:19.000000000 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -23603,7 +23668,7 @@ diff -urNp linux-2.6.32.24/drivers/atm/zatm.c linux-2.6.32.24/drivers/atm/zatm.c diff -urNp linux-2.6.32.24/drivers/base/bus.c linux-2.6.32.24/drivers/base/bus.c --- linux-2.6.32.24/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/base/bus.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/base/bus.c 2010-10-23 19:59:19.000000000 -0400 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -23633,7 +23698,7 @@ diff -urNp linux-2.6.32.24/drivers/base/bus.c linux-2.6.32.24/drivers/base/bus.c diff -urNp linux-2.6.32.24/drivers/base/class.c linux-2.6.32.24/drivers/base/class.c --- linux-2.6.32.24/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/base/class.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/base/class.c 2010-10-23 19:59:19.000000000 -0400 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -23645,7 +23710,7 @@ diff -urNp linux-2.6.32.24/drivers/base/class.c linux-2.6.32.24/drivers/base/cla }; diff -urNp linux-2.6.32.24/drivers/base/core.c linux-2.6.32.24/drivers/base/core.c --- linux-2.6.32.24/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/base/core.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/base/core.c 2010-10-23 19:59:19.000000000 -0400 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -23666,7 +23731,7 @@ diff -urNp linux-2.6.32.24/drivers/base/core.c linux-2.6.32.24/drivers/base/core .uevent = dev_uevent, diff -urNp linux-2.6.32.24/drivers/base/memory.c linux-2.6.32.24/drivers/base/memory.c --- linux-2.6.32.24/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/base/memory.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/base/memory.c 2010-10-23 19:59:19.000000000 -0400 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -23678,7 +23743,7 @@ diff -urNp linux-2.6.32.24/drivers/base/memory.c linux-2.6.32.24/drivers/base/me }; diff -urNp linux-2.6.32.24/drivers/base/sys.c linux-2.6.32.24/drivers/base/sys.c --- linux-2.6.32.24/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/base/sys.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/base/sys.c 2010-10-23 19:59:19.000000000 -0400 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -23699,7 +23764,7 @@ diff -urNp linux-2.6.32.24/drivers/base/sys.c linux-2.6.32.24/drivers/base/sys.c }; diff -urNp linux-2.6.32.24/drivers/block/pktcdvd.c linux-2.6.32.24/drivers/block/pktcdvd.c --- linux-2.6.32.24/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/block/pktcdvd.c 2010-09-27 18:49:22.000000000 -0400 ++++ linux-2.6.32.24/drivers/block/pktcdvd.c 2010-10-23 19:59:19.000000000 -0400 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -23720,7 +23785,7 @@ diff -urNp linux-2.6.32.24/drivers/block/pktcdvd.c linux-2.6.32.24/drivers/block return NULL; diff -urNp linux-2.6.32.24/drivers/char/agp/frontend.c linux-2.6.32.24/drivers/char/agp/frontend.c --- linux-2.6.32.24/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/agp/frontend.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/agp/frontend.c 2010-10-23 19:59:19.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; @@ -23732,7 +23797,7 @@ diff -urNp linux-2.6.32.24/drivers/char/agp/frontend.c linux-2.6.32.24/drivers/c client = agp_find_client_by_pid(reserve.pid); diff -urNp linux-2.6.32.24/drivers/char/agp/intel-agp.c linux-2.6.32.24/drivers/char/agp/intel-agp.c --- linux-2.6.32.24/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/agp/intel-agp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/agp/intel-agp.c 2010-10-23 19:59:19.000000000 -0400 @@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), @@ -23744,7 +23809,7 @@ diff -urNp linux-2.6.32.24/drivers/char/agp/intel-agp.c linux-2.6.32.24/drivers/ MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); diff -urNp linux-2.6.32.24/drivers/char/hpet.c linux-2.6.32.24/drivers/char/hpet.c --- linux-2.6.32.24/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hpet.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hpet.c 2010-10-23 19:59:19.000000000 -0400 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -23774,7 +23839,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hpet.c linux-2.6.32.24/drivers/char/hpet { diff -urNp linux-2.6.32.24/drivers/char/hvc_beat.c linux-2.6.32.24/drivers/char/hvc_beat.c --- linux-2.6.32.24/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_beat.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_beat.c 2010-10-23 19:59:19.000000000 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -23786,7 +23851,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_beat.c linux-2.6.32.24/drivers/char/ }; diff -urNp linux-2.6.32.24/drivers/char/hvc_console.c linux-2.6.32.24/drivers/char/hvc_console.c --- linux-2.6.32.24/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_console.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_console.c 2010-10-23 19:59:19.000000000 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has to be * static because kmalloc will not work during early console init. @@ -23816,7 +23881,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_console.c linux-2.6.32.24/drivers/ch int i; diff -urNp linux-2.6.32.24/drivers/char/hvc_console.h linux-2.6.32.24/drivers/char/hvc_console.h --- linux-2.6.32.24/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_console.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_console.h 2010-10-23 19:59:19.000000000 -0400 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -23842,7 +23907,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_console.h linux-2.6.32.24/drivers/ch diff -urNp linux-2.6.32.24/drivers/char/hvc_iseries.c linux-2.6.32.24/drivers/char/hvc_iseries.c --- linux-2.6.32.24/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_iseries.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_iseries.c 2010-10-23 19:59:19.000000000 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -23854,7 +23919,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_iseries.c linux-2.6.32.24/drivers/ch .notifier_add = notifier_add_irq, diff -urNp linux-2.6.32.24/drivers/char/hvc_iucv.c linux-2.6.32.24/drivers/char/hvc_iucv.c --- linux-2.6.32.24/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_iucv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_iucv.c 2010-10-23 19:59:19.000000000 -0400 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -23866,7 +23931,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_iucv.c linux-2.6.32.24/drivers/char/ .notifier_add = hvc_iucv_notifier_add, diff -urNp linux-2.6.32.24/drivers/char/hvc_rtas.c linux-2.6.32.24/drivers/char/hvc_rtas.c --- linux-2.6.32.24/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_rtas.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_rtas.c 2010-10-23 19:59:19.000000000 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -23878,7 +23943,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_rtas.c linux-2.6.32.24/drivers/char/ }; diff -urNp linux-2.6.32.24/drivers/char/hvcs.c linux-2.6.32.24/drivers/char/hvcs.c --- linux-2.6.32.24/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvcs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvcs.c 2010-10-23 19:59:19.000000000 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -23975,7 +24040,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvcs.c linux-2.6.32.24/drivers/char/hvcs return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; diff -urNp linux-2.6.32.24/drivers/char/hvc_udbg.c linux-2.6.32.24/drivers/char/hvc_udbg.c --- linux-2.6.32.24/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_udbg.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_udbg.c 2010-10-23 19:59:19.000000000 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -23987,7 +24052,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_udbg.c linux-2.6.32.24/drivers/char/ }; diff -urNp linux-2.6.32.24/drivers/char/hvc_vio.c linux-2.6.32.24/drivers/char/hvc_vio.c --- linux-2.6.32.24/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_vio.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_vio.c 2010-10-23 19:59:19.000000000 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -23999,7 +24064,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_vio.c linux-2.6.32.24/drivers/char/h .notifier_add = notifier_add_irq, diff -urNp linux-2.6.32.24/drivers/char/hvc_xen.c linux-2.6.32.24/drivers/char/hvc_xen.c --- linux-2.6.32.24/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/hvc_xen.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/hvc_xen.c 2010-10-23 19:59:19.000000000 -0400 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -24011,7 +24076,7 @@ diff -urNp linux-2.6.32.24/drivers/char/hvc_xen.c linux-2.6.32.24/drivers/char/h .notifier_add = notifier_add_irq, diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c --- linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c 2010-10-23 19:59:19.000000000 -0400 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -24044,7 +24109,7 @@ diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.24/d diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c --- linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c 2010-10-23 19:59:19.000000000 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -24077,7 +24142,7 @@ diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.24/driv atomic_set(&new_smi->stop_operation, 0); diff -urNp linux-2.6.32.24/drivers/char/keyboard.c linux-2.6.32.24/drivers/char/keyboard.c --- linux-2.6.32.24/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/keyboard.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/keyboard.c 2010-10-23 19:59:19.000000000 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -24106,7 +24171,7 @@ diff -urNp linux-2.6.32.24/drivers/char/keyboard.c linux-2.6.32.24/drivers/char/ MODULE_DEVICE_TABLE(input, kbd_ids); diff -urNp linux-2.6.32.24/drivers/char/mem.c linux-2.6.32.24/drivers/char/mem.c --- linux-2.6.32.24/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/mem.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/mem.c 2010-10-23 19:59:19.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -24285,7 +24350,7 @@ diff -urNp linux-2.6.32.24/drivers/char/mem.c linux-2.6.32.24/drivers/char/mem.c static int memory_open(struct inode *inode, struct file *filp) diff -urNp linux-2.6.32.24/drivers/char/nvram.c linux-2.6.32.24/drivers/char/nvram.c --- linux-2.6.32.24/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/nvram.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/nvram.c 2010-10-23 19:59:19.000000000 -0400 @@ -435,7 +435,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -24300,7 +24365,7 @@ diff -urNp linux-2.6.32.24/drivers/char/nvram.c linux-2.6.32.24/drivers/char/nvr static int __init nvram_init(void) diff -urNp linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c --- linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c 2010-10-23 19:59:19.000000000 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -24417,7 +24482,7 @@ diff -urNp linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.24/ ttyj->channel_idx); diff -urNp linux-2.6.32.24/drivers/char/pty.c linux-2.6.32.24/drivers/char/pty.c --- linux-2.6.32.24/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/pty.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/pty.c 2010-10-23 19:59:19.000000000 -0400 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -24450,7 +24515,7 @@ diff -urNp linux-2.6.32.24/drivers/char/pty.c linux-2.6.32.24/drivers/char/pty.c register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) diff -urNp linux-2.6.32.24/drivers/char/random.c linux-2.6.32.24/drivers/char/random.c --- linux-2.6.32.24/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/random.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/random.c 2010-10-23 19:59:19.000000000 -0400 @@ -254,8 +254,13 @@ /* * Configuration information @@ -24494,7 +24559,7 @@ diff -urNp linux-2.6.32.24/drivers/char/random.c linux-2.6.32.24/drivers/char/ra diff -urNp linux-2.6.32.24/drivers/char/sonypi.c linux-2.6.32.24/drivers/char/sonypi.c --- linux-2.6.32.24/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/sonypi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/sonypi.c 2010-10-23 19:59:19.000000000 -0400 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -24527,7 +24592,7 @@ diff -urNp linux-2.6.32.24/drivers/char/sonypi.c linux-2.6.32.24/drivers/char/so return 0; diff -urNp linux-2.6.32.24/drivers/char/tpm/tpm_bios.c linux-2.6.32.24/drivers/char/tpm/tpm_bios.c --- linux-2.6.32.24/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/tpm/tpm_bios.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/tpm/tpm_bios.c 2010-10-23 19:59:19.000000000 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -24570,7 +24635,7 @@ diff -urNp linux-2.6.32.24/drivers/char/tpm/tpm_bios.c linux-2.6.32.24/drivers/c diff -urNp linux-2.6.32.24/drivers/char/tty_io.c linux-2.6.32.24/drivers/char/tty_io.c --- linux-2.6.32.24/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/tty_io.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/tty_io.c 2010-10-23 19:59:19.000000000 -0400 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -24711,7 +24776,7 @@ diff -urNp linux-2.6.32.24/drivers/char/tty_io.c linux-2.6.32.24/drivers/char/tt * we can't necessarily depend on lots of kernel help here. diff -urNp linux-2.6.32.24/drivers/char/tty_ldisc.c linux-2.6.32.24/drivers/char/tty_ldisc.c --- linux-2.6.32.24/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/tty_ldisc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/tty_ldisc.c 2010-10-23 19:59:19.000000000 -0400 @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; @@ -24759,7 +24824,7 @@ diff -urNp linux-2.6.32.24/drivers/char/tty_ldisc.c linux-2.6.32.24/drivers/char } diff -urNp linux-2.6.32.24/drivers/char/virtio_console.c linux-2.6.32.24/drivers/char/virtio_console.c --- linux-2.6.32.24/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/virtio_console.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/virtio_console.c 2010-10-23 19:59:19.000000000 -0400 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -24770,7 +24835,7 @@ diff -urNp linux-2.6.32.24/drivers/char/virtio_console.c linux-2.6.32.24/drivers /* The hvc device */ diff -urNp linux-2.6.32.24/drivers/char/vt_ioctl.c linux-2.6.32.24/drivers/char/vt_ioctl.c --- linux-2.6.32.24/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/char/vt_ioctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/char/vt_ioctl.c 2010-10-23 19:59:19.000000000 -0400 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -24816,7 +24881,7 @@ diff -urNp linux-2.6.32.24/drivers/char/vt_ioctl.c linux-2.6.32.24/drivers/char/ goto reterr; diff -urNp linux-2.6.32.24/drivers/cpufreq/cpufreq.c linux-2.6.32.24/drivers/cpufreq/cpufreq.c --- linux-2.6.32.24/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/cpufreq/cpufreq.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/cpufreq/cpufreq.c 2010-10-23 19:59:19.000000000 -0400 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -24828,7 +24893,7 @@ diff -urNp linux-2.6.32.24/drivers/cpufreq/cpufreq.c linux-2.6.32.24/drivers/cpu }; diff -urNp linux-2.6.32.24/drivers/cpuidle/sysfs.c linux-2.6.32.24/drivers/cpuidle/sysfs.c --- linux-2.6.32.24/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/cpuidle/sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/cpuidle/sysfs.c 2010-10-23 19:59:19.000000000 -0400 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -24858,7 +24923,7 @@ diff -urNp linux-2.6.32.24/drivers/cpuidle/sysfs.c linux-2.6.32.24/drivers/cpuid wait_for_completion(&device->kobjs[i]->kobj_unregister); diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.c linux-2.6.32.24/drivers/dma/ioat/dma.c --- linux-2.6.32.24/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/dma/ioat/dma.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/dma/ioat/dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -24870,7 +24935,7 @@ diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.c linux-2.6.32.24/drivers/dma/io diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.h linux-2.6.32.24/drivers/dma/ioat/dma.h --- linux-2.6.32.24/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/dma/ioat/dma.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/dma/ioat/dma.h 2010-10-23 19:59:19.000000000 -0400 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c unsigned long *phys_complete); void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); @@ -24882,7 +24947,7 @@ diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.h linux-2.6.32.24/drivers/dma/io #endif /* IOATDMA_H */ diff -urNp linux-2.6.32.24/drivers/edac/edac_core.h linux-2.6.32.24/drivers/edac/edac_core.h --- linux-2.6.32.24/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/edac/edac_core.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/edac/edac_core.h 2010-10-23 19:59:19.000000000 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -24902,7 +24967,7 @@ diff -urNp linux-2.6.32.24/drivers/edac/edac_core.h linux-2.6.32.24/drivers/edac diff -urNp linux-2.6.32.24/drivers/edac/edac_device_sysfs.c linux-2.6.32.24/drivers/edac/edac_device_sysfs.c --- linux-2.6.32.24/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/edac/edac_device_sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/edac/edac_device_sysfs.c 2010-10-23 19:59:19.000000000 -0400 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -24932,7 +24997,7 @@ diff -urNp linux-2.6.32.24/drivers/edac/edac_device_sysfs.c linux-2.6.32.24/driv }; diff -urNp linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c --- linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c 2010-10-23 19:59:19.000000000 -0400 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -24953,7 +25018,7 @@ diff -urNp linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c linux-2.6.32.24/drivers/ }; diff -urNp linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c --- linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c 2010-10-23 19:59:19.000000000 -0400 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -24974,7 +25039,7 @@ diff -urNp linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c linux-2.6.32.24/drivers }; diff -urNp linux-2.6.32.24/drivers/firewire/core-cdev.c linux-2.6.32.24/drivers/firewire/core-cdev.c --- linux-2.6.32.24/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firewire/core-cdev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firewire/core-cdev.c 2010-10-23 19:59:19.000000000 -0400 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; @@ -24987,7 +25052,7 @@ diff -urNp linux-2.6.32.24/drivers/firewire/core-cdev.c linux-2.6.32.24/drivers/ r = kmalloc(sizeof(*r), GFP_KERNEL); diff -urNp linux-2.6.32.24/drivers/firmware/dmi_scan.c linux-2.6.32.24/drivers/firmware/dmi_scan.c --- linux-2.6.32.24/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firmware/dmi_scan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firmware/dmi_scan.c 2010-10-23 19:59:19.000000000 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -25002,7 +25067,7 @@ diff -urNp linux-2.6.32.24/drivers/firmware/dmi_scan.c linux-2.6.32.24/drivers/f goto error; diff -urNp linux-2.6.32.24/drivers/firmware/edd.c linux-2.6.32.24/drivers/firmware/edd.c --- linux-2.6.32.24/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firmware/edd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firmware/edd.c 2010-10-23 19:59:19.000000000 -0400 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -25014,7 +25079,7 @@ diff -urNp linux-2.6.32.24/drivers/firmware/edd.c linux-2.6.32.24/drivers/firmwa diff -urNp linux-2.6.32.24/drivers/firmware/efivars.c linux-2.6.32.24/drivers/firmware/efivars.c --- linux-2.6.32.24/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firmware/efivars.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firmware/efivars.c 2010-10-23 19:59:19.000000000 -0400 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -25026,7 +25091,7 @@ diff -urNp linux-2.6.32.24/drivers/firmware/efivars.c linux-2.6.32.24/drivers/fi }; diff -urNp linux-2.6.32.24/drivers/firmware/iscsi_ibft.c linux-2.6.32.24/drivers/firmware/iscsi_ibft.c --- linux-2.6.32.24/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firmware/iscsi_ibft.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firmware/iscsi_ibft.c 2010-10-23 19:59:19.000000000 -0400 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -25038,7 +25103,7 @@ diff -urNp linux-2.6.32.24/drivers/firmware/iscsi_ibft.c linux-2.6.32.24/drivers diff -urNp linux-2.6.32.24/drivers/firmware/memmap.c linux-2.6.32.24/drivers/firmware/memmap.c --- linux-2.6.32.24/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/firmware/memmap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/firmware/memmap.c 2010-10-23 19:59:19.000000000 -0400 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -25048,9 +25113,21 @@ diff -urNp linux-2.6.32.24/drivers/firmware/memmap.c linux-2.6.32.24/drivers/fir .show = memmap_attr_show, }; +diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.24/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.32.24/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:26:42.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_crtc_helper.c 2010-10-23 19:59:24.000000000 -0400 +@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d + struct drm_crtc *tmp; + int crtc_mask = 1; + +- WARN(!crtc, "checking null crtc?"); ++ BUG_ON(!crtc); + + dev = crtc->dev; + diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_drv.c linux-2.6.32.24/drivers/gpu/drm/drm_drv.c --- linux-2.6.32.24/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/drm_drv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_drv.c 2010-10-23 19:59:19.000000000 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -25062,7 +25139,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_drv.c linux-2.6.32.24/drivers/gpu DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_fops.c linux-2.6.32.24/drivers/gpu/drm/drm_fops.c --- linux-2.6.32.24/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/drm_fops.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_fops.c 2010-10-23 19:59:19.000000000 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -25114,9 +25191,40 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_fops.c linux-2.6.32.24/drivers/gp if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); +diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_info.c linux-2.6.32.24/drivers/gpu/drm/drm_info.c +--- linux-2.6.32.24/drivers/gpu/drm/drm_info.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_info.c 2010-10-23 19:59:24.000000000 -0400 +@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void + struct drm_local_map *map; + struct drm_map_list *r_list; + +- /* Hardcoded from _DRM_FRAME_BUFFER, +- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and +- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ +- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; ++ static const char * const types[] = { ++ [_DRM_FRAME_BUFFER] = "FB", ++ [_DRM_REGISTERS] = "REG", ++ [_DRM_SHM] = "SHM", ++ [_DRM_AGP] = "AGP", ++ [_DRM_SCATTER_GATHER] = "SG", ++ [_DRM_CONSISTENT] = "PCI", ++ [_DRM_GEM] = "GEM" }; + const char *type; + int i; + +@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void + map = r_list->map; + if (!map) + continue; +- if (map->type < 0 || map->type > 5) ++ if (map->type >= ARRAY_SIZE(types)) + type = "??"; + else + type = types[map->type]; diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c --- linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c 2010-10-23 19:59:19.000000000 -0400 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, stats->data[i].value = (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); @@ -25128,7 +25236,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.24/drivers/g diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_lock.c linux-2.6.32.24/drivers/gpu/drm/drm_lock.c --- linux-2.6.32.24/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/drm_lock.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/drm_lock.c 2010-10-23 19:59:19.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; @@ -25149,7 +25257,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_lock.c linux-2.6.32.24/drivers/gp * modules but is required by the Sparc driver. diff -urNp linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c --- linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c 2010-10-23 19:59:19.000000000 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -25174,7 +25282,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.24/drive diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c 2010-10-23 19:59:19.000000000 -0400 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -25186,7 +25294,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.24/dri .mode_valid = ch7017_mode_valid, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-10-23 19:59:19.000000000 -0400 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -25198,7 +25306,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.24/dri .mode_valid = ch7xxx_mode_valid, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h 2010-10-23 19:59:19.000000000 -0400 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -25233,7 +25341,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h linux-2.6.32.24/drivers/gp #endif /* _INTEL_DVO_H */ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c 2010-10-23 19:59:19.000000000 -0400 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -25245,7 +25353,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.24/drive .save = ivch_save, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c 2010-10-23 19:59:19.000000000 -0400 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -25257,7 +25365,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.24/dri .mode_valid = sil164_mode_valid, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c --- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c 2010-10-23 19:59:19.000000000 -0400 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -25269,7 +25377,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.24/dri .mode_valid = tfp410_mode_valid, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c --- linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c 2010-10-23 19:59:19.000000000 -0400 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -25281,7 +25389,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.24/drive .close = drm_gem_vm_close, diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c --- linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c 2010-09-28 18:22:42.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c 2010-10-23 19:59:19.000000000 -0400 @@ -492,6 +492,11 @@ i915_gem_pread_ioctl(struct drm_device * return -EINVAL; } @@ -25308,7 +25416,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.24/drive * different detiling behavior between reading and writing. diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c --- linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c 2010-10-23 19:59:19.000000000 -0400 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -25328,7 +25436,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.24/d (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c --- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c 2010-10-23 19:59:19.000000000 -0400 @@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o } } @@ -25355,7 +25463,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c --- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c 2010-10-23 19:59:19.000000000 -0400 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { @@ -25367,7 +25475,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. vco_diff = abs(vco - best_vco); diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c --- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c 2010-10-23 19:59:19.000000000 -0400 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -25379,7 +25487,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.24 diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c --- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c 2010-10-23 19:59:19.000000000 -0400 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -25433,7 +25541,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.24/d diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c --- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c 2010-10-23 19:59:19.000000000 -0400 @@ -39,7 +39,7 @@ #include <linux/module.h> @@ -25454,7 +25562,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.24/drivers/ diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c --- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-10-23 19:59:19.000000000 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -25477,7 +25585,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.24/drive * between mmap_sem and bo_reserve: Perform a trylock operation diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c --- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c 2010-10-23 19:59:19.000000000 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -25537,7 +25645,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.24/driv } diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c --- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c 2010-10-23 19:59:19.000000000 -0400 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -25549,7 +25657,7 @@ diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.24/driv }; diff -urNp linux-2.6.32.24/drivers/hid/hidraw.c linux-2.6.32.24/drivers/hid/hidraw.c --- linux-2.6.32.24/drivers/hid/hidraw.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hid/hidraw.c 2010-09-28 18:54:18.000000000 -0400 ++++ linux-2.6.32.24/drivers/hid/hidraw.c 2010-10-23 19:59:19.000000000 -0400 @@ -237,11 +237,16 @@ static long hidraw_ioctl(struct file *fi struct inode *inode = file->f_path.dentry->d_inode; unsigned int minor = iminor(inode); @@ -25579,7 +25687,7 @@ diff -urNp linux-2.6.32.24/drivers/hid/hidraw.c linux-2.6.32.24/drivers/hid/hidr } diff -urNp linux-2.6.32.24/drivers/hid/usbhid/hiddev.c linux-2.6.32.24/drivers/hid/usbhid/hiddev.c --- linux-2.6.32.24/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hid/usbhid/hiddev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/hid/usbhid/hiddev.c 2010-10-23 19:59:19.000000000 -0400 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); @@ -25591,7 +25699,7 @@ diff -urNp linux-2.6.32.24/drivers/hid/usbhid/hiddev.c linux-2.6.32.24/drivers/h for (i = 0; i < hid->maxcollection; i++) diff -urNp linux-2.6.32.24/drivers/hwmon/k8temp.c linux-2.6.32.24/drivers/hwmon/k8temp.c --- linux-2.6.32.24/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/hwmon/k8temp.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/drivers/hwmon/k8temp.c 2010-10-23 19:59:19.000000000 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -25603,7 +25711,7 @@ diff -urNp linux-2.6.32.24/drivers/hwmon/k8temp.c linux-2.6.32.24/drivers/hwmon/ MODULE_DEVICE_TABLE(pci, k8temp_ids); diff -urNp linux-2.6.32.24/drivers/hwmon/sis5595.c linux-2.6.32.24/drivers/hwmon/sis5595.c --- linux-2.6.32.24/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hwmon/sis5595.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/hwmon/sis5595.c 2010-10-23 19:59:19.000000000 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -25615,7 +25723,7 @@ diff -urNp linux-2.6.32.24/drivers/hwmon/sis5595.c linux-2.6.32.24/drivers/hwmon MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); diff -urNp linux-2.6.32.24/drivers/hwmon/via686a.c linux-2.6.32.24/drivers/hwmon/via686a.c --- linux-2.6.32.24/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hwmon/via686a.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/hwmon/via686a.c 2010-10-23 19:59:19.000000000 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -25627,7 +25735,7 @@ diff -urNp linux-2.6.32.24/drivers/hwmon/via686a.c linux-2.6.32.24/drivers/hwmon MODULE_DEVICE_TABLE(pci, via686a_pci_ids); diff -urNp linux-2.6.32.24/drivers/hwmon/vt8231.c linux-2.6.32.24/drivers/hwmon/vt8231.c --- linux-2.6.32.24/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hwmon/vt8231.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/hwmon/vt8231.c 2010-10-23 19:59:19.000000000 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -25639,7 +25747,7 @@ diff -urNp linux-2.6.32.24/drivers/hwmon/vt8231.c linux-2.6.32.24/drivers/hwmon/ MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); diff -urNp linux-2.6.32.24/drivers/hwmon/w83791d.c linux-2.6.32.24/drivers/hwmon/w83791d.c --- linux-2.6.32.24/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/hwmon/w83791d.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/hwmon/w83791d.c 2010-10-23 19:59:19.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); @@ -25653,7 +25761,7 @@ diff -urNp linux-2.6.32.24/drivers/hwmon/w83791d.c linux-2.6.32.24/drivers/hwmon #ifdef DEBUG diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c --- linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c 2010-10-23 19:59:19.000000000 -0400 @@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, @@ -25665,7 +25773,7 @@ diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c linux-2.6.32.24/drivers MODULE_DEVICE_TABLE (pci, i801_ids); diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c --- linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c 2010-10-23 19:59:19.000000000 -0400 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -25686,7 +25794,7 @@ diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.24/driver MODULE_DEVICE_TABLE (pci, piix4_ids); diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c --- linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c 2010-10-23 19:59:19.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) }, @@ -25698,7 +25806,7 @@ diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.24/drive MODULE_DEVICE_TABLE (pci, sis630_ids); diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c --- linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c 2010-10-23 19:59:19.000000000 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -25710,7 +25818,7 @@ diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.24/drive MODULE_DEVICE_TABLE (pci, sis96x_ids); diff -urNp linux-2.6.32.24/drivers/ide/ide-cd.c linux-2.6.32.24/drivers/ide/ide-cd.c --- linux-2.6.32.24/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ide/ide-cd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ide/ide-cd.c 2010-10-23 19:59:19.000000000 -0400 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -25722,7 +25830,7 @@ diff -urNp linux-2.6.32.24/drivers/ide/ide-cd.c linux-2.6.32.24/drivers/ide/ide- } diff -urNp linux-2.6.32.24/drivers/ieee1394/dv1394.c linux-2.6.32.24/drivers/ieee1394/dv1394.c --- linux-2.6.32.24/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/dv1394.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/dv1394.c 2010-10-23 19:59:19.000000000 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -25743,7 +25851,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/dv1394.c linux-2.6.32.24/drivers/iee MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); diff -urNp linux-2.6.32.24/drivers/ieee1394/eth1394.c linux-2.6.32.24/drivers/ieee1394/eth1394.c --- linux-2.6.32.24/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/eth1394.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/eth1394.c 2010-10-23 19:59:19.000000000 -0400 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -25755,7 +25863,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/eth1394.c linux-2.6.32.24/drivers/ie MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); diff -urNp linux-2.6.32.24/drivers/ieee1394/hosts.c linux-2.6.32.24/drivers/ieee1394/hosts.c --- linux-2.6.32.24/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/hosts.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/hosts.c 2010-10-23 19:59:19.000000000 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -25766,7 +25874,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/hosts.c linux-2.6.32.24/drivers/ieee .isoctl = dummy_isoctl diff -urNp linux-2.6.32.24/drivers/ieee1394/ohci1394.c linux-2.6.32.24/drivers/ieee1394/ohci1394.c --- linux-2.6.32.24/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/ohci1394.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/ohci1394.c 2010-10-23 19:59:19.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) @@ -25790,7 +25898,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/ohci1394.c linux-2.6.32.24/drivers/i MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); diff -urNp linux-2.6.32.24/drivers/ieee1394/raw1394.c linux-2.6.32.24/drivers/ieee1394/raw1394.c --- linux-2.6.32.24/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/raw1394.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/raw1394.c 2010-10-23 19:59:19.000000000 -0400 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -25802,7 +25910,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/raw1394.c linux-2.6.32.24/drivers/ie MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); diff -urNp linux-2.6.32.24/drivers/ieee1394/sbp2.c linux-2.6.32.24/drivers/ieee1394/sbp2.c --- linux-2.6.32.24/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/sbp2.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/sbp2.c 2010-10-23 19:59:19.000000000 -0400 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -25823,7 +25931,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/sbp2.c linux-2.6.32.24/drivers/ieee1 diff -urNp linux-2.6.32.24/drivers/ieee1394/video1394.c linux-2.6.32.24/drivers/ieee1394/video1394.c --- linux-2.6.32.24/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/ieee1394/video1394.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/ieee1394/video1394.c 2010-10-23 19:59:19.000000000 -0400 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -25835,7 +25943,7 @@ diff -urNp linux-2.6.32.24/drivers/ieee1394/video1394.c linux-2.6.32.24/drivers/ MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); diff -urNp linux-2.6.32.24/drivers/infiniband/core/cm.c linux-2.6.32.24/drivers/infiniband/core/cm.c --- linux-2.6.32.24/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/infiniband/core/cm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/infiniband/core/cm.c 2010-10-23 19:59:20.000000000 -0400 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -25981,7 +26089,7 @@ diff -urNp linux-2.6.32.24/drivers/infiniband/core/cm.c linux-2.6.32.24/drivers/ diff -urNp linux-2.6.32.24/drivers/infiniband/core/sysfs.c linux-2.6.32.24/drivers/infiniband/core/sysfs.c --- linux-2.6.32.24/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/infiniband/core/sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/infiniband/core/sysfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -25993,7 +26101,7 @@ diff -urNp linux-2.6.32.24/drivers/infiniband/core/sysfs.c linux-2.6.32.24/drive diff -urNp linux-2.6.32.24/drivers/input/keyboard/atkbd.c linux-2.6.32.24/drivers/input/keyboard/atkbd.c --- linux-2.6.32.24/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/keyboard/atkbd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/keyboard/atkbd.c 2010-10-23 19:59:20.000000000 -0400 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -26005,7 +26113,7 @@ diff -urNp linux-2.6.32.24/drivers/input/keyboard/atkbd.c linux-2.6.32.24/driver MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); diff -urNp linux-2.6.32.24/drivers/input/mouse/lifebook.c linux-2.6.32.24/drivers/input/mouse/lifebook.c --- linux-2.6.32.24/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/mouse/lifebook.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/mouse/lifebook.c 2010-10-23 19:59:20.000000000 -0400 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -26017,7 +26125,7 @@ diff -urNp linux-2.6.32.24/drivers/input/mouse/lifebook.c linux-2.6.32.24/driver static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) diff -urNp linux-2.6.32.24/drivers/input/mouse/psmouse-base.c linux-2.6.32.24/drivers/input/mouse/psmouse-base.c --- linux-2.6.32.24/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/mouse/psmouse-base.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/mouse/psmouse-base.c 2010-10-23 19:59:20.000000000 -0400 @@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -26029,7 +26137,7 @@ diff -urNp linux-2.6.32.24/drivers/input/mouse/psmouse-base.c linux-2.6.32.24/dr MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); diff -urNp linux-2.6.32.24/drivers/input/mouse/synaptics.c linux-2.6.32.24/drivers/input/mouse/synaptics.c --- linux-2.6.32.24/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/mouse/synaptics.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/mouse/synaptics.c 2010-10-23 19:59:20.000000000 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -26060,7 +26168,7 @@ diff -urNp linux-2.6.32.24/drivers/input/mouse/synaptics.c linux-2.6.32.24/drive diff -urNp linux-2.6.32.24/drivers/input/mousedev.c linux-2.6.32.24/drivers/input/mousedev.c --- linux-2.6.32.24/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/mousedev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/mousedev.c 2010-10-23 19:59:20.000000000 -0400 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -26072,7 +26180,7 @@ diff -urNp linux-2.6.32.24/drivers/input/mousedev.c linux-2.6.32.24/drivers/inpu #endif diff -urNp linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h --- linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h 2010-10-23 19:59:20.000000000 -0400 @@ -179,7 +179,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -26129,7 +26237,7 @@ diff -urNp linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.24 #endif /* CONFIG_X86 */ diff -urNp linux-2.6.32.24/drivers/input/serio/serio_raw.c linux-2.6.32.24/drivers/input/serio/serio_raw.c --- linux-2.6.32.24/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/input/serio/serio_raw.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/input/serio/serio_raw.c 2010-10-23 19:59:20.000000000 -0400 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -26141,7 +26249,7 @@ diff -urNp linux-2.6.32.24/drivers/input/serio/serio_raw.c linux-2.6.32.24/drive MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/common.c linux-2.6.32.24/drivers/isdn/gigaset/common.c --- linux-2.6.32.24/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/gigaset/common.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/gigaset/common.c 2010-10-23 19:59:20.000000000 -0400 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -26153,7 +26261,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/common.c linux-2.6.32.24/drivers cs->tty_dev = NULL; diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h --- linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h 2010-10-23 19:59:20.000000000 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -26165,7 +26273,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h linux-2.6.32.24/driver unsigned control_state; diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/interface.c linux-2.6.32.24/drivers/isdn/gigaset/interface.c --- linux-2.6.32.24/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/gigaset/interface.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/gigaset/interface.c 2010-10-23 19:59:20.000000000 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -26255,7 +26363,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/interface.c linux-2.6.32.24/driv } diff -urNp linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c --- linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c 2010-10-23 19:59:20.000000000 -0400 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -26276,7 +26384,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c linux-2.6.32.24/driver memcpy(buf, dp, left); diff -urNp linux-2.6.32.24/drivers/isdn/icn/icn.c linux-2.6.32.24/drivers/isdn/icn/icn.c --- linux-2.6.32.24/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/icn/icn.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/icn/icn.c 2010-10-23 19:59:20.000000000 -0400 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -26288,7 +26396,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/icn/icn.c linux-2.6.32.24/drivers/isdn/i memcpy(msg, buf, count); diff -urNp linux-2.6.32.24/drivers/isdn/sc/interrupt.c linux-2.6.32.24/drivers/isdn/sc/interrupt.c --- linux-2.6.32.24/drivers/isdn/sc/interrupt.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/isdn/sc/interrupt.c 2010-10-10 15:57:56.000000000 -0400 ++++ linux-2.6.32.24/drivers/isdn/sc/interrupt.c 2010-10-23 19:59:20.000000000 -0400 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, } else if(callid>=0x0000 && callid<=0x7FFF) @@ -26325,7 +26433,7 @@ diff -urNp linux-2.6.32.24/drivers/isdn/sc/interrupt.c linux-2.6.32.24/drivers/i diff -urNp linux-2.6.32.24/drivers/lguest/core.c linux-2.6.32.24/drivers/lguest/core.c --- linux-2.6.32.24/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/lguest/core.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/lguest/core.c 2010-10-23 19:59:20.000000000 -0400 @@ -91,9 +91,17 @@ static __init int map_switcher(void) * it's worked so far. The end address needs +1 because __get_vm_area * allocates an extra guard page, so we need space for that. @@ -26346,7 +26454,7 @@ diff -urNp linux-2.6.32.24/drivers/lguest/core.c linux-2.6.32.24/drivers/lguest/ printk("lguest: could not map switcher pages high\n"); diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c --- linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c 2010-10-23 19:59:20.000000000 -0400 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -26367,7 +26475,7 @@ diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.24 diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu.c linux-2.6.32.24/drivers/macintosh/via-pmu.c --- linux-2.6.32.24/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/macintosh/via-pmu.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/macintosh/via-pmu.c 2010-10-23 19:59:20.000000000 -0400 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -26379,7 +26487,7 @@ diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu.c linux-2.6.32.24/drivers/m }; diff -urNp linux-2.6.32.24/drivers/md/bitmap.c linux-2.6.32.24/drivers/md/bitmap.c --- linux-2.6.32.24/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/md/bitmap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/md/bitmap.c 2010-10-23 19:59:20.000000000 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -26391,7 +26499,7 @@ diff -urNp linux-2.6.32.24/drivers/md/bitmap.c linux-2.6.32.24/drivers/md/bitmap diff -urNp linux-2.6.32.24/drivers/md/dm-sysfs.c linux-2.6.32.24/drivers/md/dm-sysfs.c --- linux-2.6.32.24/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/md/dm-sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/md/dm-sysfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -26403,7 +26511,7 @@ diff -urNp linux-2.6.32.24/drivers/md/dm-sysfs.c linux-2.6.32.24/drivers/md/dm-s diff -urNp linux-2.6.32.24/drivers/md/dm-table.c linux-2.6.32.24/drivers/md/dm-table.c --- linux-2.6.32.24/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/md/dm-table.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/md/dm-table.c 2010-10-23 19:59:20.000000000 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -26415,7 +26523,7 @@ diff -urNp linux-2.6.32.24/drivers/md/dm-table.c linux-2.6.32.24/drivers/md/dm-t dm_device_name(ti->table->md), bdevname(bdev, b), diff -urNp linux-2.6.32.24/drivers/md/md.c linux-2.6.32.24/drivers/md/md.c --- linux-2.6.32.24/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/md/md.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/md/md.c 2010-10-23 19:59:20.000000000 -0400 @@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); @@ -26454,7 +26562,7 @@ diff -urNp linux-2.6.32.24/drivers/md/md.c linux-2.6.32.24/drivers/md/md.c * disk_stats is counted when it completes. diff -urNp linux-2.6.32.24/drivers/md/md.h linux-2.6.32.24/drivers/md/md.h --- linux-2.6.32.24/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/md/md.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/md/md.h 2010-10-23 19:59:20.000000000 -0400 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -26466,7 +26574,7 @@ diff -urNp linux-2.6.32.24/drivers/md/md.h linux-2.6.32.24/drivers/md/md.h struct mdk_personality diff -urNp linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c --- linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c 2010-10-23 19:59:20.000000000 -0400 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -26477,7 +26585,7 @@ diff -urNp linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.24/d int minor; diff -urNp linux-2.6.32.24/drivers/media/radio/radio-cadet.c linux-2.6.32.24/drivers/media/radio/radio-cadet.c --- linux-2.6.32.24/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/media/radio/radio-cadet.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/media/radio/radio-cadet.c 2010-10-23 19:59:20.000000000 -0400 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f while (i < count && dev->rdsin != dev->rdsout) readbuf[i++] = dev->rdsbuf[dev->rdsout++]; @@ -26489,7 +26597,7 @@ diff -urNp linux-2.6.32.24/drivers/media/radio/radio-cadet.c linux-2.6.32.24/dri } diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c --- linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c 2010-10-23 19:59:20.000000000 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -26501,7 +26609,7 @@ diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. if (!input_dev) { diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c --- linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c 2010-10-23 19:59:20.000000000 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -26511,9 +26619,68 @@ diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { +diff -urNp linux-2.6.32.24/drivers/media/video/v4l2-compat-ioctl32.c linux-2.6.32.24/drivers/media/video/v4l2-compat-ioctl32.c +--- linux-2.6.32.24/drivers/media/video/v4l2-compat-ioctl32.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/drivers/media/video/v4l2-compat-ioctl32.c 2010-10-23 19:59:20.000000000 -0400 +@@ -193,17 +193,24 @@ static int put_video_window32(struct vid + struct video_code32 { + char loadwhat[16]; /* name or tag of file being passed */ + compat_int_t datasize; +- unsigned char *data; ++ compat_uptr_t data; + }; + +-static int get_microcode32(struct video_code *kp, struct video_code32 __user *up) ++static struct video_code __user *get_microcode32(struct video_code32 *kp) + { +- if (!access_ok(VERIFY_READ, up, sizeof(struct video_code32)) || +- copy_from_user(kp->loadwhat, up->loadwhat, sizeof(up->loadwhat)) || +- get_user(kp->datasize, &up->datasize) || +- copy_from_user(kp->data, up->data, up->datasize)) +- return -EFAULT; +- return 0; ++ struct video_code __user *up; ++ ++ up = compat_alloc_user_space(sizeof(*up)); ++ ++ /* ++ * NOTE! We don't actually care if these fail. If the ++ * user address is invalid, the native ioctl will do ++ * the error handling for us ++ */ ++ (void) copy_to_user(up->loadwhat, kp->loadwhat, sizeof(up->loadwhat)); ++ (void) put_user(kp->datasize, &up->datasize); ++ (void) put_user(compat_ptr(kp->data), &up->data); ++ return up; + } + + #define VIDIOCGTUNER32 _IOWR('v', 4, struct video_tuner32) +@@ -741,7 +748,7 @@ static long do_video_ioctl(struct file * + struct video_tuner vt; + struct video_buffer vb; + struct video_window vw; +- struct video_code vc; ++ struct video_code32 vc; + struct video_audio va; + #endif + struct v4l2_format v2f; +@@ -820,8 +827,11 @@ static long do_video_ioctl(struct file * + break; + + case VIDIOCSMICROCODE: +- err = get_microcode32(&karg.vc, up); +- compatible_arg = 0; ++ /* Copy the 32-bit "video_code32" to kernel space */ ++ if (copy_from_user(&karg.vc, up, sizeof(karg.vc))) ++ return -EFAULT; ++ /* Convert the 32-bit version to a 64-bit version in user space */ ++ up = get_microcode32(&karg.vc); + break; + + case VIDIOCSFREQ: diff -urNp linux-2.6.32.24/drivers/message/fusion/mptbase.c linux-2.6.32.24/drivers/message/fusion/mptbase.c --- linux-2.6.32.24/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/message/fusion/mptbase.c 2010-09-14 21:32:19.000000000 -0400 ++++ linux-2.6.32.24/drivers/message/fusion/mptbase.c 2010-10-23 19:59:20.000000000 -0400 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); @@ -26531,7 +26698,7 @@ diff -urNp linux-2.6.32.24/drivers/message/fusion/mptbase.c linux-2.6.32.24/driv */ diff -urNp linux-2.6.32.24/drivers/message/fusion/mptdebug.h linux-2.6.32.24/drivers/message/fusion/mptdebug.h --- linux-2.6.32.24/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/message/fusion/mptdebug.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/message/fusion/mptdebug.h 2010-10-23 19:59:20.000000000 -0400 @@ -71,7 +71,7 @@ CMD; \ } @@ -26543,7 +26710,7 @@ diff -urNp linux-2.6.32.24/drivers/message/fusion/mptdebug.h linux-2.6.32.24/dri diff -urNp linux-2.6.32.24/drivers/message/fusion/mptsas.c linux-2.6.32.24/drivers/message/fusion/mptsas.c --- linux-2.6.32.24/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/message/fusion/mptsas.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/message/fusion/mptsas.c 2010-10-23 19:59:20.000000000 -0400 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -26592,9 +26759,37 @@ diff -urNp linux-2.6.32.24/drivers/message/fusion/mptsas.c linux-2.6.32.24/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { +diff -urNp linux-2.6.32.24/drivers/message/fusion/mptscsih.c linux-2.6.32.24/drivers/message/fusion/mptscsih.c +--- linux-2.6.32.24/drivers/message/fusion/mptscsih.c 2010-09-26 17:26:05.000000000 -0400 ++++ linux-2.6.32.24/drivers/message/fusion/mptscsih.c 2010-10-23 19:59:24.000000000 -0400 +@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost) + + h = shost_priv(SChost); + +- if (h) { +- if (h->info_kbuf == NULL) +- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL) +- return h->info_kbuf; +- h->info_kbuf[0] = '\0'; ++ if (!h) ++ return NULL; + +- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); +- h->info_kbuf[size-1] = '\0'; +- } ++ if (h->info_kbuf == NULL) ++ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL) ++ return h->info_kbuf; ++ h->info_kbuf[0] = '\0'; ++ ++ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); ++ h->info_kbuf[size-1] = '\0'; + + return h->info_kbuf; + } diff -urNp linux-2.6.32.24/drivers/message/i2o/i2o_proc.c linux-2.6.32.24/drivers/message/i2o/i2o_proc.c --- linux-2.6.32.24/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/message/i2o/i2o_proc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/message/i2o/i2o_proc.c 2010-10-23 19:59:20.000000000 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -26683,7 +26878,7 @@ diff -urNp linux-2.6.32.24/drivers/message/i2o/i2o_proc.c linux-2.6.32.24/driver } diff -urNp linux-2.6.32.24/drivers/misc/kgdbts.c linux-2.6.32.24/drivers/misc/kgdbts.c --- linux-2.6.32.24/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/misc/kgdbts.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/misc/kgdbts.c 2010-10-23 19:59:20.000000000 -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -26704,7 +26899,7 @@ diff -urNp linux-2.6.32.24/drivers/misc/kgdbts.c linux-2.6.32.24/drivers/misc/kg .write_char = kgdbts_put_char, diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c --- linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c 2010-10-23 19:59:20.000000000 -0400 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -26718,7 +26913,7 @@ diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.24/dri } diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c --- linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -26744,7 +26939,7 @@ diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.24/driv count ? total / count : 0, max); diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h --- linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h 2010-10-23 19:59:20.000000000 -0400 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -26930,7 +27125,7 @@ diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h linux-2.6.32.24/driv #ifdef CONFIG_SGI_GRU_DEBUG diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2000.c linux-2.6.32.24/drivers/mtd/devices/doc2000.c --- linux-2.6.32.24/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/mtd/devices/doc2000.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/mtd/devices/doc2000.c 2010-10-23 19:59:20.000000000 -0400 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt /* The ECC will not be calculated correctly if less than 512 is written */ @@ -26942,7 +27137,7 @@ diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2000.c linux-2.6.32.24/drivers (long) to, (long) len); diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2001.c linux-2.6.32.24/drivers/mtd/devices/doc2001.c --- linux-2.6.32.24/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/mtd/devices/doc2001.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/mtd/devices/doc2001.c 2010-10-23 19:59:20.000000000 -0400 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -26954,7 +27149,7 @@ diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2001.c linux-2.6.32.24/drivers /* Don't allow a single read to cross a 512-byte block boundary */ diff -urNp linux-2.6.32.24/drivers/mtd/ubi/build.c linux-2.6.32.24/drivers/mtd/ubi/build.c --- linux-2.6.32.24/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/mtd/ubi/build.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/mtd/ubi/build.c 2010-10-23 19:59:20.000000000 -0400 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -26996,7 +27191,7 @@ diff -urNp linux-2.6.32.24/drivers/mtd/ubi/build.c linux-2.6.32.24/drivers/mtd/u /** diff -urNp linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c --- linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c 2010-10-23 19:59:20.000000000 -0400 @@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n case CHELSIO_GET_QSET_NUM:{ struct ch_reg edata; @@ -27008,7 +27203,7 @@ diff -urNp linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.24/driver edata.val = pi->nqsets; diff -urNp linux-2.6.32.24/drivers/net/e1000e/82571.c linux-2.6.32.24/drivers/net/e1000e/82571.c --- linux-2.6.32.24/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/e1000e/82571.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/e1000e/82571.c 2010-10-23 19:59:20.000000000 -0400 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -27064,7 +27259,7 @@ diff -urNp linux-2.6.32.24/drivers/net/e1000e/82571.c linux-2.6.32.24/drivers/ne .release_nvm = e1000_release_nvm_82571, diff -urNp linux-2.6.32.24/drivers/net/e1000e/e1000.h linux-2.6.32.24/drivers/net/e1000e/e1000.h --- linux-2.6.32.24/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/e1000e/e1000.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/e1000e/e1000.h 2010-10-23 19:59:20.000000000 -0400 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -27080,7 +27275,7 @@ diff -urNp linux-2.6.32.24/drivers/net/e1000e/e1000.h linux-2.6.32.24/drivers/ne /* hardware capability, feature, and workaround flags */ diff -urNp linux-2.6.32.24/drivers/net/e1000e/es2lan.c linux-2.6.32.24/drivers/net/e1000e/es2lan.c --- linux-2.6.32.24/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/e1000e/es2lan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/e1000e/es2lan.c 2010-10-23 19:59:20.000000000 -0400 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -27118,7 +27313,7 @@ diff -urNp linux-2.6.32.24/drivers/net/e1000e/es2lan.c linux-2.6.32.24/drivers/n .release_nvm = e1000_release_nvm_80003es2lan, diff -urNp linux-2.6.32.24/drivers/net/e1000e/hw.h linux-2.6.32.24/drivers/net/e1000e/hw.h --- linux-2.6.32.24/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/e1000e/hw.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/e1000e/hw.h 2010-10-23 19:59:20.000000000 -0400 @@ -756,34 +756,34 @@ struct e1000_mac_operations { /* Function pointers for the PHY. */ @@ -27180,7 +27375,7 @@ diff -urNp linux-2.6.32.24/drivers/net/e1000e/hw.h linux-2.6.32.24/drivers/net/e struct e1000_mac_info { diff -urNp linux-2.6.32.24/drivers/net/e1000e/ich8lan.c linux-2.6.32.24/drivers/net/e1000e/ich8lan.c --- linux-2.6.32.24/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/e1000e/ich8lan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/e1000e/ich8lan.c 2010-10-23 19:59:20.000000000 -0400 @@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -27210,7 +27405,7 @@ diff -urNp linux-2.6.32.24/drivers/net/e1000e/ich8lan.c linux-2.6.32.24/drivers/ .release_nvm = e1000_release_nvm_ich8lan, diff -urNp linux-2.6.32.24/drivers/net/eql.c linux-2.6.32.24/drivers/net/eql.c --- linux-2.6.32.24/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/eql.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/eql.c 2010-10-23 19:59:20.000000000 -0400 @@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d equalizer_t *eql; master_config_t mc; @@ -27222,7 +27417,7 @@ diff -urNp linux-2.6.32.24/drivers/net/eql.c linux-2.6.32.24/drivers/net/eql.c eql = netdev_priv(dev); diff -urNp linux-2.6.32.24/drivers/net/ibmveth.c linux-2.6.32.24/drivers/net/ibmveth.c --- linux-2.6.32.24/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/ibmveth.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/ibmveth.c 2010-10-23 19:59:20.000000000 -0400 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -27234,7 +27429,7 @@ diff -urNp linux-2.6.32.24/drivers/net/ibmveth.c linux-2.6.32.24/drivers/net/ibm }; diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_82575.c linux-2.6.32.24/drivers/net/igb/e1000_82575.c --- linux-2.6.32.24/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/igb/e1000_82575.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/igb/e1000_82575.c 2010-10-23 19:59:20.000000000 -0400 @@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -27262,7 +27457,7 @@ diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_82575.c linux-2.6.32.24/drivers .release = igb_release_nvm_82575, diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_hw.h linux-2.6.32.24/drivers/net/igb/e1000_hw.h --- linux-2.6.32.24/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/igb/e1000_hw.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/igb/e1000_hw.h 2010-10-23 19:59:20.000000000 -0400 @@ -305,17 +305,17 @@ struct e1000_phy_operations { }; @@ -27290,7 +27485,7 @@ diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_hw.h linux-2.6.32.24/drivers/ne extern const struct e1000_info e1000_82575_info; diff -urNp linux-2.6.32.24/drivers/net/irda/vlsi_ir.c linux-2.6.32.24/drivers/net/irda/vlsi_ir.c --- linux-2.6.32.24/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/irda/vlsi_ir.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/irda/vlsi_ir.c 2010-10-23 19:59:20.000000000 -0400 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -27309,7 +27504,7 @@ diff -urNp linux-2.6.32.24/drivers/net/irda/vlsi_ir.c linux-2.6.32.24/drivers/ne return NETDEV_TX_OK; diff -urNp linux-2.6.32.24/drivers/net/iseries_veth.c linux-2.6.32.24/drivers/net/iseries_veth.c --- linux-2.6.32.24/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/iseries_veth.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/iseries_veth.c 2010-10-23 19:59:20.000000000 -0400 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -27330,7 +27525,7 @@ diff -urNp linux-2.6.32.24/drivers/net/iseries_veth.c linux-2.6.32.24/drivers/ne diff -urNp linux-2.6.32.24/drivers/net/pcnet32.c linux-2.6.32.24/drivers/net/pcnet32.c --- linux-2.6.32.24/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/pcnet32.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/pcnet32.c 2010-10-23 19:59:20.000000000 -0400 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -27342,7 +27537,7 @@ diff -urNp linux-2.6.32.24/drivers/net/pcnet32.c linux-2.6.32.24/drivers/net/pcn static int pcnet32_debug = 0; diff -urNp linux-2.6.32.24/drivers/net/tg3.h linux-2.6.32.24/drivers/net/tg3.h --- linux-2.6.32.24/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/tg3.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/tg3.h 2010-10-23 19:59:20.000000000 -0400 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -27353,7 +27548,7 @@ diff -urNp linux-2.6.32.24/drivers/net/tg3.h linux-2.6.32.24/drivers/net/tg3.h #define CHIPREV_ID_5752_A0 0x6000 diff -urNp linux-2.6.32.24/drivers/net/tulip/de4x5.c linux-2.6.32.24/drivers/net/tulip/de4x5.c --- linux-2.6.32.24/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/tulip/de4x5.c 2010-09-16 14:26:16.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/tulip/de4x5.c 2010-10-23 19:59:20.000000000 -0400 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; @@ -27383,7 +27578,7 @@ diff -urNp linux-2.6.32.24/drivers/net/tulip/de4x5.c linux-2.6.32.24/drivers/net #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */ diff -urNp linux-2.6.32.24/drivers/net/usb/hso.c linux-2.6.32.24/drivers/net/usb/hso.c --- linux-2.6.32.24/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/usb/hso.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/usb/hso.c 2010-10-23 19:59:20.000000000 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -27478,7 +27673,7 @@ diff -urNp linux-2.6.32.24/drivers/net/usb/hso.c linux-2.6.32.24/drivers/net/usb hso_kick_transmit(dev2ser(serial_table[i])); diff -urNp linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c --- linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -27490,7 +27685,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c --- linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); @@ -27502,7 +27697,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 /* Take wl->irq_lock before calling read/write? */ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-10-23 19:59:20.000000000 -0400 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -27514,7 +27709,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. .hcmd = &iwl5000_hcmd, diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-10-23 19:59:20.000000000 -0400 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -27526,7 +27721,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. .hcmd = &iwl3945_hcmd, diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-10-23 19:59:20.000000000 -0400 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -27538,7 +27733,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. .hcmd = &iwl4965_hcmd, diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-10-23 19:59:20.000000000 -0400 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -27558,7 +27753,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. .hcmd = &iwl5000_hcmd, diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-10-23 19:59:20.000000000 -0400 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -27570,7 +27765,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. .hcmd = &iwl5000_hcmd, diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-10-23 19:59:20.000000000 -0400 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif @@ -27584,7 +27779,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 {} diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h --- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-10-23 19:59:20.000000000 -0400 @@ -68,7 +68,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -27596,7 +27791,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2 extern struct iwl_hcmd_ops iwl5000_hcmd; diff -urNp linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c --- linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -27608,7 +27803,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. static const struct lbs_debugfs_files debugfs_files[] = { diff -urNp linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c --- linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c 2010-10-23 19:59:20.000000000 -0400 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn devdbg(usbdev, "set_rts_threshold %i", rts_threshold); @@ -27620,7 +27815,7 @@ diff -urNp linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c linux-2.6.32.24/dri tmp = cpu_to_le32(rts_threshold); diff -urNp linux-2.6.32.24/drivers/oprofile/buffer_sync.c linux-2.6.32.24/drivers/oprofile/buffer_sync.c --- linux-2.6.32.24/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/buffer_sync.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/buffer_sync.c 2010-10-23 19:59:20.000000000 -0400 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -27658,7 +27853,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/buffer_sync.c linux-2.6.32.24/driver release_mm(mm); diff -urNp linux-2.6.32.24/drivers/oprofile/event_buffer.c linux-2.6.32.24/drivers/oprofile/event_buffer.c --- linux-2.6.32.24/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/event_buffer.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/event_buffer.c 2010-10-23 19:59:20.000000000 -0400 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -27670,7 +27865,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/event_buffer.c linux-2.6.32.24/drive diff -urNp linux-2.6.32.24/drivers/oprofile/oprof.c linux-2.6.32.24/drivers/oprofile/oprof.c --- linux-2.6.32.24/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/oprof.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/oprof.c 2010-10-23 19:59:20.000000000 -0400 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -27682,7 +27877,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/oprof.c linux-2.6.32.24/drivers/opro diff -urNp linux-2.6.32.24/drivers/oprofile/oprofilefs.c linux-2.6.32.24/drivers/oprofile/oprofilefs.c --- linux-2.6.32.24/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/oprofilefs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/oprofilefs.c 2010-10-23 19:59:20.000000000 -0400 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -27694,7 +27889,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/oprofilefs.c linux-2.6.32.24/drivers &atomic_ro_fops, 0444); diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.c linux-2.6.32.24/drivers/oprofile/oprofile_stats.c --- linux-2.6.32.24/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.c 2010-10-23 19:59:20.000000000 -0400 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -27714,7 +27909,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.c linux-2.6.32.24/dri diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.h linux-2.6.32.24/drivers/oprofile/oprofile_stats.h --- linux-2.6.32.24/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.h 2010-10-23 19:59:20.000000000 -0400 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -27734,7 +27929,7 @@ diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.h linux-2.6.32.24/dri extern struct oprofile_stat_struct oprofile_stats; diff -urNp linux-2.6.32.24/drivers/parisc/pdc_stable.c linux-2.6.32.24/drivers/parisc/pdc_stable.c --- linux-2.6.32.24/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/parisc/pdc_stable.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/parisc/pdc_stable.c 2010-10-23 19:59:20.000000000 -0400 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -27746,7 +27941,7 @@ diff -urNp linux-2.6.32.24/drivers/parisc/pdc_stable.c linux-2.6.32.24/drivers/p }; diff -urNp linux-2.6.32.24/drivers/parport/procfs.c linux-2.6.32.24/drivers/parport/procfs.c --- linux-2.6.32.24/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/parport/procfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/parport/procfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -27767,7 +27962,7 @@ diff -urNp linux-2.6.32.24/drivers/parport/procfs.c linux-2.6.32.24/drivers/parp diff -urNp linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c --- linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c 2010-10-23 19:59:20.000000000 -0400 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -27779,7 +27974,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.24/dr diff -urNp linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c --- linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c 2010-10-23 19:59:20.000000000 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -27796,7 +27991,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.24/dr /* initialize our int15 lock */ diff -urNp linux-2.6.32.24/drivers/pci/hotplug/fakephp.c linux-2.6.32.24/drivers/pci/hotplug/fakephp.c --- linux-2.6.32.24/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/hotplug/fakephp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/hotplug/fakephp.c 2010-10-23 19:59:20.000000000 -0400 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -27808,7 +28003,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/hotplug/fakephp.c linux-2.6.32.24/drivers .release = &legacy_release, diff -urNp linux-2.6.32.24/drivers/pci/intel-iommu.c linux-2.6.32.24/drivers/pci/intel-iommu.c --- linux-2.6.32.24/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/intel-iommu.c 2010-09-26 17:26:38.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/intel-iommu.c 2010-10-23 19:59:20.000000000 -0400 @@ -2643,7 +2643,7 @@ error: return 0; } @@ -27880,7 +28075,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/intel-iommu.c linux-2.6.32.24/drivers/pci .map_sg = intel_map_sg, diff -urNp linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c --- linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c 2010-10-23 19:59:20.000000000 -0400 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -27892,7 +28087,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.24/driver diff -urNp linux-2.6.32.24/drivers/pci/probe.c linux-2.6.32.24/drivers/pci/probe.c --- linux-2.6.32.24/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/probe.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/probe.c 2010-10-23 19:59:20.000000000 -0400 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -27912,7 +28107,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/probe.c linux-2.6.32.24/drivers/pci/probe { diff -urNp linux-2.6.32.24/drivers/pci/proc.c linux-2.6.32.24/drivers/pci/proc.c --- linux-2.6.32.24/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/proc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/proc.c 2010-10-23 19:59:20.000000000 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -27932,7 +28127,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/proc.c linux-2.6.32.24/drivers/pci/proc.c proc_initialized = 1; diff -urNp linux-2.6.32.24/drivers/pci/slot.c linux-2.6.32.24/drivers/pci/slot.c --- linux-2.6.32.24/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pci/slot.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pci/slot.c 2010-10-23 19:59:20.000000000 -0400 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -27944,7 +28139,7 @@ diff -urNp linux-2.6.32.24/drivers/pci/slot.c linux-2.6.32.24/drivers/pci/slot.c }; diff -urNp linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c --- linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode return -EFAULT; } @@ -27956,7 +28151,7 @@ diff -urNp linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.24/drivers diff -urNp linux-2.6.32.24/drivers/pcmcia/ti113x.h linux-2.6.32.24/drivers/pcmcia/ti113x.h --- linux-2.6.32.24/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pcmcia/ti113x.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pcmcia/ti113x.h 2010-10-23 19:59:20.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), @@ -27968,7 +28163,7 @@ diff -urNp linux-2.6.32.24/drivers/pcmcia/ti113x.h linux-2.6.32.24/drivers/pcmci static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) diff -urNp linux-2.6.32.24/drivers/pcmcia/yenta_socket.c linux-2.6.32.24/drivers/pcmcia/yenta_socket.c --- linux-2.6.32.24/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pcmcia/yenta_socket.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pcmcia/yenta_socket.c 2010-10-23 19:59:20.000000000 -0400 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -27980,7 +28175,7 @@ diff -urNp linux-2.6.32.24/drivers/pcmcia/yenta_socket.c linux-2.6.32.24/drivers diff -urNp linux-2.6.32.24/drivers/platform/x86/acer-wmi.c linux-2.6.32.24/drivers/platform/x86/acer-wmi.c --- linux-2.6.32.24/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/acer-wmi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/acer-wmi.c 2010-10-23 19:59:20.000000000 -0400 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -27992,7 +28187,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/acer-wmi.c linux-2.6.32.24/drive }; diff -urNp linux-2.6.32.24/drivers/platform/x86/asus_acpi.c linux-2.6.32.24/drivers/platform/x86/asus_acpi.c --- linux-2.6.32.24/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/asus_acpi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/asus_acpi.c 2010-10-23 19:59:20.000000000 -0400 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -28004,7 +28199,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/asus_acpi.c linux-2.6.32.24/driv }; diff -urNp linux-2.6.32.24/drivers/platform/x86/asus-laptop.c linux-2.6.32.24/drivers/platform/x86/asus-laptop.c --- linux-2.6.32.24/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/asus-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/asus-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -28016,7 +28211,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/asus-laptop.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/platform/x86/compal-laptop.c linux-2.6.32.24/drivers/platform/x86/compal-laptop.c --- linux-2.6.32.24/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/compal-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/compal-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -28028,7 +28223,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/compal-laptop.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/drivers/platform/x86/dell-laptop.c linux-2.6.32.24/drivers/platform/x86/dell-laptop.c --- linux-2.6.32.24/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/dell-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/dell-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -28040,7 +28235,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/dell-laptop.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c --- linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -28052,7 +28247,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c --- linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -28064,7 +28259,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.24 }; diff -urNp linux-2.6.32.24/drivers/platform/x86/msi-laptop.c linux-2.6.32.24/drivers/platform/x86/msi-laptop.c --- linux-2.6.32.24/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/msi-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/msi-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -28076,7 +28271,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/msi-laptop.c linux-2.6.32.24/dri }; diff -urNp linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c --- linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -28088,7 +28283,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. }; diff -urNp linux-2.6.32.24/drivers/platform/x86/sony-laptop.c linux-2.6.32.24/drivers/platform/x86/sony-laptop.c --- linux-2.6.32.24/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/sony-laptop.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/sony-laptop.c 2010-10-23 19:59:20.000000000 -0400 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -28100,7 +28295,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/sony-laptop.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c --- linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c 2010-10-23 19:59:20.000000000 -0400 @@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -28112,7 +28307,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c --- linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c 2010-10-23 19:59:20.000000000 -0400 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -28124,7 +28319,7 @@ diff -urNp linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c --- linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c 2010-10-23 19:59:20.000000000 -0400 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -28183,7 +28378,7 @@ diff -urNp linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.24/drive } diff -urNp linux-2.6.32.24/drivers/pnp/quirks.c linux-2.6.32.24/drivers/pnp/quirks.c --- linux-2.6.32.24/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pnp/quirks.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pnp/quirks.c 2010-10-23 19:59:20.000000000 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -28195,7 +28390,7 @@ diff -urNp linux-2.6.32.24/drivers/pnp/quirks.c linux-2.6.32.24/drivers/pnp/quir void pnp_fixup_device(struct pnp_dev *dev) diff -urNp linux-2.6.32.24/drivers/pnp/resource.c linux-2.6.32.24/drivers/pnp/resource.c --- linux-2.6.32.24/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/pnp/resource.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/pnp/resource.c 2010-10-23 19:59:20.000000000 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -28216,7 +28411,7 @@ diff -urNp linux-2.6.32.24/drivers/pnp/resource.c linux-2.6.32.24/drivers/pnp/re /* check if the resource is reserved */ diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.c linux-2.6.32.24/drivers/s390/cio/qdio_perf.c --- linux-2.6.32.24/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.c 2010-10-23 19:59:20.000000000 -0400 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -28294,7 +28489,7 @@ diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.c linux-2.6.32.24/drivers/ } diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.h linux-2.6.32.24/drivers/s390/cio/qdio_perf.h --- linux-2.6.32.24/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.h 2010-10-23 19:59:20.000000000 -0400 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -28369,7 +28564,7 @@ diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.h linux-2.6.32.24/drivers/ int qdio_setup_perf_stats(void); diff -urNp linux-2.6.32.24/drivers/scsi/ipr.c linux-2.6.32.24/drivers/scsi/ipr.c --- linux-2.6.32.24/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/ipr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/ipr.c 2010-10-23 19:59:20.000000000 -0400 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -28381,7 +28576,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/ipr.c linux-2.6.32.24/drivers/scsi/ipr.c .post_internal_cmd = ipr_ata_post_internal, diff -urNp linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c --- linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c 2010-10-23 19:59:20.000000000 -0400 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -28505,7 +28700,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c linux-2.6.32.24/drivers/ } diff -urNp linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c --- linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c 2010-10-23 19:59:20.000000000 -0400 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -28517,7 +28712,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c linux-2.6.32.24/drivers .qc_prep = ata_noop_qc_prep, diff -urNp linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h --- linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-10-23 19:59:20.000000000 -0400 @@ -79,7 +79,7 @@ CMD; \ } @@ -28529,7 +28724,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.24/ diff -urNp linux-2.6.32.24/drivers/scsi/scsi_logging.h linux-2.6.32.24/drivers/scsi/scsi_logging.h --- linux-2.6.32.24/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/scsi_logging.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/scsi_logging.h 2010-10-23 19:59:20.000000000 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -28541,7 +28736,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/scsi_logging.h linux-2.6.32.24/drivers/s /* diff -urNp linux-2.6.32.24/drivers/scsi/sg.c linux-2.6.32.24/drivers/scsi/sg.c --- linux-2.6.32.24/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/scsi/sg.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/scsi/sg.c 2010-10-23 19:59:20.000000000 -0400 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -28562,7 +28757,7 @@ diff -urNp linux-2.6.32.24/drivers/scsi/sg.c linux-2.6.32.24/drivers/scsi/sg.c if (!sg_proc_sgp) diff -urNp linux-2.6.32.24/drivers/serial/8250_pci.c linux-2.6.32.24/drivers/serial/8250_pci.c --- linux-2.6.32.24/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/serial/8250_pci.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/serial/8250_pci.c 2010-10-23 19:59:20.000000000 -0400 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -28574,7 +28769,7 @@ diff -urNp linux-2.6.32.24/drivers/serial/8250_pci.c linux-2.6.32.24/drivers/ser static struct pci_driver serial_pci_driver = { diff -urNp linux-2.6.32.24/drivers/serial/kgdboc.c linux-2.6.32.24/drivers/serial/kgdboc.c --- linux-2.6.32.24/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/serial/kgdboc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/serial/kgdboc.c 2010-10-23 19:59:20.000000000 -0400 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -28595,7 +28790,7 @@ diff -urNp linux-2.6.32.24/drivers/serial/kgdboc.c linux-2.6.32.24/drivers/seria .write_char = kgdboc_put_char, diff -urNp linux-2.6.32.24/drivers/staging/android/binder.c linux-2.6.32.24/drivers/staging/android/binder.c --- linux-2.6.32.24/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/android/binder.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/android/binder.c 2010-10-23 19:59:20.000000000 -0400 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -28607,7 +28802,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/android/binder.c linux-2.6.32.24/driv }; diff -urNp linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c --- linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c 2010-10-23 19:59:20.000000000 -0400 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -28628,7 +28823,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.24/drivers .release = b3dfg_release, diff -urNp linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c --- linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c 2010-10-23 19:59:20.000000000 -0400 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -28640,7 +28835,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c linux-2.6.32.24/ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c 2010-10-23 19:59:20.000000000 -0400 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -28652,7 +28847,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 .unlocked_ioctl = adsp_ioctl, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c 2010-10-23 19:59:20.000000000 -0400 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -28664,7 +28859,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. .release = audio_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-10-23 19:59:20.000000000 -0400 @@ -833,7 +833,7 @@ done: return rc; } @@ -28676,7 +28871,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 .release = audamrnb_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c 2010-10-23 19:59:20.000000000 -0400 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -28688,7 +28883,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 .release = audevrc_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c 2010-10-23 19:59:20.000000000 -0400 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -28709,7 +28904,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2 .unlocked_ioctl = audpre_ioctl, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c 2010-10-23 19:59:20.000000000 -0400 @@ -941,7 +941,7 @@ done: return rc; } @@ -28721,7 +28916,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. .release = audio_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c 2010-10-23 19:59:20.000000000 -0400 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -28742,7 +28937,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. .unlocked_ioctl = audpp_ioctl, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-10-23 19:59:20.000000000 -0400 @@ -816,7 +816,7 @@ err: return rc; } @@ -28754,7 +28949,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 .release = audqcelp_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c --- linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c 2010-10-23 19:59:20.000000000 -0400 @@ -242,7 +242,7 @@ err: return rc; } @@ -28766,7 +28961,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.24/dri .release = snd_release, diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c --- linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c 2010-10-23 19:59:20.000000000 -0400 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -28778,7 +28973,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.24/d .write = qmi_write, diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c --- linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-10-23 19:59:20.000000000 -0400 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -28799,7 +28994,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .release = rpcrouter_release, diff -urNp linux-2.6.32.24/drivers/staging/dst/dcore.c linux-2.6.32.24/drivers/staging/dst/dcore.c --- linux-2.6.32.24/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dst/dcore.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dst/dcore.c 2010-10-23 19:59:20.000000000 -0400 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -28820,7 +29015,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dst/dcore.c linux-2.6.32.24/drivers/s err = dst_node_sysfs_init(n); diff -urNp linux-2.6.32.24/drivers/staging/dst/trans.c linux-2.6.32.24/drivers/staging/dst/trans.c --- linux-2.6.32.24/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/dst/trans.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/dst/trans.c 2010-10-23 19:59:20.000000000 -0400 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -28832,7 +29027,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/dst/trans.c linux-2.6.32.24/drivers/s dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); diff -urNp linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c --- linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c 2010-10-23 19:59:20.000000000 -0400 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -28844,7 +29039,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.24/ .fault = go7007_vm_fault, diff -urNp linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c --- linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c 2010-10-23 19:59:20.000000000 -0400 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -28856,7 +29051,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.24/drive .release = blkvsc_release, diff -urNp linux-2.6.32.24/drivers/staging/hv/Hv.c linux-2.6.32.24/drivers/staging/hv/Hv.c --- linux-2.6.32.24/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/hv/Hv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/hv/Hv.c 2010-10-23 19:59:20.000000000 -0400 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; u32 outputAddressHi = outputAddress >> 32; @@ -28868,7 +29063,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/hv/Hv.c linux-2.6.32.24/drivers/stagi Control, Input, Output); diff -urNp linux-2.6.32.24/drivers/staging/panel/panel.c linux-2.6.32.24/drivers/staging/panel/panel.c --- linux-2.6.32.24/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/panel/panel.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/panel/panel.c 2010-10-23 19:59:20.000000000 -0400 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -28889,7 +29084,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/panel/panel.c linux-2.6.32.24/drivers .release = keypad_release, /* close */ diff -urNp linux-2.6.32.24/drivers/staging/phison/phison.c linux-2.6.32.24/drivers/staging/phison/phison.c --- linux-2.6.32.24/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/phison/phison.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/phison/phison.c 2010-10-23 19:59:20.000000000 -0400 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -28901,7 +29096,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/phison/phison.c linux-2.6.32.24/drive }; diff -urNp linux-2.6.32.24/drivers/staging/poch/poch.c linux-2.6.32.24/drivers/staging/poch/poch.c --- linux-2.6.32.24/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/poch/poch.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/poch/poch.c 2010-10-23 19:59:20.000000000 -0400 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -28913,7 +29108,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/poch/poch.c linux-2.6.32.24/drivers/s .release = poch_release, diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/inode.c linux-2.6.32.24/drivers/staging/pohmelfs/inode.c --- linux-2.6.32.24/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/pohmelfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/pohmelfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -28925,7 +29120,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/inode.c linux-2.6.32.24/driv diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c --- linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c 2010-10-23 19:59:20.000000000 -0400 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -28937,7 +29132,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c linux-2.6.32.24/dri err = pohmelfs_mcache_insert(psb, m); diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h --- linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h 2010-10-23 19:59:20.000000000 -0400 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -28949,7 +29144,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h linux-2.6.32.24/driv unsigned int idx; diff -urNp linux-2.6.32.24/drivers/staging/sep/sep_driver.c linux-2.6.32.24/drivers/staging/sep/sep_driver.c --- linux-2.6.32.24/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/sep/sep_driver.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/sep/sep_driver.c 2010-10-23 19:59:20.000000000 -0400 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -28961,7 +29156,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/sep/sep_driver.c linux-2.6.32.24/driv .poll = sep_poll, diff -urNp linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c --- linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c 2010-10-23 19:59:20.000000000 -0400 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * static int __init vme_user_probe(struct device *, int, int); static int __exit vme_user_remove(struct device *, int, int); @@ -28973,7 +29168,7 @@ diff -urNp linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2 .read = vme_user_read, diff -urNp linux-2.6.32.24/drivers/uio/uio.c linux-2.6.32.24/drivers/uio/uio.c --- linux-2.6.32.24/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/uio/uio.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/uio/uio.c 2010-10-23 19:59:20.000000000 -0400 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -28994,7 +29189,7 @@ diff -urNp linux-2.6.32.24/drivers/uio/uio.c linux-2.6.32.24/drivers/uio/uio.c diff -urNp linux-2.6.32.24/drivers/usb/atm/usbatm.c linux-2.6.32.24/drivers/usb/atm/usbatm.c --- linux-2.6.32.24/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/atm/usbatm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/atm/usbatm.c 2010-10-23 19:59:20.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", @@ -29076,7 +29271,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/atm/usbatm.c linux-2.6.32.24/drivers/usb/ if (instance->disconnected) diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-acm.c linux-2.6.32.24/drivers/usb/class/cdc-acm.c --- linux-2.6.32.24/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/class/cdc-acm.c 2010-09-20 17:32:02.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/class/cdc-acm.c 2010-10-23 19:59:20.000000000 -0400 @@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] = { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -29088,7 +29283,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-acm.c linux-2.6.32.24/drivers/u MODULE_DEVICE_TABLE(usb, acm_ids); diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-wdm.c linux-2.6.32.24/drivers/usb/class/cdc-wdm.c --- linux-2.6.32.24/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/class/cdc-wdm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/class/cdc-wdm.c 2010-10-23 19:59:20.000000000 -0400 @@ -314,7 +314,7 @@ static ssize_t wdm_write if (r < 0) goto outnp; @@ -29100,7 +29295,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-wdm.c linux-2.6.32.24/drivers/u else diff -urNp linux-2.6.32.24/drivers/usb/class/usblp.c linux-2.6.32.24/drivers/usb/class/usblp.c --- linux-2.6.32.24/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/class/usblp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/class/usblp.c 2010-10-23 19:59:20.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 */ @@ -29121,7 +29316,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/class/usblp.c linux-2.6.32.24/drivers/usb MODULE_DEVICE_TABLE (usb, usblp_ids); diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.c linux-2.6.32.24/drivers/usb/core/hcd.c --- linux-2.6.32.24/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/core/hcd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/core/hcd.c 2010-10-23 19:59:20.000000000 -0400 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -29142,7 +29337,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.c linux-2.6.32.24/drivers/usb/co if (mon_ops) diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.h linux-2.6.32.24/drivers/usb/core/hcd.h --- linux-2.6.32.24/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/core/hcd.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/core/hcd.h 2010-10-23 19:59:20.000000000 -0400 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -29172,7 +29367,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.h linux-2.6.32.24/drivers/usb/co #else diff -urNp linux-2.6.32.24/drivers/usb/core/hub.c linux-2.6.32.24/drivers/usb/core/hub.c --- linux-2.6.32.24/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/core/hub.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/core/hub.c 2010-10-23 19:59:20.000000000 -0400 @@ -3401,7 +3401,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -29184,7 +29379,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/core/hub.c linux-2.6.32.24/drivers/usb/co MODULE_DEVICE_TABLE (usb, hub_id_table); diff -urNp linux-2.6.32.24/drivers/usb/core/message.c linux-2.6.32.24/drivers/usb/core/message.c --- linux-2.6.32.24/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/core/message.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/core/message.c 2010-10-23 19:59:20.000000000 -0400 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -29198,7 +29393,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/core/message.c linux-2.6.32.24/drivers/us memcpy(smallbuf, buf, len); diff -urNp linux-2.6.32.24/drivers/usb/host/ehci-pci.c linux-2.6.32.24/drivers/usb/host/ehci-pci.c --- linux-2.6.32.24/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/host/ehci-pci.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/host/ehci-pci.c 2010-10-23 19:59:20.000000000 -0400 @@ -422,7 +422,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, @@ -29210,7 +29405,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/host/ehci-pci.c linux-2.6.32.24/drivers/u diff -urNp linux-2.6.32.24/drivers/usb/host/uhci-hcd.c linux-2.6.32.24/drivers/usb/host/uhci-hcd.c --- linux-2.6.32.24/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/host/uhci-hcd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/host/uhci-hcd.c 2010-10-23 19:59:20.000000000 -0400 @@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -29222,7 +29417,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/host/uhci-hcd.c linux-2.6.32.24/drivers/u MODULE_DEVICE_TABLE(pci, uhci_pci_ids); diff -urNp linux-2.6.32.24/drivers/usb/misc/appledisplay.c linux-2.6.32.24/drivers/usb/misc/appledisplay.c --- linux-2.6.32.24/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/misc/appledisplay.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/misc/appledisplay.c 2010-10-23 19:59:20.000000000 -0400 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -29234,7 +29429,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/misc/appledisplay.c linux-2.6.32.24/drive }; diff -urNp linux-2.6.32.24/drivers/usb/mon/mon_main.c linux-2.6.32.24/drivers/usb/mon/mon_main.c --- linux-2.6.32.24/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/mon/mon_main.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/mon/mon_main.c 2010-10-23 19:59:20.000000000 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -29246,7 +29441,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/mon/mon_main.c linux-2.6.32.24/drivers/us .urb_complete = mon_complete, diff -urNp linux-2.6.32.24/drivers/usb/storage/debug.h linux-2.6.32.24/drivers/usb/storage/debug.h --- linux-2.6.32.24/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/storage/debug.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/storage/debug.h 2010-10-23 19:59:20.000000000 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -29262,7 +29457,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/storage/debug.h linux-2.6.32.24/drivers/u #endif diff -urNp linux-2.6.32.24/drivers/usb/storage/usb.c linux-2.6.32.24/drivers/usb/storage/usb.c --- linux-2.6.32.24/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/storage/usb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/storage/usb.c 2010-10-23 19:59:20.000000000 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -29274,7 +29469,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/storage/usb.c linux-2.6.32.24/drivers/usb #undef UNUSUAL_DEV diff -urNp linux-2.6.32.24/drivers/usb/storage/usual-tables.c linux-2.6.32.24/drivers/usb/storage/usual-tables.c --- linux-2.6.32.24/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/usb/storage/usual-tables.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/usb/storage/usual-tables.c 2010-10-23 19:59:20.000000000 -0400 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -29286,7 +29481,7 @@ diff -urNp linux-2.6.32.24/drivers/usb/storage/usual-tables.c linux-2.6.32.24/dr diff -urNp linux-2.6.32.24/drivers/uwb/wlp/messages.c linux-2.6.32.24/drivers/uwb/wlp/messages.c --- linux-2.6.32.24/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/uwb/wlp/messages.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/uwb/wlp/messages.c 2010-10-23 19:59:20.000000000 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -29298,7 +29493,7 @@ diff -urNp linux-2.6.32.24/drivers/uwb/wlp/messages.c linux-2.6.32.24/drivers/uw char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; diff -urNp linux-2.6.32.24/drivers/uwb/wlp/sysfs.c linux-2.6.32.24/drivers/uwb/wlp/sysfs.c --- linux-2.6.32.24/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/uwb/wlp/sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/uwb/wlp/sysfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -29311,7 +29506,7 @@ diff -urNp linux-2.6.32.24/drivers/uwb/wlp/sysfs.c linux-2.6.32.24/drivers/uwb/w }; diff -urNp linux-2.6.32.24/drivers/video/atmel_lcdfb.c linux-2.6.32.24/drivers/video/atmel_lcdfb.c --- linux-2.6.32.24/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/atmel_lcdfb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/atmel_lcdfb.c 2010-10-23 19:59:20.000000000 -0400 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -29323,7 +29518,7 @@ diff -urNp linux-2.6.32.24/drivers/video/atmel_lcdfb.c linux-2.6.32.24/drivers/v }; diff -urNp linux-2.6.32.24/drivers/video/aty/aty128fb.c linux-2.6.32.24/drivers/video/aty/aty128fb.c --- linux-2.6.32.24/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/aty/aty128fb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/aty/aty128fb.c 2010-10-23 19:59:20.000000000 -0400 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -29335,7 +29530,7 @@ diff -urNp linux-2.6.32.24/drivers/video/aty/aty128fb.c linux-2.6.32.24/drivers/ }; diff -urNp linux-2.6.32.24/drivers/video/aty/atyfb_base.c linux-2.6.32.24/drivers/video/aty/atyfb_base.c --- linux-2.6.32.24/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/aty/atyfb_base.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/aty/atyfb_base.c 2010-10-23 19:59:20.000000000 -0400 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -29347,7 +29542,7 @@ diff -urNp linux-2.6.32.24/drivers/video/aty/atyfb_base.c linux-2.6.32.24/driver }; diff -urNp linux-2.6.32.24/drivers/video/aty/radeon_backlight.c linux-2.6.32.24/drivers/video/aty/radeon_backlight.c --- linux-2.6.32.24/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/aty/radeon_backlight.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/aty/radeon_backlight.c 2010-10-23 19:59:20.000000000 -0400 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -29359,7 +29554,7 @@ diff -urNp linux-2.6.32.24/drivers/video/aty/radeon_backlight.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c --- linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -29371,7 +29566,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/drivers/video/backlight/adx_bl.c linux-2.6.32.24/drivers/video/backlight/adx_bl.c --- linux-2.6.32.24/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/adx_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/adx_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -29383,7 +29578,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/adx_bl.c linux-2.6.32.24/driv .get_brightness = adx_backlight_get_brightness, diff -urNp linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c --- linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -29395,7 +29590,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2 }; diff -urNp linux-2.6.32.24/drivers/video/backlight/backlight.c linux-2.6.32.24/drivers/video/backlight/backlight.c --- linux-2.6.32.24/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/backlight.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/backlight.c 2010-10-23 19:59:20.000000000 -0400 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -29407,7 +29602,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/backlight.c linux-2.6.32.24/d int rc; diff -urNp linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c --- linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c 2010-10-23 19:59:20.000000000 -0400 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -29419,7 +29614,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c --- linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c 2010-10-23 19:59:20.000000000 -0400 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -29431,7 +29626,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/video/backlight/da903x_bl.c linux-2.6.32.24/drivers/video/backlight/da903x_bl.c --- linux-2.6.32.24/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/da903x_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/da903x_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -29443,7 +29638,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/da903x_bl.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/video/backlight/generic_bl.c linux-2.6.32.24/drivers/video/backlight/generic_bl.c --- linux-2.6.32.24/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/generic_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/generic_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -29455,7 +29650,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/generic_bl.c linux-2.6.32.24/ .update_status = genericbl_send_intensity, diff -urNp linux-2.6.32.24/drivers/video/backlight/hp680_bl.c linux-2.6.32.24/drivers/video/backlight/hp680_bl.c --- linux-2.6.32.24/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/hp680_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/hp680_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -29467,7 +29662,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/hp680_bl.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c --- linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -93,7 +93,7 @@ out: return ret; } @@ -29479,7 +29674,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c linux-2.6.32. .options = BL_CORE_SUSPENDRESUME, diff -urNp linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c --- linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -29491,7 +29686,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/video/backlight/locomolcd.c linux-2.6.32.24/drivers/video/backlight/locomolcd.c --- linux-2.6.32.24/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/locomolcd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/locomolcd.c 2010-10-23 19:59:20.000000000 -0400 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -29503,7 +29698,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/locomolcd.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c --- linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -29515,7 +29710,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. /* Module parameters. */ diff -urNp linux-2.6.32.24/drivers/video/backlight/omap1_bl.c linux-2.6.32.24/drivers/video/backlight/omap1_bl.c --- linux-2.6.32.24/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/omap1_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/omap1_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -29527,7 +29722,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/omap1_bl.c linux-2.6.32.24/dr }; diff -urNp linux-2.6.32.24/drivers/video/backlight/progear_bl.c linux-2.6.32.24/drivers/video/backlight/progear_bl.c --- linux-2.6.32.24/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/progear_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/progear_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -29539,7 +29734,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/progear_bl.c linux-2.6.32.24/ }; diff -urNp linux-2.6.32.24/drivers/video/backlight/pwm_bl.c linux-2.6.32.24/drivers/video/backlight/pwm_bl.c --- linux-2.6.32.24/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/pwm_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/pwm_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -29551,7 +29746,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/pwm_bl.c linux-2.6.32.24/driv }; diff -urNp linux-2.6.32.24/drivers/video/backlight/tosa_bl.c linux-2.6.32.24/drivers/video/backlight/tosa_bl.c --- linux-2.6.32.24/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/tosa_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/tosa_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -29563,7 +29758,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/tosa_bl.c linux-2.6.32.24/dri }; diff -urNp linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c --- linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c 2010-10-23 19:59:20.000000000 -0400 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -29575,7 +29770,7 @@ diff -urNp linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c linux-2.6.32.24/d .get_brightness = wm831x_backlight_get_brightness, diff -urNp linux-2.6.32.24/drivers/video/bf54x-lq043fb.c linux-2.6.32.24/drivers/video/bf54x-lq043fb.c --- linux-2.6.32.24/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/bf54x-lq043fb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/bf54x-lq043fb.c 2010-10-23 19:59:20.000000000 -0400 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -29587,7 +29782,7 @@ diff -urNp linux-2.6.32.24/drivers/video/bf54x-lq043fb.c linux-2.6.32.24/drivers diff -urNp linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c --- linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c 2010-10-23 19:59:20.000000000 -0400 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -29599,7 +29794,7 @@ diff -urNp linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.24/driv diff -urNp linux-2.6.32.24/drivers/video/fbcmap.c linux-2.6.32.24/drivers/video/fbcmap.c --- linux-2.6.32.24/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/fbcmap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/fbcmap.c 2010-10-23 19:59:20.000000000 -0400 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -29612,7 +29807,7 @@ diff -urNp linux-2.6.32.24/drivers/video/fbcmap.c linux-2.6.32.24/drivers/video/ } diff -urNp linux-2.6.32.24/drivers/video/fbmem.c linux-2.6.32.24/drivers/video/fbmem.c --- linux-2.6.32.24/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/fbmem.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/fbmem.c 2010-10-23 19:59:20.000000000 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -29642,7 +29837,7 @@ diff -urNp linux-2.6.32.24/drivers/video/fbmem.c linux-2.6.32.24/drivers/video/f request_module("fb%d", con2fb.framebuffer); diff -urNp linux-2.6.32.24/drivers/video/fbmon.c linux-2.6.32.24/drivers/video/fbmon.c --- linux-2.6.32.24/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/fbmon.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/fbmon.c 2010-10-23 19:59:20.000000000 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -29654,7 +29849,7 @@ diff -urNp linux-2.6.32.24/drivers/video/fbmon.c linux-2.6.32.24/drivers/video/f #define FBMON_FIX_HEADER 1 diff -urNp linux-2.6.32.24/drivers/video/i810/i810_accel.c linux-2.6.32.24/drivers/video/i810/i810_accel.c --- linux-2.6.32.24/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/i810/i810_accel.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/i810/i810_accel.c 2010-10-23 19:59:20.000000000 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -29665,7 +29860,7 @@ diff -urNp linux-2.6.32.24/drivers/video/i810/i810_accel.c linux-2.6.32.24/drive info->pixmap.scan_align = 1; diff -urNp linux-2.6.32.24/drivers/video/i810/i810_main.c linux-2.6.32.24/drivers/video/i810/i810_main.c --- linux-2.6.32.24/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/i810/i810_main.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/i810/i810_main.c 2010-10-23 19:59:20.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, @@ -29677,7 +29872,7 @@ diff -urNp linux-2.6.32.24/drivers/video/i810/i810_main.c linux-2.6.32.24/driver static struct pci_driver i810fb_driver = { diff -urNp linux-2.6.32.24/drivers/video/modedb.c linux-2.6.32.24/drivers/video/modedb.c --- linux-2.6.32.24/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/modedb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/modedb.c 2010-10-23 19:59:20.000000000 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -29980,7 +30175,7 @@ diff -urNp linux-2.6.32.24/drivers/video/modedb.c linux-2.6.32.24/drivers/video/ diff -urNp linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c --- linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c 2010-10-23 19:59:20.000000000 -0400 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -29992,7 +30187,7 @@ diff -urNp linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c linux-2.6.32.24/d }; diff -urNp linux-2.6.32.24/drivers/video/riva/fbdev.c linux-2.6.32.24/drivers/video/riva/fbdev.c --- linux-2.6.32.24/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/riva/fbdev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/riva/fbdev.c 2010-10-23 19:59:20.000000000 -0400 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -30004,7 +30199,7 @@ diff -urNp linux-2.6.32.24/drivers/video/riva/fbdev.c linux-2.6.32.24/drivers/vi }; diff -urNp linux-2.6.32.24/drivers/video/uvesafb.c linux-2.6.32.24/drivers/video/uvesafb.c --- linux-2.6.32.24/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/uvesafb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/uvesafb.c 2010-10-23 19:59:20.000000000 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -30082,7 +30277,7 @@ diff -urNp linux-2.6.32.24/drivers/video/uvesafb.c linux-2.6.32.24/drivers/video framebuffer_release(info); diff -urNp linux-2.6.32.24/drivers/video/vesafb.c linux-2.6.32.24/drivers/video/vesafb.c --- linux-2.6.32.24/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/video/vesafb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/video/vesafb.c 2010-10-23 19:59:20.000000000 -0400 @@ -9,6 +9,7 @@ */ @@ -30188,7 +30383,7 @@ diff -urNp linux-2.6.32.24/drivers/video/vesafb.c linux-2.6.32.24/drivers/video/ framebuffer_release(info); diff -urNp linux-2.6.32.24/drivers/xen/sys-hypervisor.c linux-2.6.32.24/drivers/xen/sys-hypervisor.c --- linux-2.6.32.24/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/drivers/xen/sys-hypervisor.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/drivers/xen/sys-hypervisor.c 2010-10-23 19:59:20.000000000 -0400 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -30200,7 +30395,7 @@ diff -urNp linux-2.6.32.24/drivers/xen/sys-hypervisor.c linux-2.6.32.24/drivers/ }; diff -urNp linux-2.6.32.24/fs/9p/vfs_inode.c linux-2.6.32.24/fs/9p/vfs_inode.c --- linux-2.6.32.24/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/9p/vfs_inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/9p/vfs_inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -30212,7 +30407,7 @@ diff -urNp linux-2.6.32.24/fs/9p/vfs_inode.c linux-2.6.32.24/fs/9p/vfs_inode.c IS_ERR(s) ? "<error>" : s); diff -urNp linux-2.6.32.24/fs/aio.c linux-2.6.32.24/fs/aio.c --- linux-2.6.32.24/fs/aio.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/fs/aio.c 2010-09-20 17:25:35.000000000 -0400 ++++ linux-2.6.32.24/fs/aio.c 2010-10-23 19:59:20.000000000 -0400 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -30224,7 +30419,7 @@ diff -urNp linux-2.6.32.24/fs/aio.c linux-2.6.32.24/fs/aio.c nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); diff -urNp linux-2.6.32.24/fs/attr.c linux-2.6.32.24/fs/attr.c --- linux-2.6.32.24/fs/attr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/attr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/attr.c 2010-10-23 19:59:20.000000000 -0400 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -30235,7 +30430,7 @@ diff -urNp linux-2.6.32.24/fs/attr.c linux-2.6.32.24/fs/attr.c if (offset > inode->i_sb->s_maxbytes) diff -urNp linux-2.6.32.24/fs/autofs/root.c linux-2.6.32.24/fs/autofs/root.c --- linux-2.6.32.24/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/autofs/root.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/autofs/root.c 2010-10-23 19:59:20.000000000 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -30248,7 +30443,7 @@ diff -urNp linux-2.6.32.24/fs/autofs/root.c linux-2.6.32.24/fs/autofs/root.c unlock_kernel(); diff -urNp linux-2.6.32.24/fs/autofs4/symlink.c linux-2.6.32.24/fs/autofs4/symlink.c --- linux-2.6.32.24/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/autofs4/symlink.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/autofs4/symlink.c 2010-10-23 19:59:20.000000000 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -30260,7 +30455,7 @@ diff -urNp linux-2.6.32.24/fs/autofs4/symlink.c linux-2.6.32.24/fs/autofs4/symli diff -urNp linux-2.6.32.24/fs/befs/linuxvfs.c linux-2.6.32.24/fs/befs/linuxvfs.c --- linux-2.6.32.24/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/befs/linuxvfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/befs/linuxvfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -30272,7 +30467,7 @@ diff -urNp linux-2.6.32.24/fs/befs/linuxvfs.c linux-2.6.32.24/fs/befs/linuxvfs.c } diff -urNp linux-2.6.32.24/fs/binfmt_aout.c linux-2.6.32.24/fs/binfmt_aout.c --- linux-2.6.32.24/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/binfmt_aout.c 2010-09-23 20:12:17.000000000 -0400 ++++ linux-2.6.32.24/fs/binfmt_aout.c 2010-10-23 19:59:20.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -30362,7 +30557,7 @@ diff -urNp linux-2.6.32.24/fs/binfmt_aout.c linux-2.6.32.24/fs/binfmt_aout.c up_write(¤t->mm->mmap_sem); diff -urNp linux-2.6.32.24/fs/binfmt_elf.c linux-2.6.32.24/fs/binfmt_elf.c --- linux-2.6.32.24/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/binfmt_elf.c 2010-10-23 19:59:20.000000000 -0400 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -31000,7 +31195,7 @@ diff -urNp linux-2.6.32.24/fs/binfmt_elf.c linux-2.6.32.24/fs/binfmt_elf.c return register_binfmt(&elf_format); diff -urNp linux-2.6.32.24/fs/binfmt_flat.c linux-2.6.32.24/fs/binfmt_flat.c --- linux-2.6.32.24/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/binfmt_flat.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/binfmt_flat.c 2010-10-23 19:59:20.000000000 -0400 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -31035,7 +31230,7 @@ diff -urNp linux-2.6.32.24/fs/binfmt_flat.c linux-2.6.32.24/fs/binfmt_flat.c } diff -urNp linux-2.6.32.24/fs/binfmt_misc.c linux-2.6.32.24/fs/binfmt_misc.c --- linux-2.6.32.24/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/fs/binfmt_misc.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/fs/binfmt_misc.c 2010-10-23 19:59:20.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}, @@ -31047,7 +31242,7 @@ diff -urNp linux-2.6.32.24/fs/binfmt_misc.c linux-2.6.32.24/fs/binfmt_misc.c if (!err) diff -urNp linux-2.6.32.24/fs/bio.c linux-2.6.32.24/fs/bio.c --- linux-2.6.32.24/fs/bio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/bio.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/bio.c 2010-10-23 19:59:20.000000000 -0400 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -31068,7 +31263,7 @@ diff -urNp linux-2.6.32.24/fs/bio.c linux-2.6.32.24/fs/bio.c char *addr = page_address(bvec->bv_page); diff -urNp linux-2.6.32.24/fs/block_dev.c linux-2.6.32.24/fs/block_dev.c --- linux-2.6.32.24/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/block_dev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/block_dev.c 2010-10-23 19:59:20.000000000 -0400 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, else if (bdev->bd_contains == bdev) res = 0; /* is a whole device which isn't held */ @@ -31080,8 +31275,24 @@ diff -urNp linux-2.6.32.24/fs/block_dev.c linux-2.6.32.24/fs/block_dev.c res = -EBUSY; /* is a partition of a held device */ diff -urNp linux-2.6.32.24/fs/btrfs/ctree.c linux-2.6.32.24/fs/btrfs/ctree.c --- linux-2.6.32.24/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/ctree.c 2010-09-04 15:54:52.000000000 -0400 -@@ -3645,7 +3645,6 @@ setup_items_for_insert(struct btrfs_tran ++++ linux-2.6.32.24/fs/btrfs/ctree.c 2010-10-23 19:59:24.000000000 -0400 +@@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st + free_extent_buffer(buf); + add_root_to_dirty_list(root); + } else { +- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) +- parent_start = parent->start; +- else ++ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) { ++ if (parent) ++ parent_start = parent->start; ++ else ++ parent_start = 0; ++ } else + parent_start = 0; + + WARN_ON(trans->transid != btrfs_header_generation(parent)); +@@ -3645,7 +3648,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; if (slot == 0) { @@ -31091,7 +31302,7 @@ diff -urNp linux-2.6.32.24/fs/btrfs/ctree.c linux-2.6.32.24/fs/btrfs/ctree.c } diff -urNp linux-2.6.32.24/fs/btrfs/disk-io.c linux-2.6.32.24/fs/btrfs/disk-io.c --- linux-2.6.32.24/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/disk-io.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/disk-io.c 2010-10-23 19:59:20.000000000 -0400 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -31112,7 +31323,7 @@ diff -urNp linux-2.6.32.24/fs/btrfs/disk-io.c linux-2.6.32.24/fs/btrfs/disk-io.c .submit_bio_hook = btree_submit_bio_hook, diff -urNp linux-2.6.32.24/fs/btrfs/extent_io.h linux-2.6.32.24/fs/btrfs/extent_io.h --- linux-2.6.32.24/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/extent_io.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/extent_io.h 2010-10-23 19:59:20.000000000 -0400 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -31175,7 +31386,7 @@ diff -urNp linux-2.6.32.24/fs/btrfs/extent_io.h linux-2.6.32.24/fs/btrfs/extent_ struct extent_state { diff -urNp linux-2.6.32.24/fs/btrfs/free-space-cache.c linux-2.6.32.24/fs/btrfs/free-space-cache.c --- linux-2.6.32.24/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/free-space-cache.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/free-space-cache.c 2010-10-23 19:59:20.000000000 -0400 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -31196,7 +31407,7 @@ diff -urNp linux-2.6.32.24/fs/btrfs/free-space-cache.c linux-2.6.32.24/fs/btrfs/ ret = btrfs_bitmap_cluster(block_group, entry, cluster, diff -urNp linux-2.6.32.24/fs/btrfs/inode.c linux-2.6.32.24/fs/btrfs/inode.c --- linux-2.6.32.24/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -63,7 +63,7 @@ static const struct inode_operations btr static const struct address_space_operations btrfs_aops; static const struct address_space_operations btrfs_symlink_aops; @@ -31215,9 +31426,21 @@ diff -urNp linux-2.6.32.24/fs/btrfs/inode.c linux-2.6.32.24/fs/btrfs/inode.c .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook, +diff -urNp linux-2.6.32.24/fs/btrfs/relocation.c linux-2.6.32.24/fs/btrfs/relocation.c +--- linux-2.6.32.24/fs/btrfs/relocation.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/relocation.c 2010-10-23 19:59:24.000000000 -0400 +@@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt + } + spin_unlock(&rc->reloc_root_tree.lock); + +- BUG_ON((struct btrfs_root *)node->data != root); ++ BUG_ON(!node || (struct btrfs_root *)node->data != root); + + if (!del) { + spin_lock(&rc->reloc_root_tree.lock); diff -urNp linux-2.6.32.24/fs/btrfs/sysfs.c linux-2.6.32.24/fs/btrfs/sysfs.c --- linux-2.6.32.24/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/btrfs/sysfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/btrfs/sysfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -31235,7 +31458,7 @@ diff -urNp linux-2.6.32.24/fs/btrfs/sysfs.c linux-2.6.32.24/fs/btrfs/sysfs.c }; diff -urNp linux-2.6.32.24/fs/buffer.c linux-2.6.32.24/fs/buffer.c --- linux-2.6.32.24/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/buffer.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/buffer.c 2010-10-23 19:59:20.000000000 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -31246,7 +31469,7 @@ diff -urNp linux-2.6.32.24/fs/buffer.c linux-2.6.32.24/fs/buffer.c #include <linux/quotaops.h> diff -urNp linux-2.6.32.24/fs/cachefiles/bind.c linux-2.6.32.24/fs/cachefiles/bind.c --- linux-2.6.32.24/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/cachefiles/bind.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/cachefiles/bind.c 2010-10-23 19:59:20.000000000 -0400 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -31265,7 +31488,7 @@ diff -urNp linux-2.6.32.24/fs/cachefiles/bind.c linux-2.6.32.24/fs/cachefiles/bi diff -urNp linux-2.6.32.24/fs/cachefiles/daemon.c linux-2.6.32.24/fs/cachefiles/daemon.c --- linux-2.6.32.24/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/cachefiles/daemon.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/cachefiles/daemon.c 2010-10-23 19:59:20.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -31295,7 +31518,7 @@ diff -urNp linux-2.6.32.24/fs/cachefiles/daemon.c linux-2.6.32.24/fs/cachefiles/ cache->bstop_percent = bstop; diff -urNp linux-2.6.32.24/fs/cachefiles/rdwr.c linux-2.6.32.24/fs/cachefiles/rdwr.c --- linux-2.6.32.24/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/cachefiles/rdwr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/cachefiles/rdwr.c 2010-10-23 19:59:20.000000000 -0400 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -31307,7 +31530,7 @@ diff -urNp linux-2.6.32.24/fs/cachefiles/rdwr.c linux-2.6.32.24/fs/cachefiles/rd if (ret != len) diff -urNp linux-2.6.32.24/fs/cifs/cifs_uniupr.h linux-2.6.32.24/fs/cifs/cifs_uniupr.h --- linux-2.6.32.24/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/cifs/cifs_uniupr.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/cifs/cifs_uniupr.h 2010-10-23 19:59:20.000000000 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -31319,7 +31542,7 @@ diff -urNp linux-2.6.32.24/fs/cifs/cifs_uniupr.h linux-2.6.32.24/fs/cifs/cifs_un diff -urNp linux-2.6.32.24/fs/cifs/link.c linux-2.6.32.24/fs/cifs/link.c --- linux-2.6.32.24/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/cifs/link.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/cifs/link.c 2010-10-23 19:59:20.000000000 -0400 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -31331,7 +31554,7 @@ diff -urNp linux-2.6.32.24/fs/cifs/link.c linux-2.6.32.24/fs/cifs/link.c } diff -urNp linux-2.6.32.24/fs/compat_binfmt_elf.c linux-2.6.32.24/fs/compat_binfmt_elf.c --- linux-2.6.32.24/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/compat_binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/compat_binfmt_elf.c 2010-10-23 19:59:20.000000000 -0400 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -31347,7 +31570,7 @@ diff -urNp linux-2.6.32.24/fs/compat_binfmt_elf.c linux-2.6.32.24/fs/compat_binf /* diff -urNp linux-2.6.32.24/fs/compat.c linux-2.6.32.24/fs/compat.c --- linux-2.6.32.24/fs/compat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/compat.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/compat.c 2010-10-23 19:59:20.000000000 -0400 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -31449,8 +31672,17 @@ diff -urNp linux-2.6.32.24/fs/compat.c linux-2.6.32.24/fs/compat.c mmput(bprm->mm); diff -urNp linux-2.6.32.24/fs/compat_ioctl.c linux-2.6.32.24/fs/compat_ioctl.c --- linux-2.6.32.24/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/compat_ioctl.c 2010-09-04 15:54:52.000000000 -0400 -@@ -1827,15 +1827,15 @@ struct ioctl_trans { ++++ linux-2.6.32.24/fs/compat_ioctl.c 2010-10-23 19:59:24.000000000 -0400 +@@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi + up = (struct compat_video_spu_palette __user *) arg; + err = get_user(palp, &up->palette); + err |= get_user(length, &up->length); ++ if (err) ++ return -EFAULT; + + up_native = compat_alloc_user_space(sizeof(struct video_spu_palette)); + err = put_user(compat_ptr(palp), &up_native->palette); +@@ -1827,15 +1829,15 @@ struct ioctl_trans { }; #define HANDLE_IOCTL(cmd,handler) \ @@ -31471,7 +31703,7 @@ diff -urNp linux-2.6.32.24/fs/compat_ioctl.c linux-2.6.32.24/fs/compat_ioctl.c Valid reasons to use this: diff -urNp linux-2.6.32.24/fs/debugfs/inode.c linux-2.6.32.24/fs/debugfs/inode.c --- linux-2.6.32.24/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/debugfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/debugfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -31483,7 +31715,7 @@ diff -urNp linux-2.6.32.24/fs/debugfs/inode.c linux-2.6.32.24/fs/debugfs/inode.c } diff -urNp linux-2.6.32.24/fs/dlm/lockspace.c linux-2.6.32.24/fs/dlm/lockspace.c --- linux-2.6.32.24/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/dlm/lockspace.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/dlm/lockspace.c 2010-10-23 19:59:20.000000000 -0400 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -31495,7 +31727,7 @@ diff -urNp linux-2.6.32.24/fs/dlm/lockspace.c linux-2.6.32.24/fs/dlm/lockspace.c }; diff -urNp linux-2.6.32.24/fs/ecryptfs/inode.c linux-2.6.32.24/fs/ecryptfs/inode.c --- linux-2.6.32.24/fs/ecryptfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ecryptfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ecryptfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -656,7 +656,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -31516,7 +31748,7 @@ diff -urNp linux-2.6.32.24/fs/ecryptfs/inode.c linux-2.6.32.24/fs/ecryptfs/inode goto out_free; diff -urNp linux-2.6.32.24/fs/exec.c linux-2.6.32.24/fs/exec.c --- linux-2.6.32.24/fs/exec.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/exec.c 2010-09-28 18:47:47.000000000 -0400 ++++ linux-2.6.32.24/fs/exec.c 2010-10-23 19:59:20.000000000 -0400 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -32068,7 +32300,7 @@ diff -urNp linux-2.6.32.24/fs/exec.c linux-2.6.32.24/fs/exec.c * uses lock_kernel() diff -urNp linux-2.6.32.24/fs/ext2/balloc.c linux-2.6.32.24/fs/ext2/balloc.c --- linux-2.6.32.24/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext2/balloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext2/balloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -32080,7 +32312,7 @@ diff -urNp linux-2.6.32.24/fs/ext2/balloc.c linux-2.6.32.24/fs/ext2/balloc.c return 0; diff -urNp linux-2.6.32.24/fs/ext2/xattr.c linux-2.6.32.24/fs/ext2/xattr.c --- linux-2.6.32.24/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext2/xattr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext2/xattr.c 2010-10-23 19:59:20.000000000 -0400 @@ -85,8 +85,8 @@ printk("\n"); \ } while (0) @@ -32094,7 +32326,7 @@ diff -urNp linux-2.6.32.24/fs/ext2/xattr.c linux-2.6.32.24/fs/ext2/xattr.c static int ext2_xattr_set2(struct inode *, struct buffer_head *, diff -urNp linux-2.6.32.24/fs/ext3/balloc.c linux-2.6.32.24/fs/ext3/balloc.c --- linux-2.6.32.24/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext3/balloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext3/balloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -32106,7 +32338,7 @@ diff -urNp linux-2.6.32.24/fs/ext3/balloc.c linux-2.6.32.24/fs/ext3/balloc.c return 0; diff -urNp linux-2.6.32.24/fs/ext3/namei.c linux-2.6.32.24/fs/ext3/namei.c --- linux-2.6.32.24/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext3/namei.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext3/namei.c 2010-10-23 19:59:20.000000000 -0400 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -32118,7 +32350,7 @@ diff -urNp linux-2.6.32.24/fs/ext3/namei.c linux-2.6.32.24/fs/ext3/namei.c if (!(bh2)) { diff -urNp linux-2.6.32.24/fs/ext3/xattr.c linux-2.6.32.24/fs/ext3/xattr.c --- linux-2.6.32.24/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext3/xattr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext3/xattr.c 2010-10-23 19:59:20.000000000 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -32132,7 +32364,7 @@ diff -urNp linux-2.6.32.24/fs/ext3/xattr.c linux-2.6.32.24/fs/ext3/xattr.c static void ext3_xattr_cache_insert(struct buffer_head *); diff -urNp linux-2.6.32.24/fs/ext4/balloc.c linux-2.6.32.24/fs/ext4/balloc.c --- linux-2.6.32.24/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/fs/ext4/balloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext4/balloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -32144,7 +32376,7 @@ diff -urNp linux-2.6.32.24/fs/ext4/balloc.c linux-2.6.32.24/fs/ext4/balloc.c } diff -urNp linux-2.6.32.24/fs/ext4/namei.c linux-2.6.32.24/fs/ext4/namei.c --- linux-2.6.32.24/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext4/namei.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext4/namei.c 2010-10-23 19:59:20.000000000 -0400 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -32156,7 +32388,7 @@ diff -urNp linux-2.6.32.24/fs/ext4/namei.c linux-2.6.32.24/fs/ext4/namei.c if (!(bh2)) { diff -urNp linux-2.6.32.24/fs/ext4/super.c linux-2.6.32.24/fs/ext4/super.c --- linux-2.6.32.24/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext4/super.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext4/super.c 2010-10-23 19:59:20.000000000 -0400 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje } @@ -32168,7 +32400,7 @@ diff -urNp linux-2.6.32.24/fs/ext4/super.c linux-2.6.32.24/fs/ext4/super.c }; diff -urNp linux-2.6.32.24/fs/ext4/xattr.c linux-2.6.32.24/fs/ext4/xattr.c --- linux-2.6.32.24/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ext4/xattr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ext4/xattr.c 2010-10-23 19:59:20.000000000 -0400 @@ -82,8 +82,8 @@ printk("\n"); \ } while (0) @@ -32182,7 +32414,7 @@ diff -urNp linux-2.6.32.24/fs/ext4/xattr.c linux-2.6.32.24/fs/ext4/xattr.c static void ext4_xattr_cache_insert(struct buffer_head *); diff -urNp linux-2.6.32.24/fs/fcntl.c linux-2.6.32.24/fs/fcntl.c --- linux-2.6.32.24/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fcntl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fcntl.c 2010-10-23 19:59:20.000000000 -0400 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -32205,7 +32437,7 @@ diff -urNp linux-2.6.32.24/fs/fcntl.c linux-2.6.32.24/fs/fcntl.c err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); diff -urNp linux-2.6.32.24/fs/fifo.c linux-2.6.32.24/fs/fifo.c --- linux-2.6.32.24/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fifo.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fifo.c 2010-10-23 19:59:20.000000000 -0400 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -32278,7 +32510,7 @@ diff -urNp linux-2.6.32.24/fs/fifo.c linux-2.6.32.24/fs/fifo.c err_nocleanup: diff -urNp linux-2.6.32.24/fs/file.c linux-2.6.32.24/fs/file.c --- linux-2.6.32.24/fs/file.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/file.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/file.c 2010-10-23 19:59:20.000000000 -0400 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -32298,7 +32530,7 @@ diff -urNp linux-2.6.32.24/fs/file.c linux-2.6.32.24/fs/file.c diff -urNp linux-2.6.32.24/fs/fs_struct.c linux-2.6.32.24/fs/fs_struct.c --- linux-2.6.32.24/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fs_struct.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fs_struct.c 2010-10-23 19:59:20.000000000 -0400 @@ -4,6 +4,7 @@ #include <linux/path.h> #include <linux/slab.h> @@ -32380,7 +32612,7 @@ diff -urNp linux-2.6.32.24/fs/fs_struct.c linux-2.6.32.24/fs/fs_struct.c task_unlock(current); diff -urNp linux-2.6.32.24/fs/fuse/control.c linux-2.6.32.24/fs/fuse/control.c --- linux-2.6.32.24/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fuse/control.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fuse/control.c 2010-10-23 19:59:20.000000000 -0400 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -32392,7 +32624,7 @@ diff -urNp linux-2.6.32.24/fs/fuse/control.c linux-2.6.32.24/fs/fuse/control.c diff -urNp linux-2.6.32.24/fs/fuse/cuse.c linux-2.6.32.24/fs/fuse/cuse.c --- linux-2.6.32.24/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fuse/cuse.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fuse/cuse.c 2010-10-23 19:59:20.000000000 -0400 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -32429,7 +32661,7 @@ diff -urNp linux-2.6.32.24/fs/fuse/cuse.c linux-2.6.32.24/fs/fuse/cuse.c return PTR_ERR(cuse_class); diff -urNp linux-2.6.32.24/fs/fuse/dev.c linux-2.6.32.24/fs/fuse/dev.c --- linux-2.6.32.24/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/fs/fuse/dev.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/fs/fuse/dev.c 2010-10-23 19:59:20.000000000 -0400 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -32537,7 +32769,7 @@ diff -urNp linux-2.6.32.24/fs/fuse/dev.c linux-2.6.32.24/fs/fuse/dev.c .owner = THIS_MODULE, diff -urNp linux-2.6.32.24/fs/fuse/dir.c linux-2.6.32.24/fs/fuse/dir.c --- linux-2.6.32.24/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fuse/dir.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fuse/dir.c 2010-10-23 19:59:20.000000000 -0400 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -32549,7 +32781,7 @@ diff -urNp linux-2.6.32.24/fs/fuse/dir.c linux-2.6.32.24/fs/fuse/dir.c free_page((unsigned long) link); diff -urNp linux-2.6.32.24/fs/fuse/fuse_i.h linux-2.6.32.24/fs/fuse/fuse_i.h --- linux-2.6.32.24/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/fuse/fuse_i.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/fuse/fuse_i.h 2010-10-23 19:59:20.000000000 -0400 @@ -521,6 +521,16 @@ extern const struct file_operations fuse extern const struct dentry_operations fuse_dentry_operations; @@ -32569,7 +32801,7 @@ diff -urNp linux-2.6.32.24/fs/fuse/fuse_i.h linux-2.6.32.24/fs/fuse/fuse_i.h */ diff -urNp linux-2.6.32.24/fs/gfs2/sys.c linux-2.6.32.24/fs/gfs2/sys.c --- linux-2.6.32.24/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/gfs2/sys.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/gfs2/sys.c 2010-10-23 19:59:20.000000000 -0400 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -32590,7 +32822,7 @@ diff -urNp linux-2.6.32.24/fs/gfs2/sys.c linux-2.6.32.24/fs/gfs2/sys.c diff -urNp linux-2.6.32.24/fs/hfs/inode.c linux-2.6.32.24/fs/hfs/inode.c --- linux-2.6.32.24/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/hfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/hfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -32611,7 +32843,7 @@ diff -urNp linux-2.6.32.24/fs/hfs/inode.c linux-2.6.32.24/fs/hfs/inode.c if (rec.type != HFS_CDR_FIL || diff -urNp linux-2.6.32.24/fs/hfsplus/inode.c linux-2.6.32.24/fs/hfsplus/inode.c --- linux-2.6.32.24/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/hfsplus/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/hfsplus/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -32650,7 +32882,7 @@ diff -urNp linux-2.6.32.24/fs/hfsplus/inode.c linux-2.6.32.24/fs/hfsplus/inode.c hfsplus_inode_write_fork(inode, &file->data_fork); diff -urNp linux-2.6.32.24/fs/hugetlbfs/inode.c linux-2.6.32.24/fs/hugetlbfs/inode.c --- linux-2.6.32.24/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/hugetlbfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/hugetlbfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -32662,7 +32894,7 @@ diff -urNp linux-2.6.32.24/fs/hugetlbfs/inode.c linux-2.6.32.24/fs/hugetlbfs/ino { diff -urNp linux-2.6.32.24/fs/ioctl.c linux-2.6.32.24/fs/ioctl.c --- linux-2.6.32.24/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ioctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ioctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -32692,7 +32924,7 @@ diff -urNp linux-2.6.32.24/fs/ioctl.c linux-2.6.32.24/fs/ioctl.c return error; diff -urNp linux-2.6.32.24/fs/jffs2/debug.h linux-2.6.32.24/fs/jffs2/debug.h --- linux-2.6.32.24/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/jffs2/debug.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/jffs2/debug.h 2010-10-23 19:59:20.000000000 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -32796,7 +33028,7 @@ diff -urNp linux-2.6.32.24/fs/jffs2/debug.h linux-2.6.32.24/fs/jffs2/debug.h /* "Sanity" checks */ diff -urNp linux-2.6.32.24/fs/jffs2/erase.c linux-2.6.32.24/fs/jffs2/erase.c --- linux-2.6.32.24/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/jffs2/erase.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/jffs2/erase.c 2010-10-23 19:59:20.000000000 -0400 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -32809,7 +33041,7 @@ diff -urNp linux-2.6.32.24/fs/jffs2/erase.c linux-2.6.32.24/fs/jffs2/erase.c jffs2_prealloc_raw_node_refs(c, jeb, 1); diff -urNp linux-2.6.32.24/fs/jffs2/summary.h linux-2.6.32.24/fs/jffs2/summary.h --- linux-2.6.32.24/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/jffs2/summary.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/jffs2/summary.h 2010-10-23 19:59:20.000000000 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -32840,7 +33072,7 @@ diff -urNp linux-2.6.32.24/fs/jffs2/summary.h linux-2.6.32.24/fs/jffs2/summary.h #endif /* CONFIG_JFFS2_SUMMARY */ diff -urNp linux-2.6.32.24/fs/jffs2/wbuf.c linux-2.6.32.24/fs/jffs2/wbuf.c --- linux-2.6.32.24/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/jffs2/wbuf.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/jffs2/wbuf.c 2010-10-23 19:59:20.000000000 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -32853,7 +33085,7 @@ diff -urNp linux-2.6.32.24/fs/jffs2/wbuf.c linux-2.6.32.24/fs/jffs2/wbuf.c /* diff -urNp linux-2.6.32.24/fs/Kconfig.binfmt linux-2.6.32.24/fs/Kconfig.binfmt --- linux-2.6.32.24/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/Kconfig.binfmt 2010-09-23 20:14:19.000000000 -0400 ++++ linux-2.6.32.24/fs/Kconfig.binfmt 2010-10-23 19:59:20.000000000 -0400 @@ -86,7 +86,7 @@ config HAVE_AOUT config BINFMT_AOUT @@ -32865,7 +33097,7 @@ diff -urNp linux-2.6.32.24/fs/Kconfig.binfmt linux-2.6.32.24/fs/Kconfig.binfmt executables used in the earliest versions of UNIX. Linux used diff -urNp linux-2.6.32.24/fs/lockd/svc.c linux-2.6.32.24/fs/lockd/svc.c --- linux-2.6.32.24/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/lockd/svc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/lockd/svc.c 2010-10-23 19:59:20.000000000 -0400 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -32877,7 +33109,7 @@ diff -urNp linux-2.6.32.24/fs/lockd/svc.c linux-2.6.32.24/fs/lockd/svc.c static DEFINE_MUTEX(nlmsvc_mutex); diff -urNp linux-2.6.32.24/fs/locks.c linux-2.6.32.24/fs/locks.c --- linux-2.6.32.24/fs/locks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/locks.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/locks.c 2010-10-23 19:59:20.000000000 -0400 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -32901,7 +33133,7 @@ diff -urNp linux-2.6.32.24/fs/locks.c linux-2.6.32.24/fs/locks.c lock_kernel(); diff -urNp linux-2.6.32.24/fs/namei.c linux-2.6.32.24/fs/namei.c --- linux-2.6.32.24/fs/namei.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/namei.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/namei.c 2010-10-23 19:59:20.000000000 -0400 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -33230,7 +33462,7 @@ diff -urNp linux-2.6.32.24/fs/namei.c linux-2.6.32.24/fs/namei.c exit5: diff -urNp linux-2.6.32.24/fs/namespace.c linux-2.6.32.24/fs/namespace.c --- linux-2.6.32.24/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/namespace.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/namespace.c 2010-10-23 19:59:20.000000000 -0400 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); @@ -33293,7 +33525,7 @@ diff -urNp linux-2.6.32.24/fs/namespace.c linux-2.6.32.24/fs/namespace.c path_get(¤t->fs->root); diff -urNp linux-2.6.32.24/fs/nfs/inode.c linux-2.6.32.24/fs/nfs/inode.c --- linux-2.6.32.24/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/nfs/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/nfs/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -33316,7 +33548,7 @@ diff -urNp linux-2.6.32.24/fs/nfs/inode.c linux-2.6.32.24/fs/nfs/inode.c void nfs_fattr_init(struct nfs_fattr *fattr) diff -urNp linux-2.6.32.24/fs/nfs/nfs4proc.c linux-2.6.32.24/fs/nfs/nfs4proc.c --- linux-2.6.32.24/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/nfs/nfs4proc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/nfs/nfs4proc.c 2010-10-23 19:59:20.000000000 -0400 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -33589,7 +33821,7 @@ diff -urNp linux-2.6.32.24/fs/nfs/nfs4proc.c linux-2.6.32.24/fs/nfs/nfs4proc.c err = nfs4_set_lock_state(state, fl); diff -urNp linux-2.6.32.24/fs/nfsd/lockd.c linux-2.6.32.24/fs/nfsd/lockd.c --- linux-2.6.32.24/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/nfsd/lockd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/nfsd/lockd.c 2010-10-23 19:59:20.000000000 -0400 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -33601,7 +33833,7 @@ diff -urNp linux-2.6.32.24/fs/nfsd/lockd.c linux-2.6.32.24/fs/nfsd/lockd.c }; diff -urNp linux-2.6.32.24/fs/nfsd/vfs.c linux-2.6.32.24/fs/nfsd/vfs.c --- linux-2.6.32.24/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/nfsd/vfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/nfsd/vfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -33631,7 +33863,7 @@ diff -urNp linux-2.6.32.24/fs/nfsd/vfs.c linux-2.6.32.24/fs/nfsd/vfs.c if (host_err < 0) diff -urNp linux-2.6.32.24/fs/nls/nls_base.c linux-2.6.32.24/fs/nls/nls_base.c --- linux-2.6.32.24/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/nls/nls_base.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/nls/nls_base.c 2010-10-23 19:59:20.000000000 -0400 @@ -41,7 +41,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 */}, @@ -33641,9 +33873,21 @@ diff -urNp linux-2.6.32.24/fs/nls/nls_base.c linux-2.6.32.24/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff +diff -urNp linux-2.6.32.24/fs/ntfs/dir.c linux-2.6.32.24/fs/ntfs/dir.c +--- linux-2.6.32.24/fs/ntfs/dir.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/fs/ntfs/dir.c 2010-10-23 19:59:24.000000000 -0400 +@@ -1328,7 +1328,7 @@ find_next_index_buffer: + ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & + ~(s64)(ndir->itype.index.block_size - 1))); + /* Bounds checks. */ +- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) { ++ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) { + ntfs_error(sb, "Out of bounds check failed. Corrupt directory " + "inode 0x%lx or driver bug.", vdir->i_ino); + goto err_out; diff -urNp linux-2.6.32.24/fs/ntfs/file.c linux-2.6.32.24/fs/ntfs/file.c --- linux-2.6.32.24/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ntfs/file.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ntfs/file.c 2010-10-23 19:59:20.000000000 -0400 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -33655,7 +33899,7 @@ diff -urNp linux-2.6.32.24/fs/ntfs/file.c linux-2.6.32.24/fs/ntfs/file.c +const struct inode_operations ntfs_empty_inode_ops __read_only; diff -urNp linux-2.6.32.24/fs/ocfs2/cluster/masklog.c linux-2.6.32.24/fs/ocfs2/cluster/masklog.c --- linux-2.6.32.24/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ocfs2/cluster/masklog.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ocfs2/cluster/masklog.c 2010-10-23 19:59:20.000000000 -0400 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -33667,7 +33911,7 @@ diff -urNp linux-2.6.32.24/fs/ocfs2/cluster/masklog.c linux-2.6.32.24/fs/ocfs2/c }; diff -urNp linux-2.6.32.24/fs/ocfs2/localalloc.c linux-2.6.32.24/fs/ocfs2/localalloc.c --- linux-2.6.32.24/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ocfs2/localalloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ocfs2/localalloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -33679,7 +33923,7 @@ diff -urNp linux-2.6.32.24/fs/ocfs2/localalloc.c linux-2.6.32.24/fs/ocfs2/locala bail: diff -urNp linux-2.6.32.24/fs/ocfs2/ocfs2.h linux-2.6.32.24/fs/ocfs2/ocfs2.h --- linux-2.6.32.24/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ocfs2/ocfs2.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ocfs2/ocfs2.h 2010-10-23 19:59:20.000000000 -0400 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -33699,7 +33943,7 @@ diff -urNp linux-2.6.32.24/fs/ocfs2/ocfs2.h linux-2.6.32.24/fs/ocfs2/ocfs2.h enum ocfs2_local_alloc_state diff -urNp linux-2.6.32.24/fs/ocfs2/suballoc.c linux-2.6.32.24/fs/ocfs2/suballoc.c --- linux-2.6.32.24/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ocfs2/suballoc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ocfs2/suballoc.c 2010-10-23 19:59:20.000000000 -0400 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -33747,7 +33991,7 @@ diff -urNp linux-2.6.32.24/fs/ocfs2/suballoc.c linux-2.6.32.24/fs/ocfs2/suballoc if (status < 0) { diff -urNp linux-2.6.32.24/fs/ocfs2/super.c linux-2.6.32.24/fs/ocfs2/super.c --- linux-2.6.32.24/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/ocfs2/super.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/ocfs2/super.c 2010-10-23 19:59:20.000000000 -0400 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -33784,7 +34028,7 @@ diff -urNp linux-2.6.32.24/fs/ocfs2/super.c linux-2.6.32.24/fs/ocfs2/super.c osb->osb_ecc_stats = *stats; diff -urNp linux-2.6.32.24/fs/open.c linux-2.6.32.24/fs/open.c --- linux-2.6.32.24/fs/open.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/open.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/open.c 2010-10-23 19:59:20.000000000 -0400 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -33960,7 +34204,16 @@ diff -urNp linux-2.6.32.24/fs/open.c linux-2.6.32.24/fs/open.c fput(file); diff -urNp linux-2.6.32.24/fs/pipe.c linux-2.6.32.24/fs/pipe.c --- linux-2.6.32.24/fs/pipe.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/pipe.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/pipe.c 2010-10-23 19:59:24.000000000 -0400 +@@ -363,7 +363,7 @@ pipe_read(struct kiocb *iocb, const stru + error = ops->confirm(pipe, buf); + if (error) { + if (!ret) +- error = ret; ++ ret = error; + break; + } + @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -34086,7 +34339,7 @@ diff -urNp linux-2.6.32.24/fs/pipe.c linux-2.6.32.24/fs/pipe.c /* diff -urNp linux-2.6.32.24/fs/proc/array.c linux-2.6.32.24/fs/proc/array.c --- linux-2.6.32.24/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/array.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/array.c 2010-10-23 19:59:20.000000000 -0400 @@ -321,6 +321,21 @@ static inline void task_context_switch_c p->nivcsw); } @@ -34179,7 +34432,7 @@ diff -urNp linux-2.6.32.24/fs/proc/array.c linux-2.6.32.24/fs/proc/array.c +#endif diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c --- linux-2.6.32.24/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/base.c 2010-09-22 18:44:37.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/base.c 2010-10-23 19:59:20.000000000 -0400 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -34223,7 +34476,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c len = mm->arg_end - mm->arg_start; if (len > PAGE_SIZE) -@@ -287,12 +309,26 @@ out: +@@ -287,12 +309,28 @@ out: return res; } @@ -34241,7 +34494,9 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c unsigned int nwords = 0; + +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP -+ if (PAX_RAND_FLAGS(mm)) { ++ /* allow if we're currently ptracing this task */ ++ if (PAX_RAND_FLAGS(mm) && ++ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) { + mmput(mm); + return res; + } @@ -34250,7 +34505,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c do { nwords += 2; } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ -@@ -306,7 +342,7 @@ static int proc_pid_auxv(struct task_str +@@ -306,7 +344,7 @@ static int proc_pid_auxv(struct task_str } @@ -34259,7 +34514,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c /* * Provides a wchan file via kallsyms in a proper one-value-per-file format. * Returns the resolved symbol. If that fails, simply return the address. -@@ -328,7 +364,7 @@ static int proc_pid_wchan(struct task_st +@@ -328,7 +366,7 @@ static int proc_pid_wchan(struct task_st } #endif /* CONFIG_KALLSYMS */ @@ -34268,7 +34523,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c #define MAX_STACK_TRACE_DEPTH 64 -@@ -522,7 +558,7 @@ static int proc_pid_limits(struct task_s +@@ -522,7 +560,7 @@ static int proc_pid_limits(struct task_s return count; } @@ -34277,7 +34532,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c static int proc_pid_syscall(struct task_struct *task, char *buffer) { long nr; -@@ -936,6 +972,9 @@ static ssize_t environ_read(struct file +@@ -936,6 +974,9 @@ static ssize_t environ_read(struct file if (!task) goto out_no_task; @@ -34287,7 +34542,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1456,7 +1495,11 @@ static struct inode *proc_pid_make_inode +@@ -1456,7 +1497,11 @@ static struct inode *proc_pid_make_inode rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -34299,7 +34554,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1474,6 +1517,9 @@ static int pid_getattr(struct vfsmount * +@@ -1474,6 +1519,9 @@ static int pid_getattr(struct vfsmount * struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -34309,7 +34564,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1481,12 +1527,34 @@ static int pid_getattr(struct vfsmount * +@@ -1481,12 +1529,34 @@ static int pid_getattr(struct vfsmount * stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -34345,7 +34600,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c } } rcu_read_unlock(); -@@ -1518,11 +1586,20 @@ static int pid_revalidate(struct dentry +@@ -1518,11 +1588,20 @@ static int pid_revalidate(struct dentry if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -34366,7 +34621,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1643,7 +1720,8 @@ static int proc_fd_info(struct inode *in +@@ -1643,7 +1722,8 @@ static int proc_fd_info(struct inode *in int fd = proc_fd(inode); if (task) { @@ -34376,7 +34631,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1895,12 +1973,22 @@ static const struct file_operations proc +@@ -1895,12 +1975,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -34401,7 +34656,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c return rv; } -@@ -2009,6 +2097,9 @@ static struct dentry *proc_pident_lookup +@@ -2009,6 +2099,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -34411,7 +34666,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2053,6 +2144,9 @@ static int proc_pident_readdir(struct fi +@@ -2053,6 +2146,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -34421,7 +34676,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2320,7 +2414,7 @@ static void *proc_self_follow_link(struc +@@ -2320,7 +2416,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -34430,7 +34685,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2519,7 +2613,7 @@ static const struct pid_entry tgid_base_ +@@ -2519,7 +2615,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -34439,7 +34694,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2544,10 +2638,10 @@ static const struct pid_entry tgid_base_ +@@ -2544,10 +2640,10 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), #endif @@ -34452,7 +34707,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2577,6 +2671,9 @@ static const struct pid_entry tgid_base_ +@@ -2577,6 +2673,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -34462,7 +34717,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2701,7 +2798,14 @@ static struct dentry *proc_pid_instantia +@@ -2701,7 +2800,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -34477,7 +34732,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2743,7 +2847,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2743,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -34489,7 +34744,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2808,6 +2916,11 @@ int proc_pid_readdir(struct file * filp, +@@ -2808,6 +2918,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); @@ -34501,7 +34756,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2826,8 +2939,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2826,8 +2941,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -34530,7 +34785,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -2853,7 +2985,7 @@ static const struct pid_entry tid_base_s +@@ -2853,7 +2987,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -34539,7 +34794,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2877,10 +3009,10 @@ static const struct pid_entry tid_base_s +@@ -2877,10 +3011,10 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), #endif @@ -34554,7 +34809,7 @@ diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c #ifdef CONFIG_SCHEDSTATS diff -urNp linux-2.6.32.24/fs/proc/cmdline.c linux-2.6.32.24/fs/proc/cmdline.c --- linux-2.6.32.24/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/cmdline.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/cmdline.c 2010-10-23 19:59:20.000000000 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -34569,7 +34824,7 @@ diff -urNp linux-2.6.32.24/fs/proc/cmdline.c linux-2.6.32.24/fs/proc/cmdline.c module_init(proc_cmdline_init); diff -urNp linux-2.6.32.24/fs/proc/devices.c linux-2.6.32.24/fs/proc/devices.c --- linux-2.6.32.24/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/devices.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/devices.c 2010-10-23 19:59:20.000000000 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -34584,7 +34839,7 @@ diff -urNp linux-2.6.32.24/fs/proc/devices.c linux-2.6.32.24/fs/proc/devices.c module_init(proc_devices_init); diff -urNp linux-2.6.32.24/fs/proc/inode.c linux-2.6.32.24/fs/proc/inode.c --- linux-2.6.32.24/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/inode.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/inode.c 2010-10-23 19:59:20.000000000 -0400 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -34599,7 +34854,7 @@ diff -urNp linux-2.6.32.24/fs/proc/inode.c linux-2.6.32.24/fs/proc/inode.c inode->i_size = de->size; diff -urNp linux-2.6.32.24/fs/proc/internal.h linux-2.6.32.24/fs/proc/internal.h --- linux-2.6.32.24/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/internal.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/internal.h 2010-10-23 19:59:20.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, @@ -34612,7 +34867,7 @@ diff -urNp linux-2.6.32.24/fs/proc/internal.h linux-2.6.32.24/fs/proc/internal.h extern const struct file_operations proc_maps_operations; diff -urNp linux-2.6.32.24/fs/proc/Kconfig linux-2.6.32.24/fs/proc/Kconfig --- linux-2.6.32.24/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/Kconfig 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/Kconfig 2010-10-23 19:59:20.000000000 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -34642,7 +34897,7 @@ diff -urNp linux-2.6.32.24/fs/proc/Kconfig linux-2.6.32.24/fs/proc/Kconfig Various /proc files exist to monitor process memory utilization: diff -urNp linux-2.6.32.24/fs/proc/kcore.c linux-2.6.32.24/fs/proc/kcore.c --- linux-2.6.32.24/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/kcore.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/kcore.c 2010-10-23 19:59:20.000000000 -0400 @@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use * the addresses in the elf_phdr on our list. */ @@ -34698,7 +34953,7 @@ diff -urNp linux-2.6.32.24/fs/proc/kcore.c linux-2.6.32.24/fs/proc/kcore.c if (kcore_need_update) diff -urNp linux-2.6.32.24/fs/proc/meminfo.c linux-2.6.32.24/fs/proc/meminfo.c --- linux-2.6.32.24/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/meminfo.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/meminfo.c 2010-10-23 19:59:20.000000000 -0400 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -34710,7 +34965,7 @@ diff -urNp linux-2.6.32.24/fs/proc/meminfo.c linux-2.6.32.24/fs/proc/meminfo.c diff -urNp linux-2.6.32.24/fs/proc/nommu.c linux-2.6.32.24/fs/proc/nommu.c --- linux-2.6.32.24/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/nommu.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/nommu.c 2010-10-23 19:59:20.000000000 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -34722,7 +34977,7 @@ diff -urNp linux-2.6.32.24/fs/proc/nommu.c linux-2.6.32.24/fs/proc/nommu.c seq_putc(m, '\n'); diff -urNp linux-2.6.32.24/fs/proc/proc_net.c linux-2.6.32.24/fs/proc/proc_net.c --- linux-2.6.32.24/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/proc_net.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/proc_net.c 2010-10-23 19:59:20.000000000 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -34743,7 +34998,7 @@ diff -urNp linux-2.6.32.24/fs/proc/proc_net.c linux-2.6.32.24/fs/proc/proc_net.c task = pid_task(proc_pid(dir), PIDTYPE_PID); diff -urNp linux-2.6.32.24/fs/proc/proc_sysctl.c linux-2.6.32.24/fs/proc/proc_sysctl.c --- linux-2.6.32.24/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/proc_sysctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/proc_sysctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -34785,7 +35040,7 @@ diff -urNp linux-2.6.32.24/fs/proc/proc_sysctl.c linux-2.6.32.24/fs/proc/proc_sy stat->mode = (stat->mode & S_IFMT) | table->mode; diff -urNp linux-2.6.32.24/fs/proc/root.c linux-2.6.32.24/fs/proc/root.c --- linux-2.6.32.24/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/root.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/root.c 2010-10-23 19:59:20.000000000 -0400 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -34804,7 +35059,7 @@ diff -urNp linux-2.6.32.24/fs/proc/root.c linux-2.6.32.24/fs/proc/root.c diff -urNp linux-2.6.32.24/fs/proc/task_mmu.c linux-2.6.32.24/fs/proc/task_mmu.c --- linux-2.6.32.24/fs/proc/task_mmu.c 2010-08-29 21:08:16.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/task_mmu.c 2010-09-17 18:40:06.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/task_mmu.c 2010-10-23 19:59:20.000000000 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -34942,7 +35197,7 @@ diff -urNp linux-2.6.32.24/fs/proc/task_mmu.c linux-2.6.32.24/fs/proc/task_mmu.c mss.shared_clean >> 10, diff -urNp linux-2.6.32.24/fs/proc/task_nommu.c linux-2.6.32.24/fs/proc/task_nommu.c --- linux-2.6.32.24/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/proc/task_nommu.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/proc/task_nommu.c 2010-10-23 19:59:20.000000000 -0400 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -34963,7 +35218,7 @@ diff -urNp linux-2.6.32.24/fs/proc/task_nommu.c linux-2.6.32.24/fs/proc/task_nom seq_putc(m, '\n'); diff -urNp linux-2.6.32.24/fs/readdir.c linux-2.6.32.24/fs/readdir.c --- linux-2.6.32.24/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/readdir.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/readdir.c 2010-10-23 19:59:20.000000000 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -35055,7 +35310,7 @@ diff -urNp linux-2.6.32.24/fs/readdir.c linux-2.6.32.24/fs/readdir.c diff -urNp linux-2.6.32.24/fs/reiserfs/do_balan.c linux-2.6.32.24/fs/reiserfs/do_balan.c --- linux-2.6.32.24/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/reiserfs/do_balan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/reiserfs/do_balan.c 2010-10-23 19:59:20.000000000 -0400 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -35067,7 +35322,7 @@ diff -urNp linux-2.6.32.24/fs/reiserfs/do_balan.c linux-2.6.32.24/fs/reiserfs/do /* balance leaf returns 0 except if combining L R and S into diff -urNp linux-2.6.32.24/fs/reiserfs/item_ops.c linux-2.6.32.24/fs/reiserfs/item_ops.c --- linux-2.6.32.24/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/reiserfs/item_ops.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/reiserfs/item_ops.c 2010-10-23 19:59:20.000000000 -0400 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -35124,7 +35379,7 @@ diff -urNp linux-2.6.32.24/fs/reiserfs/item_ops.c linux-2.6.32.24/fs/reiserfs/it &direct_ops, diff -urNp linux-2.6.32.24/fs/reiserfs/procfs.c linux-2.6.32.24/fs/reiserfs/procfs.c --- linux-2.6.32.24/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/reiserfs/procfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/reiserfs/procfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -35136,7 +35391,7 @@ diff -urNp linux-2.6.32.24/fs/reiserfs/procfs.c linux-2.6.32.24/fs/reiserfs/proc SF(s_good_search_by_key_reada), SF(s_bmaps), diff -urNp linux-2.6.32.24/fs/select.c linux-2.6.32.24/fs/select.c --- linux-2.6.32.24/fs/select.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/select.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/select.c 2010-10-23 19:59:20.000000000 -0400 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -35155,7 +35410,7 @@ diff -urNp linux-2.6.32.24/fs/select.c linux-2.6.32.24/fs/select.c diff -urNp linux-2.6.32.24/fs/seq_file.c linux-2.6.32.24/fs/seq_file.c --- linux-2.6.32.24/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/seq_file.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/seq_file.c 2010-10-23 19:59:20.000000000 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -35198,7 +35453,7 @@ diff -urNp linux-2.6.32.24/fs/seq_file.c linux-2.6.32.24/fs/seq_file.c m->count = 0; diff -urNp linux-2.6.32.24/fs/smbfs/symlink.c linux-2.6.32.24/fs/smbfs/symlink.c --- linux-2.6.32.24/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/smbfs/symlink.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/smbfs/symlink.c 2010-10-23 19:59:20.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) @@ -35210,7 +35465,7 @@ diff -urNp linux-2.6.32.24/fs/smbfs/symlink.c linux-2.6.32.24/fs/smbfs/symlink.c } diff -urNp linux-2.6.32.24/fs/splice.c linux-2.6.32.24/fs/splice.c --- linux-2.6.32.24/fs/splice.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/splice.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/splice.c 2010-10-23 19:59:20.000000000 -0400 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -35351,7 +35606,7 @@ diff -urNp linux-2.6.32.24/fs/splice.c linux-2.6.32.24/fs/splice.c pipe_unlock(ipipe); diff -urNp linux-2.6.32.24/fs/sysfs/file.c linux-2.6.32.24/fs/sysfs/file.c --- linux-2.6.32.24/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/fs/sysfs/file.c 2010-09-20 17:27:14.000000000 -0400 ++++ linux-2.6.32.24/fs/sysfs/file.c 2010-10-23 19:59:20.000000000 -0400 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -35390,7 +35645,7 @@ diff -urNp linux-2.6.32.24/fs/sysfs/file.c linux-2.6.32.24/fs/sysfs/file.c diff -urNp linux-2.6.32.24/fs/sysfs/symlink.c linux-2.6.32.24/fs/sysfs/symlink.c --- linux-2.6.32.24/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/sysfs/symlink.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/sysfs/symlink.c 2010-10-23 19:59:20.000000000 -0400 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -35402,7 +35657,7 @@ diff -urNp linux-2.6.32.24/fs/sysfs/symlink.c linux-2.6.32.24/fs/sysfs/symlink.c } diff -urNp linux-2.6.32.24/fs/udf/balloc.c linux-2.6.32.24/fs/udf/balloc.c --- linux-2.6.32.24/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/udf/balloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/udf/balloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -35427,7 +35682,7 @@ diff -urNp linux-2.6.32.24/fs/udf/balloc.c linux-2.6.32.24/fs/udf/balloc.c partmap->s_partition_len); diff -urNp linux-2.6.32.24/fs/udf/misc.c linux-2.6.32.24/fs/udf/misc.c --- linux-2.6.32.24/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/udf/misc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/udf/misc.c 2010-10-23 19:59:20.000000000 -0400 @@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat iinfo->i_lenEAttr += size; return (struct genericFormat *)&ea[offset]; @@ -35441,7 +35696,7 @@ diff -urNp linux-2.6.32.24/fs/udf/misc.c linux-2.6.32.24/fs/udf/misc.c } diff -urNp linux-2.6.32.24/fs/udf/udfdecl.h linux-2.6.32.24/fs/udf/udfdecl.h --- linux-2.6.32.24/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/udf/udfdecl.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/udf/udfdecl.h 2010-10-23 19:59:20.000000000 -0400 @@ -26,7 +26,7 @@ do { \ printk(f, ##a); \ } while (0) @@ -35453,7 +35708,7 @@ diff -urNp linux-2.6.32.24/fs/udf/udfdecl.h linux-2.6.32.24/fs/udf/udfdecl.h #define udf_info(f, a...) \ diff -urNp linux-2.6.32.24/fs/utimes.c linux-2.6.32.24/fs/utimes.c --- linux-2.6.32.24/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/utimes.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/utimes.c 2010-10-23 19:59:20.000000000 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -35477,7 +35732,7 @@ diff -urNp linux-2.6.32.24/fs/utimes.c linux-2.6.32.24/fs/utimes.c mutex_unlock(&inode->i_mutex); diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c --- linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -35489,7 +35744,7 @@ diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.24/fs/xfs/l diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c --- linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c 2010-10-23 19:59:20.000000000 -0400 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -35501,7 +35756,7 @@ diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.24/fs/xfs/li kfree(s); diff -urNp linux-2.6.32.24/fs/xfs/xfs_bmap.c linux-2.6.32.24/fs/xfs/xfs_bmap.c --- linux-2.6.32.24/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/fs/xfs/xfs_bmap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/fs/xfs/xfs_bmap.c 2010-10-23 19:59:20.000000000 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -35513,7 +35768,7 @@ diff -urNp linux-2.6.32.24/fs/xfs/xfs_bmap.c linux-2.6.32.24/fs/xfs/xfs_bmap.c #if defined(XFS_RW_TRACE) diff -urNp linux-2.6.32.24/grsecurity/gracl_alloc.c linux-2.6.32.24/grsecurity/gracl_alloc.c --- linux-2.6.32.24/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_alloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_alloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -35622,7 +35877,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_alloc.c linux-2.6.32.24/grsecurity/g +} diff -urNp linux-2.6.32.24/grsecurity/gracl.c linux-2.6.32.24/grsecurity/gracl.c --- linux-2.6.32.24/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl.c 2010-09-28 19:14:25.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,3922 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39548,7 +39803,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl.c linux-2.6.32.24/grsecurity/gracl.c + diff -urNp linux-2.6.32.24/grsecurity/gracl_cap.c linux-2.6.32.24/grsecurity/gracl_cap.c --- linux-2.6.32.24/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_cap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_cap.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,138 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39690,7 +39945,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_cap.c linux-2.6.32.24/grsecurity/gra + diff -urNp linux-2.6.32.24/grsecurity/gracl_fs.c linux-2.6.32.24/grsecurity/gracl_fs.c --- linux-2.6.32.24/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_fs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_fs.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40118,7 +40373,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_fs.c linux-2.6.32.24/grsecurity/grac +} diff -urNp linux-2.6.32.24/grsecurity/gracl_ip.c linux-2.6.32.24/grsecurity/gracl_ip.c --- linux-2.6.32.24/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_ip.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_ip.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -40461,7 +40716,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_ip.c linux-2.6.32.24/grsecurity/grac +} diff -urNp linux-2.6.32.24/grsecurity/gracl_learn.c linux-2.6.32.24/grsecurity/gracl_learn.c --- linux-2.6.32.24/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_learn.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_learn.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -40676,7 +40931,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_learn.c linux-2.6.32.24/grsecurity/g +}; diff -urNp linux-2.6.32.24/grsecurity/gracl_res.c linux-2.6.32.24/grsecurity/gracl_res.c --- linux-2.6.32.24/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_res.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_res.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,67 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40747,7 +41002,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_res.c linux-2.6.32.24/grsecurity/gra +} diff -urNp linux-2.6.32.24/grsecurity/gracl_segv.c linux-2.6.32.24/grsecurity/gracl_segv.c --- linux-2.6.32.24/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_segv.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_segv.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -41061,7 +41316,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_segv.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/gracl_shm.c linux-2.6.32.24/grsecurity/gracl_shm.c --- linux-2.6.32.24/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/gracl_shm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/gracl_shm.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -41105,7 +41360,7 @@ diff -urNp linux-2.6.32.24/grsecurity/gracl_shm.c linux-2.6.32.24/grsecurity/gra +} diff -urNp linux-2.6.32.24/grsecurity/grsec_chdir.c linux-2.6.32.24/grsecurity/grsec_chdir.c --- linux-2.6.32.24/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_chdir.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_chdir.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41128,7 +41383,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_chdir.c linux-2.6.32.24/grsecurity/g +} diff -urNp linux-2.6.32.24/grsecurity/grsec_chroot.c linux-2.6.32.24/grsecurity/grsec_chroot.c --- linux-2.6.32.24/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_chroot.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_chroot.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,389 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -41521,7 +41776,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_chroot.c linux-2.6.32.24/grsecurity/ +#endif diff -urNp linux-2.6.32.24/grsecurity/grsec_disabled.c linux-2.6.32.24/grsecurity/grsec_disabled.c --- linux-2.6.32.24/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_disabled.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_disabled.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -41956,7 +42211,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_disabled.c linux-2.6.32.24/grsecurit +#endif diff -urNp linux-2.6.32.24/grsecurity/grsec_exec.c linux-2.6.32.24/grsecurity/grsec_exec.c --- linux-2.6.32.24/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_exec.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_exec.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42049,7 +42304,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_exec.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_fifo.c linux-2.6.32.24/grsecurity/grsec_fifo.c --- linux-2.6.32.24/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_fifo.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_fifo.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42077,7 +42332,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_fifo.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_fork.c linux-2.6.32.24/grsecurity/grsec_fork.c --- linux-2.6.32.24/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_fork.c 2010-09-23 20:36:06.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_fork.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,23 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42104,8 +42359,8 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_fork.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_init.c linux-2.6.32.24/grsecurity/grsec_init.c --- linux-2.6.32.24/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_init.c 2010-09-17 19:24:55.000000000 -0400 -@@ -0,0 +1,266 @@ ++++ linux-2.6.32.24/grsecurity/grsec_init.c 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,270 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#include <linux/mm.h> @@ -42163,6 +42418,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_init.c linux-2.6.32.24/grsecurity/gr +int grsec_socket_server_gid; +int grsec_resource_logging; +int grsec_disable_privio; ++int grsec_enable_log_rwxmaps; +int grsec_lock; + +DEFINE_SPINLOCK(grsec_alert_lock); @@ -42260,6 +42516,9 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_init.c linux-2.6.32.24/grsecurity/gr +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL + grsec_enable_audit_textrel = 1; +#endif ++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG ++ grsec_enable_log_rwxmaps = 1; ++#endif +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP + grsec_enable_group = 1; + grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID; @@ -42374,7 +42633,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_init.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_link.c linux-2.6.32.24/grsecurity/grsec_link.c --- linux-2.6.32.24/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_link.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_link.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42421,8 +42680,8 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_link.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_log.c linux-2.6.32.24/grsecurity/grsec_log.c --- linux-2.6.32.24/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_log.c 2010-09-28 19:12:37.000000000 -0400 -@@ -0,0 +1,306 @@ ++++ linux-2.6.32.24/grsecurity/grsec_log.c 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#include <linux/file.h> @@ -42697,6 +42956,10 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_log.c linux-2.6.32.24/grsecurity/grs + ulong1 = va_arg(ap, unsigned long); + gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1); + break; ++ case GR_RWXMAP: ++ file = va_arg(ap, struct file *); ++ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>"); ++ break; + case GR_PSACCT: + { + unsigned int wday, cday; @@ -42731,7 +42994,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_log.c linux-2.6.32.24/grsecurity/grs +} diff -urNp linux-2.6.32.24/grsecurity/grsec_mem.c linux-2.6.32.24/grsecurity/grsec_mem.c --- linux-2.6.32.24/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_mem.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_mem.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42820,7 +43083,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_mem.c linux-2.6.32.24/grsecurity/grs +} diff -urNp linux-2.6.32.24/grsecurity/grsec_mount.c linux-2.6.32.24/grsecurity/grsec_mount.c --- linux-2.6.32.24/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_mount.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_mount.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42884,9 +43147,49 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_mount.c linux-2.6.32.24/grsecurity/g +#endif + return 0; +} +diff -urNp linux-2.6.32.24/grsecurity/grsec_pax.c linux-2.6.32.24/grsecurity/grsec_pax.c +--- linux-2.6.32.24/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.24/grsecurity/grsec_pax.c 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,36 @@ ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/mm.h> ++#include <linux/file.h> ++#include <linux/grinternal.h> ++#include <linux/grsecurity.h> ++ ++void ++gr_log_textrel(struct vm_area_struct * vma) ++{ ++#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL ++ if (grsec_enable_audit_textrel) ++ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff); ++#endif ++ return; ++} ++ ++void ++gr_log_rwxmmap(struct file *file) ++{ ++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG ++ if (grsec_enable_log_rwxmaps) ++ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file); ++#endif ++ return; ++} ++ ++void ++gr_log_rwxmprotect(struct file *file) ++{ ++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG ++ if (grsec_enable_log_rwxmaps) ++ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file); ++#endif ++ return; ++} diff -urNp linux-2.6.32.24/grsecurity/grsec_ptrace.c linux-2.6.32.24/grsecurity/grsec_ptrace.c --- linux-2.6.32.24/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_ptrace.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_ptrace.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42904,7 +43207,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_ptrace.c linux-2.6.32.24/grsecurity/ +} diff -urNp linux-2.6.32.24/grsecurity/grsec_sig.c linux-2.6.32.24/grsecurity/grsec_sig.c --- linux-2.6.32.24/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_sig.c 2010-09-28 19:13:01.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_sig.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -42973,7 +43276,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_sig.c linux-2.6.32.24/grsecurity/grs + diff -urNp linux-2.6.32.24/grsecurity/grsec_sock.c linux-2.6.32.24/grsecurity/grsec_sock.c --- linux-2.6.32.24/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_sock.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_sock.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -43248,8 +43551,8 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_sock.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_sysctl.c linux-2.6.32.24/grsecurity/grsec_sysctl.c --- linux-2.6.32.24/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_sysctl.c 2010-09-17 19:22:27.000000000 -0400 -@@ -0,0 +1,469 @@ ++++ linux-2.6.32.24/grsecurity/grsec_sysctl.c 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,479 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#include <linux/sysctl.h> @@ -43345,6 +43648,16 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_sysctl.c linux-2.6.32.24/grsecurity/ + .proc_handler = &proc_dointvec, + }, +#endif ++#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG ++ { ++ .ctl_name = CTL_UNNUMBERED, ++ .procname = "rwxmap_logging", ++ .data = &grsec_enable_log_rwxmaps, ++ .maxlen = sizeof(int), ++ .mode = 0600, ++ .proc_handler = &proc_dointvec, ++ }, ++#endif +#ifdef CONFIG_GRKERNSEC_SIGNAL + { + .ctl_name = CTL_UNNUMBERED, @@ -43719,29 +44032,9 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_sysctl.c linux-2.6.32.24/grsecurity/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.24/grsecurity/grsec_textrel.c linux-2.6.32.24/grsecurity/grsec_textrel.c ---- linux-2.6.32.24/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_textrel.c 2010-09-04 15:54:52.000000000 -0400 -@@ -0,0 +1,16 @@ -+#include <linux/kernel.h> -+#include <linux/sched.h> -+#include <linux/mm.h> -+#include <linux/file.h> -+#include <linux/grinternal.h> -+#include <linux/grsecurity.h> -+ -+void -+gr_log_textrel(struct vm_area_struct * vma) -+{ -+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL -+ if (grsec_enable_audit_textrel) -+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff); -+#endif -+ return; -+} diff -urNp linux-2.6.32.24/grsecurity/grsec_time.c linux-2.6.32.24/grsecurity/grsec_time.c --- linux-2.6.32.24/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_time.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_time.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -43758,7 +44051,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_time.c linux-2.6.32.24/grsecurity/gr +} diff -urNp linux-2.6.32.24/grsecurity/grsec_tpe.c linux-2.6.32.24/grsecurity/grsec_tpe.c --- linux-2.6.32.24/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsec_tpe.c 2010-09-17 19:28:20.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsec_tpe.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,39 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -43801,7 +44094,7 @@ diff -urNp linux-2.6.32.24/grsecurity/grsec_tpe.c linux-2.6.32.24/grsecurity/grs +} diff -urNp linux-2.6.32.24/grsecurity/grsum.c linux-2.6.32.24/grsecurity/grsum.c --- linux-2.6.32.24/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/grsum.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/grsum.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -43866,8 +44159,8 @@ diff -urNp linux-2.6.32.24/grsecurity/grsum.c linux-2.6.32.24/grsecurity/grsum.c +} diff -urNp linux-2.6.32.24/grsecurity/Kconfig linux-2.6.32.24/grsecurity/Kconfig --- linux-2.6.32.24/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/Kconfig 2010-09-17 19:36:28.000000000 -0400 -@@ -0,0 +1,986 @@ ++++ linux-2.6.32.24/grsecurity/Kconfig 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,995 @@ +# +# grecurity configuration +# @@ -44567,6 +44860,15 @@ diff -urNp linux-2.6.32.24/grsecurity/Kconfig linux-2.6.32.24/grsecurity/Kconfig + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via + the RBAC system), and thus does not create privacy concerns. + ++config GRKERNSEC_RWXMAP_LOG ++ bool 'Denied RWX mmap/mprotect logging' ++ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT ++ help ++ If you say Y here, calls to mmap() and mprotect() with explicit ++ usage of PROT_WRITE and PROT_EXEC together will be logged when ++ denied by the PAX_MPROTECT feature. If the sysctl option is ++ enabled, a sysctl option with name "rwxmap_logging" is created. ++ +config GRKERNSEC_AUDIT_TEXTREL + bool 'ELF text relocations logging (READ HELP)' + depends on PAX_MPROTECT @@ -44856,7 +45158,7 @@ diff -urNp linux-2.6.32.24/grsecurity/Kconfig linux-2.6.32.24/grsecurity/Kconfig +endmenu diff -urNp linux-2.6.32.24/grsecurity/Makefile linux-2.6.32.24/grsecurity/Makefile --- linux-2.6.32.24/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/grsecurity/Makefile 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/grsecurity/Makefile 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -44868,7 +45170,7 @@ diff -urNp linux-2.6.32.24/grsecurity/Makefile linux-2.6.32.24/grsecurity/Makefi + +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \ + grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \ -+ grsec_time.o grsec_tpe.o grsec_link.o grsec_textrel.o grsec_ptrace.o ++ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o + +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \ + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ @@ -44889,7 +45191,7 @@ diff -urNp linux-2.6.32.24/grsecurity/Makefile linux-2.6.32.24/grsecurity/Makefi +endif diff -urNp linux-2.6.32.24/include/acpi/acoutput.h linux-2.6.32.24/include/acpi/acoutput.h --- linux-2.6.32.24/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/acpi/acoutput.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/acpi/acoutput.h 2010-10-23 19:59:20.000000000 -0400 @@ -264,8 +264,8 @@ * leaving no executable debug code! */ @@ -44903,7 +45205,7 @@ diff -urNp linux-2.6.32.24/include/acpi/acoutput.h linux-2.6.32.24/include/acpi/ diff -urNp linux-2.6.32.24/include/acpi/acpi_drivers.h linux-2.6.32.24/include/acpi/acpi_drivers.h --- linux-2.6.32.24/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/acpi/acpi_drivers.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/acpi/acpi_drivers.h 2010-10-23 19:59:20.000000000 -0400 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -44935,7 +45237,7 @@ diff -urNp linux-2.6.32.24/include/acpi/acpi_drivers.h linux-2.6.32.24/include/a return -ENODEV; diff -urNp linux-2.6.32.24/include/asm-generic/atomic-long.h linux-2.6.32.24/include/asm-generic/atomic-long.h --- linux-2.6.32.24/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/atomic-long.h 2010-09-04 15:54:56.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/atomic-long.h 2010-10-23 19:59:20.000000000 -0400 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -45194,7 +45496,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/atomic-long.h linux-2.6.32.24/inc #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ diff -urNp linux-2.6.32.24/include/asm-generic/dma-mapping-common.h linux-2.6.32.24/include/asm-generic/dma-mapping-common.h --- linux-2.6.32.24/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/dma-mapping-common.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/dma-mapping-common.h 2010-10-23 19:59:20.000000000 -0400 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -45305,7 +45607,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/dma-mapping-common.h linux-2.6.32 if (ops->sync_sg_for_device) diff -urNp linux-2.6.32.24/include/asm-generic/futex.h linux-2.6.32.24/include/asm-generic/futex.h --- linux-2.6.32.24/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/futex.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/futex.h 2010-10-23 19:59:20.000000000 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -45326,7 +45628,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/futex.h linux-2.6.32.24/include/a } diff -urNp linux-2.6.32.24/include/asm-generic/int-l64.h linux-2.6.32.24/include/asm-generic/int-l64.h --- linux-2.6.32.24/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/int-l64.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/int-l64.h 2010-10-23 19:59:20.000000000 -0400 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -45338,7 +45640,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/int-l64.h linux-2.6.32.24/include #define S16_C(x) x diff -urNp linux-2.6.32.24/include/asm-generic/int-ll64.h linux-2.6.32.24/include/asm-generic/int-ll64.h --- linux-2.6.32.24/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/int-ll64.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/int-ll64.h 2010-10-23 19:59:20.000000000 -0400 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -45350,7 +45652,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/int-ll64.h linux-2.6.32.24/includ #define S16_C(x) x diff -urNp linux-2.6.32.24/include/asm-generic/kmap_types.h linux-2.6.32.24/include/asm-generic/kmap_types.h --- linux-2.6.32.24/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/kmap_types.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/kmap_types.h 2010-10-23 19:59:20.000000000 -0400 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -45363,7 +45665,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/kmap_types.h linux-2.6.32.24/incl #undef KMAP_D diff -urNp linux-2.6.32.24/include/asm-generic/pgtable.h linux-2.6.32.24/include/asm-generic/pgtable.h --- linux-2.6.32.24/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/pgtable.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/pgtable.h 2010-10-23 19:59:20.000000000 -0400 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -45381,7 +45683,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/pgtable.h linux-2.6.32.24/include #endif /* _ASM_GENERIC_PGTABLE_H */ diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h --- linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h 2010-10-23 19:59:20.000000000 -0400 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -45420,7 +45722,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h linux-2.6.32.24/i * setup: the pmd is never bad, and a pmd always exists (as it's folded diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopud.h linux-2.6.32.24/include/asm-generic/pgtable-nopud.h --- linux-2.6.32.24/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/pgtable-nopud.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/pgtable-nopud.h 2010-10-23 19:59:20.000000000 -0400 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -45453,7 +45755,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopud.h linux-2.6.32.24/i * setup: the pud is never bad, and a pud always exists (as it's folded diff -urNp linux-2.6.32.24/include/asm-generic/vmlinux.lds.h linux-2.6.32.24/include/asm-generic/vmlinux.lds.h --- linux-2.6.32.24/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/asm-generic/vmlinux.lds.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/asm-generic/vmlinux.lds.h 2010-10-23 19:59:20.000000000 -0400 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -45494,7 +45796,7 @@ diff -urNp linux-2.6.32.24/include/asm-generic/vmlinux.lds.h linux-2.6.32.24/inc * PERCPU - define output section for percpu area, simple version diff -urNp linux-2.6.32.24/include/drm/drm_pciids.h linux-2.6.32.24/include/drm/drm_pciids.h --- linux-2.6.32.24/include/drm/drm_pciids.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/drm/drm_pciids.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/drm/drm_pciids.h 2010-10-23 19:59:20.000000000 -0400 @@ -377,7 +377,7 @@ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -45600,7 +45902,7 @@ diff -urNp linux-2.6.32.24/include/drm/drm_pciids.h linux-2.6.32.24/include/drm/ + {0, 0, 0, 0, 0, 0} diff -urNp linux-2.6.32.24/include/drm/drmP.h linux-2.6.32.24/include/drm/drmP.h --- linux-2.6.32.24/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/drm/drmP.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/drm/drmP.h 2010-10-23 19:59:20.000000000 -0400 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -45630,7 +45932,7 @@ diff -urNp linux-2.6.32.24/include/drm/drmP.h linux-2.6.32.24/include/drm/drmP.h struct list_head filelist; diff -urNp linux-2.6.32.24/include/linux/a.out.h linux-2.6.32.24/include/linux/a.out.h --- linux-2.6.32.24/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/a.out.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/a.out.h 2010-10-23 19:59:20.000000000 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -45648,7 +45950,7 @@ diff -urNp linux-2.6.32.24/include/linux/a.out.h linux-2.6.32.24/include/linux/a #endif diff -urNp linux-2.6.32.24/include/linux/atmdev.h linux-2.6.32.24/include/linux/atmdev.h --- linux-2.6.32.24/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/atmdev.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/atmdev.h 2010-10-23 19:59:20.000000000 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -45660,7 +45962,7 @@ diff -urNp linux-2.6.32.24/include/linux/atmdev.h linux-2.6.32.24/include/linux/ }; diff -urNp linux-2.6.32.24/include/linux/backlight.h linux-2.6.32.24/include/linux/backlight.h --- linux-2.6.32.24/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/backlight.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/backlight.h 2010-10-23 19:59:20.000000000 -0400 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -45704,7 +46006,7 @@ diff -urNp linux-2.6.32.24/include/linux/backlight.h linux-2.6.32.24/include/lin enum backlight_update_reason reason); diff -urNp linux-2.6.32.24/include/linux/binfmts.h linux-2.6.32.24/include/linux/binfmts.h --- linux-2.6.32.24/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/binfmts.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/binfmts.h 2010-10-23 19:59:20.000000000 -0400 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -45715,7 +46017,7 @@ diff -urNp linux-2.6.32.24/include/linux/binfmts.h linux-2.6.32.24/include/linux }; diff -urNp linux-2.6.32.24/include/linux/blkdev.h linux-2.6.32.24/include/linux/blkdev.h --- linux-2.6.32.24/include/linux/blkdev.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/blkdev.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/blkdev.h 2010-10-23 19:59:20.000000000 -0400 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -45749,7 +46051,7 @@ diff -urNp linux-2.6.32.24/include/linux/blkdev.h linux-2.6.32.24/include/linux/ extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, diff -urNp linux-2.6.32.24/include/linux/cache.h linux-2.6.32.24/include/linux/cache.h --- linux-2.6.32.24/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/cache.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/cache.h 2010-10-23 19:59:20.000000000 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -45763,7 +46065,7 @@ diff -urNp linux-2.6.32.24/include/linux/cache.h linux-2.6.32.24/include/linux/c #endif diff -urNp linux-2.6.32.24/include/linux/capability.h linux-2.6.32.24/include/linux/capability.h --- linux-2.6.32.24/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/capability.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/capability.h 2010-10-23 19:59:20.000000000 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -45774,7 +46076,7 @@ diff -urNp linux-2.6.32.24/include/linux/capability.h linux-2.6.32.24/include/li struct dentry; diff -urNp linux-2.6.32.24/include/linux/compiler-gcc4.h linux-2.6.32.24/include/linux/compiler-gcc4.h --- linux-2.6.32.24/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/compiler-gcc4.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/compiler-gcc4.h 2010-10-23 19:59:20.000000000 -0400 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -45786,7 +46088,7 @@ diff -urNp linux-2.6.32.24/include/linux/compiler-gcc4.h linux-2.6.32.24/include #endif diff -urNp linux-2.6.32.24/include/linux/compiler.h linux-2.6.32.24/include/linux/compiler.h --- linux-2.6.32.24/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/compiler.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/compiler.h 2010-10-23 19:59:20.000000000 -0400 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -45812,7 +46114,7 @@ diff -urNp linux-2.6.32.24/include/linux/compiler.h linux-2.6.32.24/include/linu # define __section(S) __attribute__ ((__section__(#S))) diff -urNp linux-2.6.32.24/include/linux/decompress/mm.h linux-2.6.32.24/include/linux/decompress/mm.h --- linux-2.6.32.24/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/decompress/mm.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/decompress/mm.h 2010-10-23 19:59:20.000000000 -0400 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -45824,7 +46126,7 @@ diff -urNp linux-2.6.32.24/include/linux/decompress/mm.h linux-2.6.32.24/include #define large_malloc(a) vmalloc(a) diff -urNp linux-2.6.32.24/include/linux/dma-mapping.h linux-2.6.32.24/include/linux/dma-mapping.h --- linux-2.6.32.24/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/dma-mapping.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/dma-mapping.h 2010-10-23 19:59:20.000000000 -0400 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -45893,7 +46195,7 @@ diff -urNp linux-2.6.32.24/include/linux/dma-mapping.h linux-2.6.32.24/include/l #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) diff -urNp linux-2.6.32.24/include/linux/dst.h linux-2.6.32.24/include/linux/dst.h --- linux-2.6.32.24/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/dst.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/dst.h 2010-10-23 19:59:20.000000000 -0400 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -45905,7 +46207,7 @@ diff -urNp linux-2.6.32.24/include/linux/dst.h linux-2.6.32.24/include/linux/dst * How frequently and how many times transaction diff -urNp linux-2.6.32.24/include/linux/elf.h linux-2.6.32.24/include/linux/elf.h --- linux-2.6.32.24/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/elf.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/elf.h 2010-10-23 19:59:20.000000000 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -45980,7 +46282,7 @@ diff -urNp linux-2.6.32.24/include/linux/elf.h linux-2.6.32.24/include/linux/elf diff -urNp linux-2.6.32.24/include/linux/fs.h linux-2.6.32.24/include/linux/fs.h --- linux-2.6.32.24/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/fs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/fs.h 2010-10-23 19:59:20.000000000 -0400 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -46144,7 +46446,7 @@ diff -urNp linux-2.6.32.24/include/linux/fs.h linux-2.6.32.24/include/linux/fs.h /* diff -urNp linux-2.6.32.24/include/linux/fs_struct.h linux-2.6.32.24/include/linux/fs_struct.h --- linux-2.6.32.24/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/fs_struct.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/fs_struct.h 2010-10-23 19:59:20.000000000 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -46156,7 +46458,7 @@ diff -urNp linux-2.6.32.24/include/linux/fs_struct.h linux-2.6.32.24/include/lin int in_exec; diff -urNp linux-2.6.32.24/include/linux/genhd.h linux-2.6.32.24/include/linux/genhd.h --- linux-2.6.32.24/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/genhd.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/genhd.h 2010-10-23 19:59:20.000000000 -0400 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -46168,7 +46470,7 @@ diff -urNp linux-2.6.32.24/include/linux/genhd.h linux-2.6.32.24/include/linux/g struct blk_integrity *integrity; diff -urNp linux-2.6.32.24/include/linux/gracl.h linux-2.6.32.24/include/linux/gracl.h --- linux-2.6.32.24/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/gracl.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/gracl.h 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,310 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -46482,7 +46784,7 @@ diff -urNp linux-2.6.32.24/include/linux/gracl.h linux-2.6.32.24/include/linux/g + diff -urNp linux-2.6.32.24/include/linux/gralloc.h linux-2.6.32.24/include/linux/gralloc.h --- linux-2.6.32.24/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/gralloc.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/gralloc.h 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -46495,7 +46797,7 @@ diff -urNp linux-2.6.32.24/include/linux/gralloc.h linux-2.6.32.24/include/linux +#endif diff -urNp linux-2.6.32.24/include/linux/grdefs.h linux-2.6.32.24/include/linux/grdefs.h --- linux-2.6.32.24/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/grdefs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/grdefs.h 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -46635,8 +46937,8 @@ diff -urNp linux-2.6.32.24/include/linux/grdefs.h linux-2.6.32.24/include/linux/ +#endif diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/linux/grinternal.h --- linux-2.6.32.24/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/grinternal.h 2010-09-28 19:06:47.000000000 -0400 -@@ -0,0 +1,211 @@ ++++ linux-2.6.32.24/include/linux/grinternal.h 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,214 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H + @@ -46711,6 +47013,7 @@ diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/li +extern int grsec_audit_gid; +extern int grsec_enable_group; +extern int grsec_enable_audit_textrel; ++extern int grsec_enable_log_rwxmaps; +extern int grsec_enable_mount; +extern int grsec_enable_chdir; +extern int grsec_resource_logging; @@ -46807,7 +47110,8 @@ diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/li + GR_SIG2, + GR_CRASH1, + GR_CRASH2, -+ GR_PSACCT ++ GR_PSACCT, ++ GR_RWXMAP +}; + +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str) @@ -46842,6 +47146,7 @@ diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/li +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong) +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1) +#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) ++#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str) + +void gr_log_varargs(int audit, const char *msg, int argtypes, ...); + @@ -46850,8 +47155,8 @@ diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/li +#endif diff -urNp linux-2.6.32.24/include/linux/grmsg.h linux-2.6.32.24/include/linux/grmsg.h --- linux-2.6.32.24/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/grmsg.h 2010-09-23 20:35:45.000000000 -0400 -@@ -0,0 +1,108 @@ ++++ linux-2.6.32.24/include/linux/grmsg.h 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,110 @@ +#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:%pI4 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:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by " @@ -46956,14 +47261,16 @@ diff -urNp linux-2.6.32.24/include/linux/grmsg.h linux-2.6.32.24/include/linux/g +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by " +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by " +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for " ++#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by " ++#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by " +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " diff -urNp linux-2.6.32.24/include/linux/grsecurity.h linux-2.6.32.24/include/linux/grsecurity.h --- linux-2.6.32.24/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/grsecurity.h 2010-09-04 15:54:52.000000000 -0400 -@@ -0,0 +1,203 @@ ++++ linux-2.6.32.24/include/linux/grsecurity.h 2010-10-23 19:59:20.000000000 -0400 +@@ -0,0 +1,205 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H +#include <linux/fs.h> @@ -47042,6 +47349,8 @@ diff -urNp linux-2.6.32.24/include/linux/grsecurity.h linux-2.6.32.24/include/li +void gr_log_unmount(const char *devname, const int retval); +void gr_log_mount(const char *from, const char *to, const int retval); +void gr_log_textrel(struct vm_area_struct *vma); ++void gr_log_rwxmmap(struct file *file); ++void gr_log_rwxmprotect(struct file *file); + +int gr_handle_follow_link(const struct inode *parent, + const struct inode *inode, @@ -47169,7 +47478,7 @@ diff -urNp linux-2.6.32.24/include/linux/grsecurity.h linux-2.6.32.24/include/li +#endif diff -urNp linux-2.6.32.24/include/linux/hdpu_features.h linux-2.6.32.24/include/linux/hdpu_features.h --- linux-2.6.32.24/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/hdpu_features.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/hdpu_features.h 2010-10-23 19:59:20.000000000 -0400 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -47181,7 +47490,7 @@ diff -urNp linux-2.6.32.24/include/linux/hdpu_features.h linux-2.6.32.24/include unsigned long *set_addr; diff -urNp linux-2.6.32.24/include/linux/highmem.h linux-2.6.32.24/include/linux/highmem.h --- linux-2.6.32.24/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/highmem.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/highmem.h 2010-10-23 19:59:20.000000000 -0400 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -47203,7 +47512,7 @@ diff -urNp linux-2.6.32.24/include/linux/highmem.h linux-2.6.32.24/include/linux unsigned start2, unsigned end2) diff -urNp linux-2.6.32.24/include/linux/interrupt.h linux-2.6.32.24/include/linux/interrupt.h --- linux-2.6.32.24/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/interrupt.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/interrupt.h 2010-10-23 19:59:20.000000000 -0400 @@ -362,7 +362,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -47230,7 +47539,7 @@ diff -urNp linux-2.6.32.24/include/linux/interrupt.h linux-2.6.32.24/include/lin extern void raise_softirq_irqoff(unsigned int nr); diff -urNp linux-2.6.32.24/include/linux/jbd2.h linux-2.6.32.24/include/linux/jbd2.h --- linux-2.6.32.24/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/jbd2.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/jbd2.h 2010-10-23 19:59:20.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -47242,7 +47551,7 @@ diff -urNp linux-2.6.32.24/include/linux/jbd2.h linux-2.6.32.24/include/linux/jb static inline void *jbd2_alloc(size_t size, gfp_t flags) diff -urNp linux-2.6.32.24/include/linux/jbd.h linux-2.6.32.24/include/linux/jbd.h --- linux-2.6.32.24/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/jbd.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/jbd.h 2010-10-23 19:59:20.000000000 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -47254,7 +47563,7 @@ diff -urNp linux-2.6.32.24/include/linux/jbd.h linux-2.6.32.24/include/linux/jbd static inline void *jbd_alloc(size_t size, gfp_t flags) diff -urNp linux-2.6.32.24/include/linux/kallsyms.h linux-2.6.32.24/include/linux/kallsyms.h --- linux-2.6.32.24/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/kallsyms.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/kallsyms.h 2010-10-23 19:59:20.000000000 -0400 @@ -15,7 +15,8 @@ struct module; @@ -47277,7 +47586,7 @@ diff -urNp linux-2.6.32.24/include/linux/kallsyms.h linux-2.6.32.24/include/linu static void __check_printsym_format(const char *fmt, ...) diff -urNp linux-2.6.32.24/include/linux/kgdb.h linux-2.6.32.24/include/linux/kgdb.h --- linux-2.6.32.24/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/kgdb.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/kgdb.h 2010-10-23 19:59:20.000000000 -0400 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -47310,7 +47619,7 @@ diff -urNp linux-2.6.32.24/include/linux/kgdb.h linux-2.6.32.24/include/linux/kg extern int kgdb_mem2hex(char *mem, char *buf, int count); diff -urNp linux-2.6.32.24/include/linux/kobject.h linux-2.6.32.24/include/linux/kobject.h --- linux-2.6.32.24/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/kobject.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/kobject.h 2010-10-23 19:59:20.000000000 -0400 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -47361,7 +47670,7 @@ diff -urNp linux-2.6.32.24/include/linux/kobject.h linux-2.6.32.24/include/linux static inline struct kset *to_kset(struct kobject *kobj) diff -urNp linux-2.6.32.24/include/linux/kvm_host.h linux-2.6.32.24/include/linux/kvm_host.h --- linux-2.6.32.24/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/kvm_host.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/kvm_host.h 2010-10-23 19:59:20.000000000 -0400 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -47382,7 +47691,7 @@ diff -urNp linux-2.6.32.24/include/linux/kvm_host.h linux-2.6.32.24/include/linu int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); diff -urNp linux-2.6.32.24/include/linux/libata.h linux-2.6.32.24/include/linux/libata.h --- linux-2.6.32.24/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/include/linux/libata.h 2010-09-20 17:27:30.000000000 -0400 ++++ linux-2.6.32.24/include/linux/libata.h 2010-10-23 19:59:20.000000000 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -47450,7 +47759,7 @@ diff -urNp linux-2.6.32.24/include/linux/libata.h linux-2.6.32.24/include/linux/ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); diff -urNp linux-2.6.32.24/include/linux/lockd/bind.h linux-2.6.32.24/include/linux/lockd/bind.h --- linux-2.6.32.24/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/lockd/bind.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/lockd/bind.h 2010-10-23 19:59:20.000000000 -0400 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -47470,7 +47779,7 @@ diff -urNp linux-2.6.32.24/include/linux/lockd/bind.h linux-2.6.32.24/include/li * Similar to nfs_client_initdata, but without the NFS-specific diff -urNp linux-2.6.32.24/include/linux/mm.h linux-2.6.32.24/include/linux/mm.h --- linux-2.6.32.24/include/linux/mm.h 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/include/linux/mm.h 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/include/linux/mm.h 2010-10-23 19:59:20.000000000 -0400 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ @@ -47539,7 +47848,7 @@ diff -urNp linux-2.6.32.24/include/linux/mm.h linux-2.6.32.24/include/linux/mm.h #endif /* _LINUX_MM_H */ diff -urNp linux-2.6.32.24/include/linux/mm_types.h linux-2.6.32.24/include/linux/mm_types.h --- linux-2.6.32.24/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/include/linux/mm_types.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/mm_types.h 2010-10-23 19:59:20.000000000 -0400 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -47576,7 +47885,7 @@ diff -urNp linux-2.6.32.24/include/linux/mm_types.h linux-2.6.32.24/include/linu /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ diff -urNp linux-2.6.32.24/include/linux/mmu_notifier.h linux-2.6.32.24/include/linux/mmu_notifier.h --- linux-2.6.32.24/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/mmu_notifier.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/mmu_notifier.h 2010-10-23 19:59:20.000000000 -0400 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -47595,7 +47904,7 @@ diff -urNp linux-2.6.32.24/include/linux/mmu_notifier.h linux-2.6.32.24/include/ #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ diff -urNp linux-2.6.32.24/include/linux/mmzone.h linux-2.6.32.24/include/linux/mmzone.h --- linux-2.6.32.24/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/include/linux/mmzone.h 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/include/linux/mmzone.h 2010-10-23 19:59:20.000000000 -0400 @@ -350,7 +350,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -47607,7 +47916,7 @@ diff -urNp linux-2.6.32.24/include/linux/mmzone.h linux-2.6.32.24/include/linux/ * prev_priority holds the scanning priority for this zone. It is diff -urNp linux-2.6.32.24/include/linux/mod_devicetable.h linux-2.6.32.24/include/linux/mod_devicetable.h --- linux-2.6.32.24/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/mod_devicetable.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/mod_devicetable.h 2010-10-23 19:59:20.000000000 -0400 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -47628,7 +47937,7 @@ diff -urNp linux-2.6.32.24/include/linux/mod_devicetable.h linux-2.6.32.24/inclu __u16 bus; diff -urNp linux-2.6.32.24/include/linux/module.h linux-2.6.32.24/include/linux/module.h --- linux-2.6.32.24/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/module.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/module.h 2010-10-23 19:59:20.000000000 -0400 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -47703,7 +48012,7 @@ diff -urNp linux-2.6.32.24/include/linux/module.h linux-2.6.32.24/include/linux/ /* Search for module by name: must hold module_mutex. */ diff -urNp linux-2.6.32.24/include/linux/moduleloader.h linux-2.6.32.24/include/linux/moduleloader.h --- linux-2.6.32.24/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/moduleloader.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/moduleloader.h 2010-10-23 19:59:20.000000000 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -47726,9 +48035,30 @@ diff -urNp linux-2.6.32.24/include/linux/moduleloader.h linux-2.6.32.24/include/ /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, +diff -urNp linux-2.6.32.24/include/linux/moduleparam.h linux-2.6.32.24/include/linux/moduleparam.h +--- linux-2.6.32.24/include/linux/moduleparam.h 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/include/linux/moduleparam.h 2010-10-23 19:59:24.000000000 -0400 +@@ -132,7 +132,7 @@ struct kparam_array + + /* Actually copy string: maxlen param is usually sizeof(string). */ + #define module_param_string(name, string, len, perm) \ +- static const struct kparam_string __param_string_##name \ ++ static const struct kparam_string __param_string_##name __used \ + = { len, string }; \ + __module_param_call(MODULE_PARAM_PREFIX, name, \ + param_set_copystring, param_get_string, \ +@@ -211,7 +211,7 @@ extern int param_get_invbool(char *buffe + + /* Comma-separated array: *nump is set to number they actually specified. */ + #define module_param_array_named(name, array, type, nump, perm) \ +- static const struct kparam_array __param_arr_##name \ ++ static const struct kparam_array __param_arr_##name __used \ + = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\ + sizeof(array[0]), array }; \ + __module_param_call(MODULE_PARAM_PREFIX, name, \ diff -urNp linux-2.6.32.24/include/linux/namei.h linux-2.6.32.24/include/linux/namei.h --- linux-2.6.32.24/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/namei.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/namei.h 2010-10-23 19:59:20.000000000 -0400 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -47755,7 +48085,7 @@ diff -urNp linux-2.6.32.24/include/linux/namei.h linux-2.6.32.24/include/linux/n } diff -urNp linux-2.6.32.24/include/linux/netfilter/xt_gradm.h linux-2.6.32.24/include/linux/netfilter/xt_gradm.h --- linux-2.6.32.24/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/include/linux/netfilter/xt_gradm.h 2010-09-28 18:01:53.000000000 -0400 ++++ linux-2.6.32.24/include/linux/netfilter/xt_gradm.h 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -47768,7 +48098,7 @@ diff -urNp linux-2.6.32.24/include/linux/netfilter/xt_gradm.h linux-2.6.32.24/in +#endif diff -urNp linux-2.6.32.24/include/linux/nodemask.h linux-2.6.32.24/include/linux/nodemask.h --- linux-2.6.32.24/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/nodemask.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/nodemask.h 2010-10-23 19:59:20.000000000 -0400 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -47787,7 +48117,7 @@ diff -urNp linux-2.6.32.24/include/linux/nodemask.h linux-2.6.32.24/include/linu #define num_online_nodes() num_node_state(N_ONLINE) diff -urNp linux-2.6.32.24/include/linux/oprofile.h linux-2.6.32.24/include/linux/oprofile.h --- linux-2.6.32.24/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/oprofile.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/oprofile.h 2010-10-23 19:59:20.000000000 -0400 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -47802,7 +48132,7 @@ diff -urNp linux-2.6.32.24/include/linux/oprofile.h linux-2.6.32.24/include/linu struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, diff -urNp linux-2.6.32.24/include/linux/pipe_fs_i.h linux-2.6.32.24/include/linux/pipe_fs_i.h --- linux-2.6.32.24/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/pipe_fs_i.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/pipe_fs_i.h 2010-10-23 19:59:20.000000000 -0400 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -47818,7 +48148,7 @@ diff -urNp linux-2.6.32.24/include/linux/pipe_fs_i.h linux-2.6.32.24/include/lin struct fasync_struct *fasync_readers; diff -urNp linux-2.6.32.24/include/linux/poison.h linux-2.6.32.24/include/linux/poison.h --- linux-2.6.32.24/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/poison.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/poison.h 2010-10-23 19:59:20.000000000 -0400 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -47832,7 +48162,7 @@ diff -urNp linux-2.6.32.24/include/linux/poison.h linux-2.6.32.24/include/linux/ /* diff -urNp linux-2.6.32.24/include/linux/proc_fs.h linux-2.6.32.24/include/linux/proc_fs.h --- linux-2.6.32.24/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/proc_fs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/proc_fs.h 2010-10-23 19:59:20.000000000 -0400 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -47855,7 +48185,7 @@ diff -urNp linux-2.6.32.24/include/linux/proc_fs.h linux-2.6.32.24/include/linux read_proc_t *read_proc, void * data) diff -urNp linux-2.6.32.24/include/linux/random.h linux-2.6.32.24/include/linux/random.h --- linux-2.6.32.24/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/random.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/random.h 2010-10-23 19:59:20.000000000 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -47870,7 +48200,7 @@ diff -urNp linux-2.6.32.24/include/linux/random.h linux-2.6.32.24/include/linux/ #endif /* _LINUX_RANDOM_H */ diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs.h linux-2.6.32.24/include/linux/reiserfs_fs.h --- linux-2.6.32.24/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/reiserfs_fs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/reiserfs_fs.h 2010-10-23 19:59:20.000000000 -0400 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -47919,7 +48249,7 @@ diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs.h linux-2.6.32.24/include/l #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs_sb.h linux-2.6.32.24/include/linux/reiserfs_fs_sb.h --- linux-2.6.32.24/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/reiserfs_fs_sb.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/reiserfs_fs_sb.h 2010-10-23 19:59:20.000000000 -0400 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -47931,7 +48261,7 @@ diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs_sb.h linux-2.6.32.24/includ on-disk FS format */ diff -urNp linux-2.6.32.24/include/linux/sched.h linux-2.6.32.24/include/linux/sched.h --- linux-2.6.32.24/include/linux/sched.h 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/include/linux/sched.h 2010-09-20 17:27:30.000000000 -0400 ++++ linux-2.6.32.24/include/linux/sched.h 2010-10-23 19:59:20.000000000 -0400 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -48147,7 +48477,7 @@ diff -urNp linux-2.6.32.24/include/linux/sched.h linux-2.6.32.24/include/linux/s #ifdef CONFIG_DEBUG_STACK_USAGE diff -urNp linux-2.6.32.24/include/linux/screen_info.h linux-2.6.32.24/include/linux/screen_info.h --- linux-2.6.32.24/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/screen_info.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/screen_info.h 2010-10-23 19:59:20.000000000 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -48160,7 +48490,7 @@ diff -urNp linux-2.6.32.24/include/linux/screen_info.h linux-2.6.32.24/include/l #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ diff -urNp linux-2.6.32.24/include/linux/security.h linux-2.6.32.24/include/linux/security.h --- linux-2.6.32.24/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/security.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/security.h 2010-10-23 19:59:20.000000000 -0400 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -48171,7 +48501,7 @@ diff -urNp linux-2.6.32.24/include/linux/security.h linux-2.6.32.24/include/linu /* Maximum number of letters for an LSM name string */ diff -urNp linux-2.6.32.24/include/linux/shm.h linux-2.6.32.24/include/linux/shm.h --- linux-2.6.32.24/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/shm.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/shm.h 2010-10-23 19:59:20.000000000 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -48185,7 +48515,7 @@ diff -urNp linux-2.6.32.24/include/linux/shm.h linux-2.6.32.24/include/linux/shm /* shm_mode upper byte flags */ diff -urNp linux-2.6.32.24/include/linux/slab.h linux-2.6.32.24/include/linux/slab.h --- linux-2.6.32.24/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/slab.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/slab.h 2010-10-23 19:59:20.000000000 -0400 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -48259,7 +48589,7 @@ diff -urNp linux-2.6.32.24/include/linux/slab.h linux-2.6.32.24/include/linux/sl #endif /* _LINUX_SLAB_H */ diff -urNp linux-2.6.32.24/include/linux/slub_def.h linux-2.6.32.24/include/linux/slub_def.h --- linux-2.6.32.24/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/slub_def.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/slub_def.h 2010-10-23 19:59:20.000000000 -0400 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -48271,7 +48601,7 @@ diff -urNp linux-2.6.32.24/include/linux/slub_def.h linux-2.6.32.24/include/linu int align; /* Alignment */ diff -urNp linux-2.6.32.24/include/linux/sonet.h linux-2.6.32.24/include/linux/sonet.h --- linux-2.6.32.24/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/sonet.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/sonet.h 2010-10-23 19:59:20.000000000 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -48283,7 +48613,7 @@ diff -urNp linux-2.6.32.24/include/linux/sonet.h linux-2.6.32.24/include/linux/s }; diff -urNp linux-2.6.32.24/include/linux/suspend.h linux-2.6.32.24/include/linux/suspend.h --- linux-2.6.32.24/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/suspend.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/suspend.h 2010-10-23 19:59:20.000000000 -0400 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -48374,7 +48704,7 @@ diff -urNp linux-2.6.32.24/include/linux/suspend.h linux-2.6.32.24/include/linux #endif /* CONFIG_HIBERNATION */ diff -urNp linux-2.6.32.24/include/linux/sysctl.h linux-2.6.32.24/include/linux/sysctl.h --- linux-2.6.32.24/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/sysctl.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/sysctl.h 2010-10-23 19:59:20.000000000 -0400 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -48390,7 +48720,7 @@ diff -urNp linux-2.6.32.24/include/linux/sysctl.h linux-2.6.32.24/include/linux/ enum diff -urNp linux-2.6.32.24/include/linux/sysfs.h linux-2.6.32.24/include/linux/sysfs.h --- linux-2.6.32.24/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/sysfs.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/sysfs.h 2010-10-23 19:59:20.000000000 -0400 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -48404,7 +48734,7 @@ diff -urNp linux-2.6.32.24/include/linux/sysfs.h linux-2.6.32.24/include/linux/s struct sysfs_dirent; diff -urNp linux-2.6.32.24/include/linux/thread_info.h linux-2.6.32.24/include/linux/thread_info.h --- linux-2.6.32.24/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/thread_info.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/thread_info.h 2010-10-23 19:59:20.000000000 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -48416,7 +48746,7 @@ diff -urNp linux-2.6.32.24/include/linux/thread_info.h linux-2.6.32.24/include/l u32 bitset; diff -urNp linux-2.6.32.24/include/linux/tty.h linux-2.6.32.24/include/linux/tty.h --- linux-2.6.32.24/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/tty.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/tty.h 2010-10-23 19:59:20.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -48454,7 +48784,7 @@ diff -urNp linux-2.6.32.24/include/linux/tty.h linux-2.6.32.24/include/linux/tty extern struct tty_ldisc_ops tty_ldisc_N_TTY; diff -urNp linux-2.6.32.24/include/linux/tty_ldisc.h linux-2.6.32.24/include/linux/tty_ldisc.h --- linux-2.6.32.24/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/tty_ldisc.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/tty_ldisc.h 2010-10-23 19:59:20.000000000 -0400 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -48466,7 +48796,7 @@ diff -urNp linux-2.6.32.24/include/linux/tty_ldisc.h linux-2.6.32.24/include/lin struct tty_ldisc { diff -urNp linux-2.6.32.24/include/linux/types.h linux-2.6.32.24/include/linux/types.h --- linux-2.6.32.24/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/types.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/types.h 2010-10-23 19:59:20.000000000 -0400 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -48496,7 +48826,7 @@ diff -urNp linux-2.6.32.24/include/linux/types.h linux-2.6.32.24/include/linux/t struct ustat { diff -urNp linux-2.6.32.24/include/linux/uaccess.h linux-2.6.32.24/include/linux/uaccess.h --- linux-2.6.32.24/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/uaccess.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/uaccess.h 2010-10-23 19:59:20.000000000 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -48530,7 +48860,7 @@ diff -urNp linux-2.6.32.24/include/linux/uaccess.h linux-2.6.32.24/include/linux #endif /* __LINUX_UACCESS_H__ */ diff -urNp linux-2.6.32.24/include/linux/vmalloc.h linux-2.6.32.24/include/linux/vmalloc.h --- linux-2.6.32.24/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/linux/vmalloc.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/linux/vmalloc.h 2010-10-23 19:59:20.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 */ @@ -48627,7 +48957,7 @@ diff -urNp linux-2.6.32.24/include/linux/vmalloc.h linux-2.6.32.24/include/linux #endif /* _LINUX_VMALLOC_H */ diff -urNp linux-2.6.32.24/include/linux/vmstat.h linux-2.6.32.24/include/linux/vmstat.h --- linux-2.6.32.24/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/include/linux/vmstat.h 2010-09-26 22:01:38.000000000 -0400 ++++ linux-2.6.32.24/include/linux/vmstat.h 2010-10-23 19:59:20.000000000 -0400 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -48691,9 +49021,21 @@ diff -urNp linux-2.6.32.24/include/linux/vmstat.h linux-2.6.32.24/include/linux/ } static inline void __dec_zone_page_state(struct page *page, +diff -urNp linux-2.6.32.24/include/net/inetpeer.h linux-2.6.32.24/include/net/inetpeer.h +--- linux-2.6.32.24/include/net/inetpeer.h 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/include/net/inetpeer.h 2010-10-23 19:59:24.000000000 -0400 +@@ -24,7 +24,7 @@ struct inet_peer + __u32 dtime; /* the time of last use of not + * referenced entries */ + atomic_t refcnt; +- atomic_t rid; /* Frag reception counter */ ++ atomic_unchecked_t rid; /* Frag reception counter */ + __u32 tcp_ts; + unsigned long tcp_ts_stamp; + }; diff -urNp linux-2.6.32.24/include/net/irda/ircomm_tty.h linux-2.6.32.24/include/net/irda/ircomm_tty.h --- linux-2.6.32.24/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/net/irda/ircomm_tty.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/net/irda/ircomm_tty.h 2010-10-23 19:59:20.000000000 -0400 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -48707,7 +49049,7 @@ diff -urNp linux-2.6.32.24/include/net/irda/ircomm_tty.h linux-2.6.32.24/include * o self->open_count diff -urNp linux-2.6.32.24/include/net/neighbour.h linux-2.6.32.24/include/net/neighbour.h --- linux-2.6.32.24/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/net/neighbour.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/net/neighbour.h 2010-10-23 19:59:20.000000000 -0400 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -48729,7 +49071,7 @@ diff -urNp linux-2.6.32.24/include/net/neighbour.h linux-2.6.32.24/include/net/n struct pneigh_entry diff -urNp linux-2.6.32.24/include/net/sctp/sctp.h linux-2.6.32.24/include/net/sctp/sctp.h --- linux-2.6.32.24/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/net/sctp/sctp.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/net/sctp/sctp.h 2010-10-23 19:59:20.000000000 -0400 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -48743,7 +49085,7 @@ diff -urNp linux-2.6.32.24/include/net/sctp/sctp.h linux-2.6.32.24/include/net/s #define SCTP_ASSERT(expr, str, func) diff -urNp linux-2.6.32.24/include/net/tcp.h linux-2.6.32.24/include/net/tcp.h --- linux-2.6.32.24/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/include/net/tcp.h 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/include/net/tcp.h 2010-10-23 19:59:20.000000000 -0400 @@ -1444,6 +1444,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -48754,7 +49096,7 @@ diff -urNp linux-2.6.32.24/include/net/tcp.h linux-2.6.32.24/include/net/tcp.h }; diff -urNp linux-2.6.32.24/include/net/udp.h linux-2.6.32.24/include/net/udp.h --- linux-2.6.32.24/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/net/udp.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/net/udp.h 2010-10-23 19:59:20.000000000 -0400 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -48765,7 +49107,7 @@ diff -urNp linux-2.6.32.24/include/net/udp.h linux-2.6.32.24/include/net/udp.h }; diff -urNp linux-2.6.32.24/include/sound/ac97_codec.h linux-2.6.32.24/include/sound/ac97_codec.h --- linux-2.6.32.24/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/sound/ac97_codec.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/sound/ac97_codec.h 2010-10-23 19:59:20.000000000 -0400 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -48800,7 +49142,7 @@ diff -urNp linux-2.6.32.24/include/sound/ac97_codec.h linux-2.6.32.24/include/so /* --- */ diff -urNp linux-2.6.32.24/include/trace/events/irq.h linux-2.6.32.24/include/trace/events/irq.h --- linux-2.6.32.24/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/trace/events/irq.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/trace/events/irq.h 2010-10-23 19:59:20.000000000 -0400 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -48839,7 +49181,7 @@ diff -urNp linux-2.6.32.24/include/trace/events/irq.h linux-2.6.32.24/include/tr diff -urNp linux-2.6.32.24/include/video/uvesafb.h linux-2.6.32.24/include/video/uvesafb.h --- linux-2.6.32.24/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/include/video/uvesafb.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/include/video/uvesafb.h 2010-10-23 19:59:20.000000000 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -48850,7 +49192,7 @@ diff -urNp linux-2.6.32.24/include/video/uvesafb.h linux-2.6.32.24/include/video u8 *vbe_state_orig; /* diff -urNp linux-2.6.32.24/init/do_mounts.c linux-2.6.32.24/init/do_mounts.c --- linux-2.6.32.24/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/do_mounts.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/do_mounts.c 2010-10-23 19:59:20.000000000 -0400 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -48898,7 +49240,7 @@ diff -urNp linux-2.6.32.24/init/do_mounts.c linux-2.6.32.24/init/do_mounts.c } diff -urNp linux-2.6.32.24/init/do_mounts.h linux-2.6.32.24/init/do_mounts.h --- linux-2.6.32.24/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/do_mounts.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/do_mounts.h 2010-10-23 19:59:20.000000000 -0400 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -48920,7 +49262,7 @@ diff -urNp linux-2.6.32.24/init/do_mounts.h linux-2.6.32.24/init/do_mounts.h return 0; diff -urNp linux-2.6.32.24/init/do_mounts_initrd.c linux-2.6.32.24/init/do_mounts_initrd.c --- linux-2.6.32.24/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/do_mounts_initrd.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/do_mounts_initrd.c 2010-10-23 19:59:20.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); @@ -49006,7 +49348,7 @@ diff -urNp linux-2.6.32.24/init/do_mounts_initrd.c linux-2.6.32.24/init/do_mount } diff -urNp linux-2.6.32.24/init/do_mounts_md.c linux-2.6.32.24/init/do_mounts_md.c --- linux-2.6.32.24/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/do_mounts_md.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/do_mounts_md.c 2010-10-23 19:59:20.000000000 -0400 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -49036,7 +49378,7 @@ diff -urNp linux-2.6.32.24/init/do_mounts_md.c linux-2.6.32.24/init/do_mounts_md sys_close(fd); diff -urNp linux-2.6.32.24/init/initramfs.c linux-2.6.32.24/init/initramfs.c --- linux-2.6.32.24/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/initramfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/initramfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -49147,7 +49489,7 @@ diff -urNp linux-2.6.32.24/init/initramfs.c linux-2.6.32.24/init/initramfs.c return 0; diff -urNp linux-2.6.32.24/init/Kconfig linux-2.6.32.24/init/Kconfig --- linux-2.6.32.24/init/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/Kconfig 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/Kconfig 2010-10-23 19:59:20.000000000 -0400 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -49159,7 +49501,7 @@ diff -urNp linux-2.6.32.24/init/Kconfig linux-2.6.32.24/init/Kconfig also breaks ancient binaries (including anything libc5 based). diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c --- linux-2.6.32.24/init/main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/main.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/main.c 2010-10-23 19:59:24.000000000 -0400 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -49168,7 +49510,7 @@ diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c enum system_states system_state __read_mostly; EXPORT_SYMBOL(system_state); -@@ -183,6 +184,50 @@ static int __init set_reset_devices(char +@@ -183,6 +184,47 @@ static int __init set_reset_devices(char __setup("reset_devices", set_reset_devices); @@ -49192,11 +49534,8 @@ diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c + asm("mov %0, %%es" : : "r" (__KERNEL_DS) : "memory"); + asm("mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory"); +#else -+ char *p; -+ p = (char *)pax_enter_kernel_user; -+ *p = 0xc3; -+ p = (char *)pax_exit_kernel_user; -+ *p = 0xc3; ++ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1); ++ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1); + clone_pgd_mask = ~(pgdval_t)0UL; +#endif + @@ -49219,7 +49558,7 @@ diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; -@@ -697,52 +742,53 @@ int initcall_debug; +@@ -697,52 +739,53 @@ int initcall_debug; core_param(initcall_debug, initcall_debug, bool, 0644); static char msgbuf[64]; @@ -49289,7 +49628,7 @@ diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c } -@@ -881,11 +927,13 @@ static int __init kernel_init(void * unu +@@ -881,11 +924,13 @@ static int __init kernel_init(void * unu if (!ramdisk_execute_command) ramdisk_execute_command = "/init"; @@ -49306,7 +49645,7 @@ diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c * we're essentially up and running. Get rid of the diff -urNp linux-2.6.32.24/init/noinitramfs.c linux-2.6.32.24/init/noinitramfs.c --- linux-2.6.32.24/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/init/noinitramfs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/init/noinitramfs.c 2010-10-23 19:59:20.000000000 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -49327,7 +49666,7 @@ diff -urNp linux-2.6.32.24/init/noinitramfs.c linux-2.6.32.24/init/noinitramfs.c diff -urNp linux-2.6.32.24/ipc/compat.c linux-2.6.32.24/ipc/compat.c --- linux-2.6.32.24/ipc/compat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/compat.c 2010-10-10 16:05:38.000000000 -0400 ++++ linux-2.6.32.24/ipc/compat.c 2010-10-23 19:59:20.000000000 -0400 @@ -242,6 +242,8 @@ long compat_sys_semctl(int first, int se struct semid64_ds __user *up64; int version = compat_ipc_parse_version(&third); @@ -49357,7 +49696,7 @@ diff -urNp linux-2.6.32.24/ipc/compat.c linux-2.6.32.24/ipc/compat.c case SHM_LOCK: diff -urNp linux-2.6.32.24/ipc/compat_mq.c linux-2.6.32.24/ipc/compat_mq.c --- linux-2.6.32.24/ipc/compat_mq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/compat_mq.c 2010-10-10 16:06:07.000000000 -0400 ++++ linux-2.6.32.24/ipc/compat_mq.c 2010-10-23 19:59:20.000000000 -0400 @@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const void __user *p = NULL; if (u_attr && oflag & O_CREAT) { @@ -49379,7 +49718,7 @@ diff -urNp linux-2.6.32.24/ipc/compat_mq.c linux-2.6.32.24/ipc/compat_mq.c copy_to_user(p, &mqstat, sizeof(mqstat))) diff -urNp linux-2.6.32.24/ipc/ipc_sysctl.c linux-2.6.32.24/ipc/ipc_sysctl.c --- linux-2.6.32.24/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/ipc_sysctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/ipc/ipc_sysctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -49400,7 +49739,7 @@ diff -urNp linux-2.6.32.24/ipc/ipc_sysctl.c linux-2.6.32.24/ipc/ipc_sysctl.c static int __init ipc_sysctl_init(void) diff -urNp linux-2.6.32.24/ipc/mqueue.c linux-2.6.32.24/ipc/mqueue.c --- linux-2.6.32.24/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/mqueue.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/ipc/mqueue.c 2010-10-23 19:59:20.000000000 -0400 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -49411,7 +49750,7 @@ diff -urNp linux-2.6.32.24/ipc/mqueue.c linux-2.6.32.24/ipc/mqueue.c u->mq_bytes + mq_bytes > diff -urNp linux-2.6.32.24/ipc/sem.c linux-2.6.32.24/ipc/sem.c --- linux-2.6.32.24/ipc/sem.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/sem.c 2010-09-28 18:24:37.000000000 -0400 ++++ linux-2.6.32.24/ipc/sem.c 2010-10-23 19:59:20.000000000 -0400 @@ -560,6 +560,8 @@ static unsigned long copy_semid_to_user( { struct semid_ds out; @@ -49423,7 +49762,7 @@ diff -urNp linux-2.6.32.24/ipc/sem.c linux-2.6.32.24/ipc/sem.c out.sem_otime = in->sem_otime; diff -urNp linux-2.6.32.24/ipc/shm.c linux-2.6.32.24/ipc/shm.c --- linux-2.6.32.24/ipc/shm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/ipc/shm.c 2010-10-10 16:04:50.000000000 -0400 ++++ linux-2.6.32.24/ipc/shm.c 2010-10-23 19:59:20.000000000 -0400 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -49487,7 +49826,7 @@ diff -urNp linux-2.6.32.24/ipc/shm.c linux-2.6.32.24/ipc/shm.c diff -urNp linux-2.6.32.24/kernel/acct.c linux-2.6.32.24/kernel/acct.c --- linux-2.6.32.24/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/acct.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/acct.c 2010-10-23 19:59:20.000000000 -0400 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -49499,7 +49838,7 @@ diff -urNp linux-2.6.32.24/kernel/acct.c linux-2.6.32.24/kernel/acct.c set_fs(fs); diff -urNp linux-2.6.32.24/kernel/capability.c linux-2.6.32.24/kernel/capability.c --- linux-2.6.32.24/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/capability.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/capability.c 2010-10-23 19:59:20.000000000 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -49525,7 +49864,7 @@ diff -urNp linux-2.6.32.24/kernel/capability.c linux-2.6.32.24/kernel/capability +EXPORT_SYMBOL(capable_nolog); diff -urNp linux-2.6.32.24/kernel/configs.c linux-2.6.32.24/kernel/configs.c --- linux-2.6.32.24/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/configs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/configs.c 2010-10-23 19:59:20.000000000 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -49548,7 +49887,7 @@ diff -urNp linux-2.6.32.24/kernel/configs.c linux-2.6.32.24/kernel/configs.c diff -urNp linux-2.6.32.24/kernel/cpu.c linux-2.6.32.24/kernel/cpu.c --- linux-2.6.32.24/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/kernel/cpu.c 2010-09-20 17:27:30.000000000 -0400 ++++ linux-2.6.32.24/kernel/cpu.c 2010-10-23 19:59:20.000000000 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -49560,7 +49899,7 @@ diff -urNp linux-2.6.32.24/kernel/cpu.c linux-2.6.32.24/kernel/cpu.c * Should always be manipulated under cpu_add_remove_lock diff -urNp linux-2.6.32.24/kernel/cred.c linux-2.6.32.24/kernel/cred.c --- linux-2.6.32.24/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/cred.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/cred.c 2010-10-23 19:59:20.000000000 -0400 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -49572,7 +49911,7 @@ diff -urNp linux-2.6.32.24/kernel/cred.c linux-2.6.32.24/kernel/cred.c old->egid != new->egid || diff -urNp linux-2.6.32.24/kernel/exit.c linux-2.6.32.24/kernel/exit.c --- linux-2.6.32.24/kernel/exit.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/kernel/exit.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/kernel/exit.c 2010-10-23 19:59:20.000000000 -0400 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -49664,7 +50003,7 @@ diff -urNp linux-2.6.32.24/kernel/exit.c linux-2.6.32.24/kernel/exit.c read_unlock(&tasklist_lock); diff -urNp linux-2.6.32.24/kernel/fork.c linux-2.6.32.24/kernel/fork.c --- linux-2.6.32.24/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/kernel/fork.c 2010-09-20 17:27:30.000000000 -0400 ++++ linux-2.6.32.24/kernel/fork.c 2010-10-23 19:59:20.000000000 -0400 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -49805,7 +50144,7 @@ diff -urNp linux-2.6.32.24/kernel/fork.c linux-2.6.32.24/kernel/fork.c new_fs = fs; diff -urNp linux-2.6.32.24/kernel/futex.c linux-2.6.32.24/kernel/futex.c --- linux-2.6.32.24/kernel/futex.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/futex.c 2010-09-17 17:43:01.000000000 -0400 ++++ linux-2.6.32.24/kernel/futex.c 2010-10-23 19:59:20.000000000 -0400 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -49873,7 +50212,7 @@ diff -urNp linux-2.6.32.24/kernel/futex.c linux-2.6.32.24/kernel/futex.c diff -urNp linux-2.6.32.24/kernel/futex_compat.c linux-2.6.32.24/kernel/futex_compat.c --- linux-2.6.32.24/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/futex_compat.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/futex_compat.c 2010-10-23 19:59:20.000000000 -0400 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -49913,7 +50252,7 @@ diff -urNp linux-2.6.32.24/kernel/futex_compat.c linux-2.6.32.24/kernel/futex_co } diff -urNp linux-2.6.32.24/kernel/gcov/base.c linux-2.6.32.24/kernel/gcov/base.c --- linux-2.6.32.24/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/gcov/base.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/gcov/base.c 2010-10-23 19:59:20.000000000 -0400 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -49937,7 +50276,7 @@ diff -urNp linux-2.6.32.24/kernel/gcov/base.c linux-2.6.32.24/kernel/gcov/base.c else diff -urNp linux-2.6.32.24/kernel/hrtimer.c linux-2.6.32.24/kernel/hrtimer.c --- linux-2.6.32.24/kernel/hrtimer.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/hrtimer.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/hrtimer.c 2010-10-23 19:59:20.000000000 -0400 @@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -49949,7 +50288,7 @@ diff -urNp linux-2.6.32.24/kernel/hrtimer.c linux-2.6.32.24/kernel/hrtimer.c } diff -urNp linux-2.6.32.24/kernel/kallsyms.c linux-2.6.32.24/kernel/kallsyms.c --- linux-2.6.32.24/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/kallsyms.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/kallsyms.c 2010-10-23 19:59:20.000000000 -0400 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -50054,7 +50393,7 @@ diff -urNp linux-2.6.32.24/kernel/kallsyms.c linux-2.6.32.24/kernel/kallsyms.c reset_iter(iter, 0); diff -urNp linux-2.6.32.24/kernel/kgdb.c linux-2.6.32.24/kernel/kgdb.c --- linux-2.6.32.24/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/kgdb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/kgdb.c 2010-10-23 19:59:20.000000000 -0400 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -50084,7 +50423,7 @@ diff -urNp linux-2.6.32.24/kernel/kgdb.c linux-2.6.32.24/kernel/kgdb.c diff -urNp linux-2.6.32.24/kernel/kmod.c linux-2.6.32.24/kernel/kmod.c --- linux-2.6.32.24/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/kmod.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/kmod.c 2010-10-23 19:59:20.000000000 -0400 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -50106,7 +50445,7 @@ diff -urNp linux-2.6.32.24/kernel/kmod.c linux-2.6.32.24/kernel/kmod.c * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method diff -urNp linux-2.6.32.24/kernel/kprobes.c linux-2.6.32.24/kernel/kprobes.c --- linux-2.6.32.24/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/kprobes.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/kprobes.c 2010-10-23 19:59:20.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. @@ -50145,7 +50484,7 @@ diff -urNp linux-2.6.32.24/kernel/kprobes.c linux-2.6.32.24/kernel/kprobes.c preempt_disable(); diff -urNp linux-2.6.32.24/kernel/lockdep.c linux-2.6.32.24/kernel/lockdep.c --- linux-2.6.32.24/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/lockdep.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/lockdep.c 2010-10-23 19:59:20.000000000 -0400 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -50177,7 +50516,7 @@ diff -urNp linux-2.6.32.24/kernel/lockdep.c linux-2.6.32.24/kernel/lockdep.c dump_stack(); diff -urNp linux-2.6.32.24/kernel/lockdep_proc.c linux-2.6.32.24/kernel/lockdep_proc.c --- linux-2.6.32.24/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/lockdep_proc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/lockdep_proc.c 2010-10-23 19:59:20.000000000 -0400 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v static void print_name(struct seq_file *m, struct lock_class *class) @@ -50189,7 +50528,7 @@ diff -urNp linux-2.6.32.24/kernel/lockdep_proc.c linux-2.6.32.24/kernel/lockdep_ if (!name) { diff -urNp linux-2.6.32.24/kernel/module.c linux-2.6.32.24/kernel/module.c --- linux-2.6.32.24/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/module.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/module.c 2010-10-23 19:59:20.000000000 -0400 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -50731,7 +51070,7 @@ diff -urNp linux-2.6.32.24/kernel/module.c linux-2.6.32.24/kernel/module.c return mod; diff -urNp linux-2.6.32.24/kernel/panic.c linux-2.6.32.24/kernel/panic.c --- linux-2.6.32.24/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/panic.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/panic.c 2010-10-23 19:59:20.000000000 -0400 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) @@ -50744,7 +51083,7 @@ diff -urNp linux-2.6.32.24/kernel/panic.c linux-2.6.32.24/kernel/panic.c EXPORT_SYMBOL(__stack_chk_fail); diff -urNp linux-2.6.32.24/kernel/params.c linux-2.6.32.24/kernel/params.c --- linux-2.6.32.24/kernel/params.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/params.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/params.c 2010-10-23 19:59:20.000000000 -0400 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -50765,7 +51104,7 @@ diff -urNp linux-2.6.32.24/kernel/params.c linux-2.6.32.24/kernel/params.c diff -urNp linux-2.6.32.24/kernel/pid.c linux-2.6.32.24/kernel/pid.c --- linux-2.6.32.24/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/pid.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/pid.c 2010-10-23 19:59:20.000000000 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -50801,7 +51140,7 @@ diff -urNp linux-2.6.32.24/kernel/pid.c linux-2.6.32.24/kernel/pid.c struct task_struct *find_task_by_vpid(pid_t vnr) diff -urNp linux-2.6.32.24/kernel/posix-cpu-timers.c linux-2.6.32.24/kernel/posix-cpu-timers.c --- linux-2.6.32.24/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/posix-cpu-timers.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/posix-cpu-timers.c 2010-10-23 19:59:20.000000000 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -50828,7 +51167,7 @@ diff -urNp linux-2.6.32.24/kernel/posix-cpu-timers.c linux-2.6.32.24/kernel/posi * At the hard limit, we just die. diff -urNp linux-2.6.32.24/kernel/power/hibernate.c linux-2.6.32.24/kernel/power/hibernate.c --- linux-2.6.32.24/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/power/hibernate.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/power/hibernate.c 2010-10-23 19:59:20.000000000 -0400 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -50848,7 +51187,7 @@ diff -urNp linux-2.6.32.24/kernel/power/hibernate.c linux-2.6.32.24/kernel/power && ops->prepare && ops->finish && ops->enter && ops->pre_restore diff -urNp linux-2.6.32.24/kernel/power/poweroff.c linux-2.6.32.24/kernel/power/poweroff.c --- linux-2.6.32.24/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/power/poweroff.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/power/poweroff.c 2010-10-23 19:59:20.000000000 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -50860,7 +51199,7 @@ diff -urNp linux-2.6.32.24/kernel/power/poweroff.c linux-2.6.32.24/kernel/power/ return 0; diff -urNp linux-2.6.32.24/kernel/power/process.c linux-2.6.32.24/kernel/power/process.c --- linux-2.6.32.24/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/power/process.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/power/process.c 2010-10-23 19:59:20.000000000 -0400 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -50902,7 +51241,7 @@ diff -urNp linux-2.6.32.24/kernel/power/process.c linux-2.6.32.24/kernel/power/p elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); diff -urNp linux-2.6.32.24/kernel/power/suspend.c linux-2.6.32.24/kernel/power/suspend.c --- linux-2.6.32.24/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/power/suspend.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/power/suspend.c 2010-10-23 19:59:20.000000000 -0400 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -50921,7 +51260,7 @@ diff -urNp linux-2.6.32.24/kernel/power/suspend.c linux-2.6.32.24/kernel/power/s suspend_ops = ops; diff -urNp linux-2.6.32.24/kernel/printk.c linux-2.6.32.24/kernel/printk.c --- linux-2.6.32.24/kernel/printk.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/printk.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/printk.c 2010-10-23 19:59:20.000000000 -0400 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -50936,7 +51275,7 @@ diff -urNp linux-2.6.32.24/kernel/printk.c linux-2.6.32.24/kernel/printk.c return error; diff -urNp linux-2.6.32.24/kernel/ptrace.c linux-2.6.32.24/kernel/ptrace.c --- linux-2.6.32.24/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/ptrace.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/ptrace.c 2010-10-23 19:59:20.000000000 -0400 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -51020,7 +51359,7 @@ diff -urNp linux-2.6.32.24/kernel/ptrace.c linux-2.6.32.24/kernel/ptrace.c int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) diff -urNp linux-2.6.32.24/kernel/rcutree.c linux-2.6.32.24/kernel/rcutree.c --- linux-2.6.32.24/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/rcutree.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/rcutree.c 2010-10-23 19:59:20.000000000 -0400 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -51032,7 +51371,7 @@ diff -urNp linux-2.6.32.24/kernel/rcutree.c linux-2.6.32.24/kernel/rcutree.c * Memory references from any prior RCU read-side critical sections diff -urNp linux-2.6.32.24/kernel/relay.c linux-2.6.32.24/kernel/relay.c --- linux-2.6.32.24/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/relay.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/relay.c 2010-10-23 19:59:20.000000000 -0400 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi unsigned int flags, int *nonpad_ret) @@ -51052,7 +51391,7 @@ diff -urNp linux-2.6.32.24/kernel/relay.c linux-2.6.32.24/kernel/relay.c return 0; diff -urNp linux-2.6.32.24/kernel/resource.c linux-2.6.32.24/kernel/resource.c --- linux-2.6.32.24/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/resource.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/resource.c 2010-10-23 19:59:20.000000000 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -51072,9 +51411,21 @@ diff -urNp linux-2.6.32.24/kernel/resource.c linux-2.6.32.24/kernel/resource.c return 0; } __initcall(ioresources_init); +diff -urNp linux-2.6.32.24/kernel/rtmutex.c linux-2.6.32.24/kernel/rtmutex.c +--- linux-2.6.32.24/kernel/rtmutex.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/kernel/rtmutex.c 2010-10-23 19:59:24.000000000 -0400 +@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt + */ + spin_lock_irqsave(&pendowner->pi_lock, flags); + +- WARN_ON(!pendowner->pi_blocked_on); ++ BUG_ON(!pendowner->pi_blocked_on); + WARN_ON(pendowner->pi_blocked_on != waiter); + WARN_ON(pendowner->pi_blocked_on->lock != lock); + diff -urNp linux-2.6.32.24/kernel/sched.c linux-2.6.32.24/kernel/sched.c --- linux-2.6.32.24/kernel/sched.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/kernel/sched.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/kernel/sched.c 2010-10-23 19:59:24.000000000 -0400 @@ -4905,7 +4905,7 @@ out: * In CONFIG_NO_HZ case, the idle load balance owner will do the * rebalancing for all the cpus for whom scheduler ticks are stopped. @@ -51121,9 +51472,18 @@ diff -urNp linux-2.6.32.24/kernel/sched.c linux-2.6.32.24/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) +@@ -8629,7 +8632,7 @@ static void init_sched_groups_power(int + long power; + int weight; + +- WARN_ON(!sd || !sd->groups); ++ BUG_ON(!sd || !sd->groups); + + if (cpu != group_first_cpu(sd->groups)) + return; diff -urNp linux-2.6.32.24/kernel/signal.c linux-2.6.32.24/kernel/signal.c --- linux-2.6.32.24/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/signal.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/signal.c 2010-10-23 19:59:20.000000000 -0400 @@ -41,12 +41,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -51211,7 +51571,7 @@ diff -urNp linux-2.6.32.24/kernel/signal.c linux-2.6.32.24/kernel/signal.c } diff -urNp linux-2.6.32.24/kernel/smp.c linux-2.6.32.24/kernel/smp.c --- linux-2.6.32.24/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/smp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/smp.c 2010-10-23 19:59:20.000000000 -0400 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -51241,7 +51601,7 @@ diff -urNp linux-2.6.32.24/kernel/smp.c linux-2.6.32.24/kernel/smp.c } diff -urNp linux-2.6.32.24/kernel/softirq.c linux-2.6.32.24/kernel/softirq.c --- linux-2.6.32.24/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/softirq.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/softirq.c 2010-10-23 19:59:20.000000000 -0400 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -51298,7 +51658,7 @@ diff -urNp linux-2.6.32.24/kernel/softirq.c linux-2.6.32.24/kernel/softirq.c diff -urNp linux-2.6.32.24/kernel/sys.c linux-2.6.32.24/kernel/sys.c --- linux-2.6.32.24/kernel/sys.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/kernel/sys.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/kernel/sys.c 2010-10-23 19:59:20.000000000 -0400 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -51436,7 +51796,7 @@ diff -urNp linux-2.6.32.24/kernel/sys.c linux-2.6.32.24/kernel/sys.c } diff -urNp linux-2.6.32.24/kernel/sysctl.c linux-2.6.32.24/kernel/sysctl.c --- linux-2.6.32.24/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/sysctl.c 2010-10-10 15:59:01.000000000 -0400 ++++ linux-2.6.32.24/kernel/sysctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -51583,7 +51943,7 @@ diff -urNp linux-2.6.32.24/kernel/sysctl.c linux-2.6.32.24/kernel/sysctl.c char c; diff -urNp linux-2.6.32.24/kernel/taskstats.c linux-2.6.32.24/kernel/taskstats.c --- linux-2.6.32.24/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/taskstats.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/taskstats.c 2010-10-23 19:59:20.000000000 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -51609,7 +51969,7 @@ diff -urNp linux-2.6.32.24/kernel/taskstats.c linux-2.6.32.24/kernel/taskstats.c diff -urNp linux-2.6.32.24/kernel/time/tick-broadcast.c linux-2.6.32.24/kernel/time/tick-broadcast.c --- linux-2.6.32.24/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/time/tick-broadcast.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/time/tick-broadcast.c 2010-10-23 19:59:20.000000000 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -51621,7 +51981,7 @@ diff -urNp linux-2.6.32.24/kernel/time/tick-broadcast.c linux-2.6.32.24/kernel/t tick_broadcast_clear_oneshot(cpu); diff -urNp linux-2.6.32.24/kernel/time/timer_list.c linux-2.6.32.24/kernel/time/timer_list.c --- linux-2.6.32.24/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/time/timer_list.c 2010-09-14 22:29:01.000000000 -0400 ++++ linux-2.6.32.24/kernel/time/timer_list.c 2010-10-23 19:59:20.000000000 -0400 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, static void print_name_offset(struct seq_file *m, void *sym) @@ -51665,7 +52025,7 @@ diff -urNp linux-2.6.32.24/kernel/time/timer_list.c linux-2.6.32.24/kernel/time/ return 0; diff -urNp linux-2.6.32.24/kernel/time/timer_stats.c linux-2.6.32.24/kernel/time/timer_stats.c --- linux-2.6.32.24/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/time/timer_stats.c 2010-09-14 22:28:35.000000000 -0400 ++++ linux-2.6.32.24/kernel/time/timer_stats.c 2010-10-23 19:59:20.000000000 -0400 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time static void print_name_offset(struct seq_file *m, unsigned long addr) @@ -51697,7 +52057,7 @@ diff -urNp linux-2.6.32.24/kernel/time/timer_stats.c linux-2.6.32.24/kernel/time return 0; diff -urNp linux-2.6.32.24/kernel/time.c linux-2.6.32.24/kernel/time.c --- linux-2.6.32.24/kernel/time.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/time.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/time.c 2010-10-23 19:59:20.000000000 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -51737,7 +52097,7 @@ diff -urNp linux-2.6.32.24/kernel/time.c linux-2.6.32.24/kernel/time.c return (USEC_PER_SEC / HZ) * j; diff -urNp linux-2.6.32.24/kernel/timer.c linux-2.6.32.24/kernel/timer.c --- linux-2.6.32.24/kernel/timer.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/timer.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/timer.c 2010-10-23 19:59:20.000000000 -0400 @@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -51749,7 +52109,7 @@ diff -urNp linux-2.6.32.24/kernel/timer.c linux-2.6.32.24/kernel/timer.c diff -urNp linux-2.6.32.24/kernel/trace/ftrace.c linux-2.6.32.24/kernel/trace/ftrace.c --- linux-2.6.32.24/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/ftrace.c 2010-09-20 17:27:30.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/ftrace.c 2010-10-23 19:59:20.000000000 -0400 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -51773,7 +52133,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/ftrace.c linux-2.6.32.24/kernel/trace/ft /* diff -urNp linux-2.6.32.24/kernel/trace/ring_buffer.c linux-2.6.32.24/kernel/trace/ring_buffer.c --- linux-2.6.32.24/kernel/trace/ring_buffer.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/ring_buffer.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/ring_buffer.c 2010-10-23 19:59:20.000000000 -0400 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st * the reader page). But if the next page is a header page, * its flags will be non zero. @@ -51785,7 +52145,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/ring_buffer.c linux-2.6.32.24/kernel/tra { diff -urNp linux-2.6.32.24/kernel/trace/trace.c linux-2.6.32.24/kernel/trace/trace.c --- linux-2.6.32.24/kernel/trace/trace.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/trace.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/trace.c 2010-10-23 19:59:20.000000000 -0400 @@ -3808,10 +3808,9 @@ static const struct file_operations trac }; #endif @@ -51812,7 +52172,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/trace.c linux-2.6.32.24/kernel/trace/tra diff -urNp linux-2.6.32.24/kernel/trace/trace_events.c linux-2.6.32.24/kernel/trace/trace_events.c --- linux-2.6.32.24/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/trace_events.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/trace_events.c 2010-10-23 19:59:20.000000000 -0400 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -51824,7 +52184,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/trace_events.c linux-2.6.32.24/kernel/tr struct module *mod; diff -urNp linux-2.6.32.24/kernel/trace/trace_output.c linux-2.6.32.24/kernel/trace/trace_output.c --- linux-2.6.32.24/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/trace_output.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/trace_output.c 2010-10-23 19:59:20.000000000 -0400 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, return 0; p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -51836,7 +52196,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/trace_output.c linux-2.6.32.24/kernel/tr return 1; diff -urNp linux-2.6.32.24/kernel/trace/trace_stack.c linux-2.6.32.24/kernel/trace/trace_stack.c --- linux-2.6.32.24/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/trace/trace_stack.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/trace/trace_stack.c 2010-10-23 19:59:20.000000000 -0400 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -51848,7 +52208,7 @@ diff -urNp linux-2.6.32.24/kernel/trace/trace_stack.c linux-2.6.32.24/kernel/tra local_irq_save(flags); diff -urNp linux-2.6.32.24/kernel/utsname_sysctl.c linux-2.6.32.24/kernel/utsname_sysctl.c --- linux-2.6.32.24/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/kernel/utsname_sysctl.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/kernel/utsname_sysctl.c 2010-10-23 19:59:20.000000000 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -51869,7 +52229,7 @@ diff -urNp linux-2.6.32.24/kernel/utsname_sysctl.c linux-2.6.32.24/kernel/utsnam static int __init utsname_sysctl_init(void) diff -urNp linux-2.6.32.24/lib/bug.c linux-2.6.32.24/lib/bug.c --- linux-2.6.32.24/lib/bug.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/bug.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/bug.c 2010-10-23 19:59:20.000000000 -0400 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -51881,7 +52241,7 @@ diff -urNp linux-2.6.32.24/lib/bug.c linux-2.6.32.24/lib/bug.c diff -urNp linux-2.6.32.24/lib/debugobjects.c linux-2.6.32.24/lib/debugobjects.c --- linux-2.6.32.24/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/debugobjects.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/debugobjects.c 2010-10-23 19:59:20.000000000 -0400 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -51893,7 +52253,7 @@ diff -urNp linux-2.6.32.24/lib/debugobjects.c linux-2.6.32.24/lib/debugobjects.c diff -urNp linux-2.6.32.24/lib/dma-debug.c linux-2.6.32.24/lib/dma-debug.c --- linux-2.6.32.24/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/dma-debug.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/dma-debug.c 2010-10-23 19:59:20.000000000 -0400 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -51905,7 +52265,7 @@ diff -urNp linux-2.6.32.24/lib/dma-debug.c linux-2.6.32.24/lib/dma-debug.c } diff -urNp linux-2.6.32.24/lib/idr.c linux-2.6.32.24/lib/idr.c --- linux-2.6.32.24/lib/idr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/idr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/idr.c 2010-10-23 19:59:20.000000000 -0400 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -51917,7 +52277,7 @@ diff -urNp linux-2.6.32.24/lib/idr.c linux-2.6.32.24/lib/idr.c } diff -urNp linux-2.6.32.24/lib/inflate.c linux-2.6.32.24/lib/inflate.c --- linux-2.6.32.24/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/inflate.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/inflate.c 2010-10-23 19:59:20.000000000 -0400 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -51929,7 +52289,7 @@ diff -urNp linux-2.6.32.24/lib/inflate.c linux-2.6.32.24/lib/inflate.c diff -urNp linux-2.6.32.24/lib/Kconfig.debug linux-2.6.32.24/lib/Kconfig.debug --- linux-2.6.32.24/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/Kconfig.debug 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/Kconfig.debug 2010-10-23 19:59:20.000000000 -0400 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -51941,7 +52301,7 @@ diff -urNp linux-2.6.32.24/lib/Kconfig.debug linux-2.6.32.24/lib/Kconfig.debug to find out which userspace is blocking on what kernel operations. diff -urNp linux-2.6.32.24/lib/kobject.c linux-2.6.32.24/lib/kobject.c --- linux-2.6.32.24/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/kobject.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/kobject.c 2010-10-23 19:59:20.000000000 -0400 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -51971,7 +52331,7 @@ diff -urNp linux-2.6.32.24/lib/kobject.c linux-2.6.32.24/lib/kobject.c struct kset *kset; diff -urNp linux-2.6.32.24/lib/kobject_uevent.c linux-2.6.32.24/lib/kobject_uevent.c --- linux-2.6.32.24/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/kobject_uevent.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/kobject_uevent.c 2010-10-23 19:59:20.000000000 -0400 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -51981,9 +52341,21 @@ diff -urNp linux-2.6.32.24/lib/kobject_uevent.c linux-2.6.32.24/lib/kobject_ueve u64 seq; int i = 0; int retval = 0; +diff -urNp linux-2.6.32.24/lib/kref.c linux-2.6.32.24/lib/kref.c +--- linux-2.6.32.24/lib/kref.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/lib/kref.c 2010-10-23 19:59:24.000000000 -0400 +@@ -61,7 +61,7 @@ void kref_get(struct kref *kref) + */ + int kref_put(struct kref *kref, void (*release)(struct kref *kref)) + { +- WARN_ON(release == NULL); ++ BUG_ON(release == NULL); + WARN_ON(release == (void (*)(struct kref *))kfree); + + if (atomic_dec_and_test(&kref->refcount)) { diff -urNp linux-2.6.32.24/lib/parser.c linux-2.6.32.24/lib/parser.c --- linux-2.6.32.24/lib/parser.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/parser.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/parser.c 2010-10-23 19:59:20.000000000 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -51995,7 +52367,7 @@ diff -urNp linux-2.6.32.24/lib/parser.c linux-2.6.32.24/lib/parser.c memcpy(buf, s->from, s->to - s->from); diff -urNp linux-2.6.32.24/lib/radix-tree.c linux-2.6.32.24/lib/radix-tree.c --- linux-2.6.32.24/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/radix-tree.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/radix-tree.c 2010-10-23 19:59:20.000000000 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -52007,7 +52379,7 @@ diff -urNp linux-2.6.32.24/lib/radix-tree.c linux-2.6.32.24/lib/radix-tree.c { diff -urNp linux-2.6.32.24/lib/random32.c linux-2.6.32.24/lib/random32.c --- linux-2.6.32.24/lib/random32.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/random32.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/lib/random32.c 2010-10-23 19:59:20.000000000 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -52019,7 +52391,7 @@ diff -urNp linux-2.6.32.24/lib/random32.c linux-2.6.32.24/lib/random32.c /** diff -urNp linux-2.6.32.24/lib/vsprintf.c linux-2.6.32.24/lib/vsprintf.c --- linux-2.6.32.24/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/lib/vsprintf.c 2010-09-23 19:51:59.000000000 -0400 ++++ linux-2.6.32.24/lib/vsprintf.c 2010-10-23 19:59:20.000000000 -0400 @@ -551,7 +551,7 @@ static char *string(char *buf, char *end int len, i; @@ -52049,12 +52421,12 @@ diff -urNp linux-2.6.32.24/lib/vsprintf.c linux-2.6.32.24/lib/vsprintf.c memcpy(str, save_str, len + 1); diff -urNp linux-2.6.32.24/localversion-grsec linux-2.6.32.24/localversion-grsec --- linux-2.6.32.24/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/localversion-grsec 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/localversion-grsec 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1 @@ +-grsec diff -urNp linux-2.6.32.24/Makefile linux-2.6.32.24/Makefile --- linux-2.6.32.24/Makefile 2010-09-28 17:23:28.000000000 -0400 -+++ linux-2.6.32.24/Makefile 2010-09-28 17:23:43.000000000 -0400 ++++ linux-2.6.32.24/Makefile 2010-10-23 19:59:20.000000000 -0400 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -52077,7 +52449,7 @@ diff -urNp linux-2.6.32.24/Makefile linux-2.6.32.24/Makefile $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ diff -urNp linux-2.6.32.24/mm/filemap.c linux-2.6.32.24/mm/filemap.c --- linux-2.6.32.24/mm/filemap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/filemap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/filemap.c 2010-10-23 19:59:20.000000000 -0400 @@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -52097,7 +52469,7 @@ diff -urNp linux-2.6.32.24/mm/filemap.c linux-2.6.32.24/mm/filemap.c return -EFBIG; diff -urNp linux-2.6.32.24/mm/fremap.c linux-2.6.32.24/mm/fremap.c --- linux-2.6.32.24/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/fremap.c 2010-09-04 15:54:56.000000000 -0400 ++++ linux-2.6.32.24/mm/fremap.c 2010-10-23 19:59:20.000000000 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -52121,7 +52493,7 @@ diff -urNp linux-2.6.32.24/mm/fremap.c linux-2.6.32.24/mm/fremap.c } diff -urNp linux-2.6.32.24/mm/highmem.c linux-2.6.32.24/mm/highmem.c --- linux-2.6.32.24/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/highmem.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/highmem.c 2010-10-23 19:59:20.000000000 -0400 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -52149,7 +52521,7 @@ diff -urNp linux-2.6.32.24/mm/highmem.c linux-2.6.32.24/mm/highmem.c diff -urNp linux-2.6.32.24/mm/hugetlb.c linux-2.6.32.24/mm/hugetlb.c --- linux-2.6.32.24/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/hugetlb.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/hugetlb.c 2010-10-23 19:59:20.000000000 -0400 @@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -52231,7 +52603,7 @@ diff -urNp linux-2.6.32.24/mm/hugetlb.c linux-2.6.32.24/mm/hugetlb.c return VM_FAULT_OOM; diff -urNp linux-2.6.32.24/mm/Kconfig linux-2.6.32.24/mm/Kconfig --- linux-2.6.32.24/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/Kconfig 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/Kconfig 2010-10-23 19:59:20.000000000 -0400 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -52243,7 +52615,7 @@ diff -urNp linux-2.6.32.24/mm/Kconfig linux-2.6.32.24/mm/Kconfig from userspace allocation. Keeping a user from writing to low pages diff -urNp linux-2.6.32.24/mm/maccess.c linux-2.6.32.24/mm/maccess.c --- linux-2.6.32.24/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/maccess.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/maccess.c 2010-10-23 19:59:20.000000000 -0400 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -52264,7 +52636,7 @@ diff -urNp linux-2.6.32.24/mm/maccess.c linux-2.6.32.24/mm/maccess.c mm_segment_t old_fs = get_fs(); diff -urNp linux-2.6.32.24/mm/madvise.c linux-2.6.32.24/mm/madvise.c --- linux-2.6.32.24/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/madvise.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/madvise.c 2010-10-23 19:59:20.000000000 -0400 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -52343,7 +52715,7 @@ diff -urNp linux-2.6.32.24/mm/madvise.c linux-2.6.32.24/mm/madvise.c goto out; diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c --- linux-2.6.32.24/mm/memory.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/mm/memory.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/mm/memory.c 2010-10-23 19:59:24.000000000 -0400 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct return; @@ -52357,12 +52729,12 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c } static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, -@@ -220,8 +224,12 @@ static inline void free_pud_range(struct +@@ -219,9 +223,12 @@ static inline void free_pud_range(struct + if (end - 1 > ceiling - 1) return; - pud = pud_offset(pgd, start); -+ +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD) + pud = pud_offset(pgd, start); pgd_clear(pgd); pud_free_tlb(tlb, pud, start); +#endif @@ -52370,7 +52742,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c } /* -@@ -1251,10 +1259,10 @@ int __get_user_pages(struct task_struct +@@ -1251,10 +1258,10 @@ int __get_user_pages(struct task_struct (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); i = 0; @@ -52383,7 +52755,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c if (!vma && in_gate_area(tsk, start)) { unsigned long pg = start & PAGE_MASK; struct vm_area_struct *gate_vma = get_gate_vma(tsk); -@@ -1306,7 +1314,7 @@ int __get_user_pages(struct task_struct +@@ -1306,7 +1313,7 @@ int __get_user_pages(struct task_struct continue; } @@ -52392,7 +52764,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1381,7 +1389,7 @@ int __get_user_pages(struct task_struct +@@ -1381,7 +1388,7 @@ int __get_user_pages(struct task_struct start += PAGE_SIZE; nr_pages--; } while (nr_pages && start < vma->vm_end); @@ -52401,7 +52773,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c return i; } -@@ -1977,6 +1985,186 @@ static inline void cow_user_page(struct +@@ -1977,6 +1984,186 @@ static inline void cow_user_page(struct copy_user_highpage(dst, src, va, vma); } @@ -52588,7 +52960,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2156,6 +2344,12 @@ gotten: +@@ -2156,6 +2343,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -52601,7 +52973,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter(mm, file_rss); -@@ -2207,6 +2401,10 @@ gotten: +@@ -2207,6 +2400,10 @@ gotten: page_remove_rmap(old_page); } @@ -52612,7 +52984,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -2604,6 +2802,11 @@ static int do_swap_page(struct mm_struct +@@ -2604,6 +2801,11 @@ static int do_swap_page(struct mm_struct swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -52624,7 +52996,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c unlock_page(page); if (flags & FAULT_FLAG_WRITE) { -@@ -2615,6 +2818,11 @@ static int do_swap_page(struct mm_struct +@@ -2615,6 +2817,11 @@ static int do_swap_page(struct mm_struct /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, pte); @@ -52636,7 +53008,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -2630,40 +2838,6 @@ out_release: +@@ -2630,40 +2837,6 @@ out_release: } /* @@ -52677,7 +53049,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c * We enter with non-exclusive mmap_sem (to exclude vma changes, * but allow concurrent faults), and pte mapped but not yet locked. * We return with mmap_sem still held, but pte unmapped and unlocked. -@@ -2672,27 +2846,23 @@ static int do_anonymous_page(struct mm_s +@@ -2672,27 +2845,23 @@ static int do_anonymous_page(struct mm_s unsigned long address, pte_t *page_table, pmd_t *pmd, unsigned int flags) { @@ -52710,7 +53082,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c if (unlikely(anon_vma_prepare(vma))) goto oom; page = alloc_zeroed_user_highpage_movable(vma, address); -@@ -2711,6 +2881,11 @@ static int do_anonymous_page(struct mm_s +@@ -2711,6 +2880,11 @@ static int do_anonymous_page(struct mm_s if (!pte_none(*page_table)) goto release; @@ -52722,7 +53094,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c inc_mm_counter(mm, anon_rss); page_add_new_anon_rmap(page, vma, address); setpte: -@@ -2718,6 +2893,12 @@ setpte: +@@ -2718,6 +2892,12 @@ setpte: /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, entry); @@ -52735,7 +53107,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -2860,6 +3041,12 @@ static int __do_fault(struct mm_struct * +@@ -2860,6 +3040,12 @@ static int __do_fault(struct mm_struct * */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -52748,7 +53120,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -2879,6 +3066,14 @@ static int __do_fault(struct mm_struct * +@@ -2879,6 +3065,14 @@ static int __do_fault(struct mm_struct * /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, entry); @@ -52763,7 +53135,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -3026,6 +3221,12 @@ static inline int handle_pte_fault(struc +@@ -3026,6 +3220,12 @@ static inline int handle_pte_fault(struc if (flags & FAULT_FLAG_WRITE) flush_tlb_page(vma, address); } @@ -52776,7 +53148,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3042,6 +3243,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3042,6 +3242,10 @@ int handle_mm_fault(struct mm_struct *mm pmd_t *pmd; pte_t *pte; @@ -52787,7 +53159,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -3049,6 +3254,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3049,6 +3253,34 @@ int handle_mm_fault(struct mm_struct *mm if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -52822,7 +53194,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); if (!pud) -@@ -3146,7 +3379,7 @@ static int __init gate_vma_init(void) +@@ -3146,7 +3378,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -52833,7 +53205,7 @@ diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c * Dumping its contents makes post-mortem fully interpretable later diff -urNp linux-2.6.32.24/mm/memory-failure.c linux-2.6.32.24/mm/memory-failure.c --- linux-2.6.32.24/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/memory-failure.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/memory-failure.c 2010-10-23 19:59:20.000000000 -0400 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -52854,7 +53226,7 @@ diff -urNp linux-2.6.32.24/mm/memory-failure.c linux-2.6.32.24/mm/memory-failure * We need/can do nothing about count=0 pages. diff -urNp linux-2.6.32.24/mm/mempolicy.c linux-2.6.32.24/mm/mempolicy.c --- linux-2.6.32.24/mm/mempolicy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/mempolicy.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/mempolicy.c 2010-10-23 19:59:20.000000000 -0400 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -52937,7 +53309,7 @@ diff -urNp linux-2.6.32.24/mm/mempolicy.c linux-2.6.32.24/mm/mempolicy.c } else if (vma->vm_start <= mm->start_stack && diff -urNp linux-2.6.32.24/mm/migrate.c linux-2.6.32.24/mm/migrate.c --- linux-2.6.32.24/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/migrate.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/migrate.c 2010-10-23 19:59:20.000000000 -0400 @@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -52965,7 +53337,7 @@ diff -urNp linux-2.6.32.24/mm/migrate.c linux-2.6.32.24/mm/migrate.c goto out; diff -urNp linux-2.6.32.24/mm/mlock.c linux-2.6.32.24/mm/mlock.c --- linux-2.6.32.24/mm/mlock.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/mm/mlock.c 2010-09-17 18:47:09.000000000 -0400 ++++ linux-2.6.32.24/mm/mlock.c 2010-10-23 19:59:20.000000000 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -53075,7 +53447,7 @@ diff -urNp linux-2.6.32.24/mm/mlock.c linux-2.6.32.24/mm/mlock.c ret = do_mlockall(flags); diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c --- linux-2.6.32.24/mm/mmap.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/mm/mmap.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/mm/mmap.c 2010-10-23 19:59:20.000000000 -0400 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -53297,13 +53669,14 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (addr & ~PAGE_MASK) return addr; -@@ -969,6 +1046,28 @@ unsigned long do_mmap_pgoff(struct file +@@ -969,6 +1046,31 @@ unsigned long do_mmap_pgoff(struct file vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; +#ifdef CONFIG_PAX_MPROTECT + if (mm->pax_flags & MF_PAX_MPROTECT) { -+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) ++ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) { ++ gr_log_rwxmmap(file); + +#ifdef CONFIG_PAX_EMUPLT + vm_flags &= ~VM_EXEC; @@ -53311,6 +53684,8 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c + return -EPERM; +#endif + ++ } ++ + if (!(vm_flags & VM_EXEC)) + vm_flags &= ~VM_MAYEXEC; + else @@ -53326,7 +53701,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (flags & MAP_LOCKED) if (!can_do_mlock()) return -EPERM; -@@ -980,6 +1079,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -980,6 +1082,7 @@ unsigned long do_mmap_pgoff(struct file locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; @@ -53334,7 +53709,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -1053,6 +1153,9 @@ unsigned long do_mmap_pgoff(struct file +@@ -1053,6 +1156,9 @@ unsigned long do_mmap_pgoff(struct file if (error) return error; @@ -53344,7 +53719,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return mmap_region(file, addr, len, flags, vm_flags, pgoff); } EXPORT_SYMBOL(do_mmap_pgoff); -@@ -1065,10 +1168,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); +@@ -1065,10 +1171,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); */ int vma_wants_writenotify(struct vm_area_struct *vma) { @@ -53357,7 +53732,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1117,14 +1220,24 @@ unsigned long mmap_region(struct file *f +@@ -1117,14 +1223,24 @@ unsigned long mmap_region(struct file *f unsigned long charged = 0; struct inode *inode = file ? file->f_path.dentry->d_inode : NULL; @@ -53384,7 +53759,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c } /* Check against address space limit. */ -@@ -1173,6 +1286,16 @@ munmap_back: +@@ -1173,6 +1289,16 @@ munmap_back: goto unacct_error; } @@ -53401,7 +53776,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -1195,6 +1318,19 @@ munmap_back: +@@ -1195,6 +1321,19 @@ munmap_back: error = file->f_op->mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -53421,7 +53796,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (vm_flags & VM_EXECUTABLE) added_exe_file_vma(mm); -@@ -1218,6 +1354,11 @@ munmap_back: +@@ -1218,6 +1357,11 @@ munmap_back: vma_link(mm, vma, prev, rb_link, rb_parent); file = vma->vm_file; @@ -53433,7 +53808,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* Once vma denies write, undo our temporary denial count */ if (correct_wcount) atomic_inc(&inode->i_writecount); -@@ -1226,6 +1367,7 @@ out: +@@ -1226,6 +1370,7 @@ out: mm->total_vm += len >> PAGE_SHIFT; vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); @@ -53441,7 +53816,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (vm_flags & VM_LOCKED) { /* * makes pages present; downgrades, drops, reacquires mmap_sem -@@ -1248,6 +1390,12 @@ unmap_and_free_vma: +@@ -1248,6 +1393,12 @@ unmap_and_free_vma: unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); charged = 0; free_vma: @@ -53454,7 +53829,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c kmem_cache_free(vm_area_cachep, vma); unacct_error: if (charged) -@@ -1255,6 +1403,33 @@ unacct_error: +@@ -1255,6 +1406,33 @@ unacct_error: return error; } @@ -53488,7 +53863,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* Get an address range which is currently unmapped. * For shmat() with addr=0. * -@@ -1281,18 +1456,23 @@ arch_get_unmapped_area(struct file *filp +@@ -1281,18 +1459,23 @@ arch_get_unmapped_area(struct file *filp if (flags & MAP_FIXED) return addr; @@ -53519,7 +53894,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c } full_search: -@@ -1303,34 +1483,40 @@ full_search: +@@ -1303,34 +1486,40 @@ full_search: * Start a new search - just in case we missed * some holes. */ @@ -53571,7 +53946,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c mm->free_area_cache = addr; mm->cached_hole_size = ~0UL; } -@@ -1348,7 +1534,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1348,7 +1537,7 @@ arch_get_unmapped_area_topdown(struct fi { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; @@ -53580,7 +53955,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -1357,13 +1543,18 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1357,13 +1546,18 @@ arch_get_unmapped_area_topdown(struct fi if (flags & MAP_FIXED) return addr; @@ -53603,7 +53978,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c } /* check if free_area_cache is useful for us */ -@@ -1378,7 +1569,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1378,7 +1572,7 @@ arch_get_unmapped_area_topdown(struct fi /* make sure it can fit in the remaining address space */ if (addr > len) { vma = find_vma(mm, addr-len); @@ -53612,7 +53987,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr-len); } -@@ -1395,7 +1586,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1395,7 +1589,7 @@ arch_get_unmapped_area_topdown(struct fi * return with success: */ vma = find_vma(mm, addr); @@ -53621,7 +53996,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* remember the address as a hint for next time */ return (mm->free_area_cache = addr); -@@ -1414,13 +1605,21 @@ bottomup: +@@ -1414,13 +1608,21 @@ bottomup: * can happen with large stack limits and large mmap() * allocations. */ @@ -53645,7 +54020,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c mm->cached_hole_size = ~0UL; return addr; -@@ -1429,6 +1628,12 @@ bottomup: +@@ -1429,6 +1631,12 @@ bottomup: void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) { @@ -53658,7 +54033,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * Is this a new hole at the highest possible address? */ -@@ -1436,8 +1641,10 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1436,8 +1644,10 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = addr; /* dont allow allocations above current base */ @@ -53670,7 +54045,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c } unsigned long -@@ -1545,6 +1752,27 @@ out: +@@ -1545,6 +1755,27 @@ out: return prev ? prev->vm_next : vma; } @@ -53698,7 +54073,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1561,6 +1789,7 @@ static int acct_stack_growth(struct vm_a +@@ -1561,6 +1792,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -53706,7 +54081,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (size > rlim[RLIMIT_STACK].rlim_cur) return -ENOMEM; -@@ -1570,6 +1799,7 @@ static int acct_stack_growth(struct vm_a +@@ -1570,6 +1802,7 @@ static int acct_stack_growth(struct vm_a unsigned long limit; locked = mm->locked_vm + grow; limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; @@ -53714,7 +54089,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -1600,37 +1830,47 @@ static int acct_stack_growth(struct vm_a +@@ -1600,37 +1833,47 @@ static int acct_stack_growth(struct vm_a * PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. */ @@ -53772,7 +54147,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c unsigned long size, grow; size = address - vma->vm_start; -@@ -1640,6 +1880,8 @@ int expand_upwards(struct vm_area_struct +@@ -1640,6 +1883,8 @@ int expand_upwards(struct vm_area_struct if (!error) vma->vm_end = address; } @@ -53781,7 +54156,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c anon_vma_unlock(vma); return error; } -@@ -1651,7 +1893,8 @@ int expand_upwards(struct vm_area_struct +@@ -1651,7 +1896,8 @@ int expand_upwards(struct vm_area_struct static int expand_downwards(struct vm_area_struct *vma, unsigned long address) { @@ -53791,7 +54166,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * We must make sure the anon_vma is allocated -@@ -1665,6 +1908,15 @@ static int expand_downwards(struct vm_ar +@@ -1665,6 +1911,15 @@ static int expand_downwards(struct vm_ar if (error) return error; @@ -53807,7 +54182,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c anon_vma_lock(vma); /* -@@ -1674,9 +1926,17 @@ static int expand_downwards(struct vm_ar +@@ -1674,9 +1929,17 @@ static int expand_downwards(struct vm_ar */ /* Somebody else might have raced and expanded it already */ @@ -53826,7 +54201,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -1684,9 +1944,20 @@ static int expand_downwards(struct vm_ar +@@ -1684,9 +1947,20 @@ static int expand_downwards(struct vm_ar if (!error) { vma->vm_start = address; vma->vm_pgoff -= grow; @@ -53847,7 +54222,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return error; } -@@ -1762,6 +2033,13 @@ static void remove_vma_list(struct mm_st +@@ -1762,6 +2036,13 @@ static void remove_vma_list(struct mm_st do { long nrpages = vma_pages(vma); @@ -53861,7 +54236,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma); -@@ -1807,6 +2085,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1807,6 +2088,16 @@ detach_vmas_to_be_unmapped(struct mm_str insertion_point = (prev ? &prev->vm_next : &mm->mmap); vma->vm_prev = NULL; do { @@ -53878,7 +54253,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1834,10 +2122,25 @@ int split_vma(struct mm_struct * mm, str +@@ -1834,10 +2125,25 @@ int split_vma(struct mm_struct * mm, str struct mempolicy *pol; struct vm_area_struct *new; @@ -53904,7 +54279,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (mm->map_count >= sysctl_max_map_count) return -ENOMEM; -@@ -1845,6 +2148,16 @@ int split_vma(struct mm_struct * mm, str +@@ -1845,6 +2151,16 @@ int split_vma(struct mm_struct * mm, str if (!new) return -ENOMEM; @@ -53921,7 +54296,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* most fields are the same, copy all, and then fixup */ *new = *vma; -@@ -1855,8 +2168,29 @@ int split_vma(struct mm_struct * mm, str +@@ -1855,8 +2171,29 @@ int split_vma(struct mm_struct * mm, str new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); } @@ -53951,7 +54326,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c kmem_cache_free(vm_area_cachep, new); return PTR_ERR(pol); } -@@ -1877,6 +2211,28 @@ int split_vma(struct mm_struct * mm, str +@@ -1877,6 +2214,28 @@ int split_vma(struct mm_struct * mm, str else vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); @@ -53980,13 +54355,13 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return 0; } -@@ -1885,11 +2241,30 @@ int split_vma(struct mm_struct * mm, str +@@ -1885,11 +2244,30 @@ int split_vma(struct mm_struct * mm, str * work. This now handles partial unmappings. * Jeremy Fitzhardinge <jeremy@goop.org> */ +#ifdef CONFIG_PAX_SEGMEXEC - int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) - { ++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ++{ + int ret = __do_munmap(mm, start, len); + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) + return ret; @@ -53996,9 +54371,9 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c + +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#else -+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) + int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#endif -+{ + { unsigned long end; struct vm_area_struct *vma, *prev, *last; @@ -54011,7 +54386,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -1953,6 +2328,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -1953,6 +2331,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -54020,7 +54395,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return 0; } -@@ -1965,22 +2342,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -1965,22 +2345,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a profile_munmap(addr); @@ -54049,7 +54424,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -1994,6 +2367,7 @@ unsigned long do_brk(unsigned long addr, +@@ -1994,6 +2370,7 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -54057,7 +54432,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -2005,16 +2379,30 @@ unsigned long do_brk(unsigned long addr, +@@ -2005,16 +2382,30 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -54089,7 +54464,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; -@@ -2031,22 +2419,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2031,22 +2422,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -54116,7 +54491,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2060,7 +2448,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2060,7 +2451,7 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -54125,7 +54500,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return -ENOMEM; } -@@ -2072,11 +2460,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2072,11 +2463,12 @@ unsigned long do_brk(unsigned long addr, vma->vm_page_prot = vm_get_page_prot(flags); vma_link(mm, vma, prev, rb_link, rb_parent); out: @@ -54140,7 +54515,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return addr; } -@@ -2123,8 +2512,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2123,8 +2515,10 @@ void exit_mmap(struct mm_struct *mm) * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ @@ -54152,7 +54527,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2138,6 +2529,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2138,6 +2532,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -54163,7 +54538,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2160,7 +2555,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2160,7 +2558,22 @@ int insert_vm_struct(struct mm_struct * if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -54186,7 +54561,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c return 0; } -@@ -2178,6 +2588,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2178,6 +2591,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -54195,7 +54570,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2221,6 +2633,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2221,6 +2636,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -54231,7 +54606,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2231,7 +2672,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2231,7 +2675,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; @@ -54240,7 +54615,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2300,6 +2741,17 @@ int install_special_mapping(struct mm_st +@@ -2300,6 +2744,17 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -54260,7 +54635,7 @@ diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c diff -urNp linux-2.6.32.24/mm/mprotect.c linux-2.6.32.24/mm/mprotect.c --- linux-2.6.32.24/mm/mprotect.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/mprotect.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/mm/mprotect.c 2010-10-23 19:59:20.000000000 -0400 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -54446,15 +54821,10 @@ diff -urNp linux-2.6.32.24/mm/mprotect.c linux-2.6.32.24/mm/mprotect.c prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot); -@@ -277,6 +398,16 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -277,6 +398,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (start > vma->vm_start) prev = vma; -+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) { -+ error = -EACCES; -+ goto out; -+ } -+ +#ifdef CONFIG_PAX_MPROTECT + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect) + current->mm->binfmt->handle_mprotect(vma, vm_flags); @@ -54463,7 +54833,22 @@ diff -urNp linux-2.6.32.24/mm/mprotect.c linux-2.6.32.24/mm/mprotect.c for (nstart = start ; ; ) { unsigned long newflags; -@@ -301,6 +432,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, +@@ -286,6 +412,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, + + /* newflags >> 4 shift VM_MAY% in place of VM_% */ + if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) { ++ if (prot & (PROT_WRITE | PROT_EXEC)) ++ gr_log_rwxmprotect(vma->vm_file); ++ ++ error = -EACCES; ++ goto out; ++ } ++ ++ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) { + error = -EACCES; + goto out; + } +@@ -301,6 +435,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (error) goto out; perf_event_mmap(vma); @@ -54475,7 +54860,7 @@ diff -urNp linux-2.6.32.24/mm/mprotect.c linux-2.6.32.24/mm/mprotect.c if (nstart < prev->vm_end) diff -urNp linux-2.6.32.24/mm/mremap.c linux-2.6.32.24/mm/mremap.c --- linux-2.6.32.24/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/mremap.c 2010-09-26 22:08:46.000000000 -0400 ++++ linux-2.6.32.24/mm/mremap.c 2010-10-23 19:59:20.000000000 -0400 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -54582,7 +54967,7 @@ diff -urNp linux-2.6.32.24/mm/mremap.c linux-2.6.32.24/mm/mremap.c if (ret & ~PAGE_MASK) diff -urNp linux-2.6.32.24/mm/nommu.c linux-2.6.32.24/mm/nommu.c --- linux-2.6.32.24/mm/nommu.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/mm/nommu.c 2010-09-17 18:34:04.000000000 -0400 ++++ linux-2.6.32.24/mm/nommu.c 2010-10-23 19:59:20.000000000 -0400 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; @@ -54609,7 +54994,7 @@ diff -urNp linux-2.6.32.24/mm/nommu.c linux-2.6.32.24/mm/nommu.c */ diff -urNp linux-2.6.32.24/mm/page_alloc.c linux-2.6.32.24/mm/page_alloc.c --- linux-2.6.32.24/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/mm/page_alloc.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/mm/page_alloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page int bad = 0; int wasMlocked = __TestClearPageMlocked(page); @@ -54668,7 +55053,7 @@ diff -urNp linux-2.6.32.24/mm/page_alloc.c linux-2.6.32.24/mm/page_alloc.c diff -urNp linux-2.6.32.24/mm/percpu.c linux-2.6.32.24/mm/percpu.c --- linux-2.6.32.24/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/mm/percpu.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/mm/percpu.c 2010-10-23 19:59:20.000000000 -0400 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -54680,7 +55065,7 @@ diff -urNp linux-2.6.32.24/mm/percpu.c linux-2.6.32.24/mm/percpu.c static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ diff -urNp linux-2.6.32.24/mm/rmap.c linux-2.6.32.24/mm/rmap.c --- linux-2.6.32.24/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/rmap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/rmap.c 2010-10-23 19:59:20.000000000 -0400 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); @@ -54701,7 +55086,7 @@ diff -urNp linux-2.6.32.24/mm/rmap.c linux-2.6.32.24/mm/rmap.c allocated = NULL; diff -urNp linux-2.6.32.24/mm/shmem.c linux-2.6.32.24/mm/shmem.c --- linux-2.6.32.24/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/shmem.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/shmem.c 2010-10-23 19:59:20.000000000 -0400 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -54713,7 +55098,7 @@ diff -urNp linux-2.6.32.24/mm/shmem.c linux-2.6.32.24/mm/shmem.c /* diff -urNp linux-2.6.32.24/mm/slab.c linux-2.6.32.24/mm/slab.c --- linux-2.6.32.24/mm/slab.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/mm/slab.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/slab.c 2010-10-23 19:59:20.000000000 -0400 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -54821,7 +55206,7 @@ diff -urNp linux-2.6.32.24/mm/slab.c linux-2.6.32.24/mm/slab.c * @objp: Pointer to the object diff -urNp linux-2.6.32.24/mm/slob.c linux-2.6.32.24/mm/slob.c --- linux-2.6.32.24/mm/slob.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/slob.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/slob.c 2010-10-23 19:59:20.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 @@ -55144,7 +55529,7 @@ diff -urNp linux-2.6.32.24/mm/slob.c linux-2.6.32.24/mm/slob.c trace_kmem_cache_free(_RET_IP_, b); diff -urNp linux-2.6.32.24/mm/slub.c linux-2.6.32.24/mm/slub.c --- linux-2.6.32.24/mm/slub.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/slub.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/slub.c 2010-10-23 19:59:20.000000000 -0400 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * page = virt_to_head_page(x); @@ -55309,7 +55694,7 @@ diff -urNp linux-2.6.32.24/mm/slub.c linux-2.6.32.24/mm/slub.c module_init(slab_proc_init); diff -urNp linux-2.6.32.24/mm/util.c linux-2.6.32.24/mm/util.c --- linux-2.6.32.24/mm/util.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/util.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/util.c 2010-10-23 19:59:20.000000000 -0400 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -55325,7 +55710,7 @@ diff -urNp linux-2.6.32.24/mm/util.c linux-2.6.32.24/mm/util.c } diff -urNp linux-2.6.32.24/mm/vmalloc.c linux-2.6.32.24/mm/vmalloc.c --- linux-2.6.32.24/mm/vmalloc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/mm/vmalloc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/mm/vmalloc.c 2010-10-23 19:59:20.000000000 -0400 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -55555,7 +55940,7 @@ diff -urNp linux-2.6.32.24/mm/vmalloc.c linux-2.6.32.24/mm/vmalloc.c struct vm_struct *area; diff -urNp linux-2.6.32.24/mm/vmstat.c linux-2.6.32.24/mm/vmstat.c --- linux-2.6.32.24/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400 -+++ linux-2.6.32.24/mm/vmstat.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/mm/vmstat.c 2010-10-23 19:59:20.000000000 -0400 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -55606,7 +55991,7 @@ diff -urNp linux-2.6.32.24/mm/vmstat.c linux-2.6.32.24/mm/vmstat.c } diff -urNp linux-2.6.32.24/net/8021q/vlan.c linux-2.6.32.24/net/8021q/vlan.c --- linux-2.6.32.24/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/8021q/vlan.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/8021q/vlan.c 2010-10-23 19:59:20.000000000 -0400 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -55619,7 +56004,7 @@ diff -urNp linux-2.6.32.24/net/8021q/vlan.c linux-2.6.32.24/net/8021q/vlan.c vn = net_generic(net, vlan_net_id); diff -urNp linux-2.6.32.24/net/atm/atm_misc.c linux-2.6.32.24/net/atm/atm_misc.c --- linux-2.6.32.24/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/atm/atm_misc.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/atm/atm_misc.c 2010-10-23 19:59:20.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; @@ -55658,7 +56043,7 @@ diff -urNp linux-2.6.32.24/net/atm/atm_misc.c linux-2.6.32.24/net/atm/atm_misc.c } diff -urNp linux-2.6.32.24/net/atm/proc.c linux-2.6.32.24/net/atm/proc.c --- linux-2.6.32.24/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/atm/proc.c 2010-09-14 21:47:17.000000000 -0400 ++++ linux-2.6.32.24/net/atm/proc.c 2010-10-23 19:59:20.000000000 -0400 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -55687,7 +56072,7 @@ diff -urNp linux-2.6.32.24/net/atm/proc.c linux-2.6.32.24/net/atm/proc.c else diff -urNp linux-2.6.32.24/net/atm/resources.c linux-2.6.32.24/net/atm/resources.c --- linux-2.6.32.24/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/atm/resources.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/atm/resources.c 2010-10-23 19:59:20.000000000 -0400 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -55708,7 +56093,7 @@ diff -urNp linux-2.6.32.24/net/atm/resources.c linux-2.6.32.24/net/atm/resources } diff -urNp linux-2.6.32.24/net/bridge/br_private.h linux-2.6.32.24/net/bridge/br_private.h --- linux-2.6.32.24/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/bridge/br_private.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/bridge/br_private.h 2010-10-23 19:59:20.000000000 -0400 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -55720,7 +56105,7 @@ diff -urNp linux-2.6.32.24/net/bridge/br_private.h linux-2.6.32.24/net/bridge/br /* br_sysfs_br.c */ diff -urNp linux-2.6.32.24/net/bridge/br_stp_if.c linux-2.6.32.24/net/bridge/br_stp_if.c --- linux-2.6.32.24/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/bridge/br_stp_if.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/bridge/br_stp_if.c 2010-10-23 19:59:20.000000000 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -55732,7 +56117,7 @@ diff -urNp linux-2.6.32.24/net/bridge/br_stp_if.c linux-2.6.32.24/net/bridge/br_ diff -urNp linux-2.6.32.24/net/bridge/br_sysfs_if.c linux-2.6.32.24/net/bridge/br_sysfs_if.c --- linux-2.6.32.24/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/bridge/br_sysfs_if.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/bridge/br_sysfs_if.c 2010-10-23 19:59:20.000000000 -0400 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -55744,7 +56129,7 @@ diff -urNp linux-2.6.32.24/net/bridge/br_sysfs_if.c linux-2.6.32.24/net/bridge/b }; diff -urNp linux-2.6.32.24/net/core/dev.c linux-2.6.32.24/net/core/dev.c --- linux-2.6.32.24/net/core/dev.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/net/core/dev.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/core/dev.c 2010-10-23 19:59:20.000000000 -0400 @@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -55765,7 +56150,7 @@ diff -urNp linux-2.6.32.24/net/core/dev.c linux-2.6.32.24/net/core/dev.c unsigned long time_limit = jiffies + 2; diff -urNp linux-2.6.32.24/net/core/ethtool.c linux-2.6.32.24/net/core/ethtool.c --- linux-2.6.32.24/net/core/ethtool.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/core/ethtool.c 2010-10-10 15:55:54.000000000 -0400 ++++ linux-2.6.32.24/net/core/ethtool.c 2010-10-23 19:59:20.000000000 -0400 @@ -265,7 +265,7 @@ static int ethtool_get_rxnfc(struct net_ if (info.cmd == ETHTOOL_GRXCLSRLALL) { if (info.rule_cnt > 0) { @@ -55777,7 +56162,7 @@ diff -urNp linux-2.6.32.24/net/core/ethtool.c linux-2.6.32.24/net/core/ethtool.c return -ENOMEM; diff -urNp linux-2.6.32.24/net/core/flow.c linux-2.6.32.24/net/core/flow.c --- linux-2.6.32.24/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/core/flow.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/core/flow.c 2010-10-23 19:59:20.000000000 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -55807,7 +56192,7 @@ diff -urNp linux-2.6.32.24/net/core/flow.c linux-2.6.32.24/net/core/flow.c diff -urNp linux-2.6.32.24/net/dccp/ccids/ccid3.c linux-2.6.32.24/net/dccp/ccids/ccid3.c --- linux-2.6.32.24/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/dccp/ccids/ccid3.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/dccp/ccids/ccid3.c 2010-10-23 19:59:20.000000000 -0400 @@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -55819,7 +56204,7 @@ diff -urNp linux-2.6.32.24/net/dccp/ccids/ccid3.c linux-2.6.32.24/net/dccp/ccids /* diff -urNp linux-2.6.32.24/net/dccp/dccp.h linux-2.6.32.24/net/dccp/dccp.h --- linux-2.6.32.24/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/dccp/dccp.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/dccp/dccp.h 2010-10-23 19:59:20.000000000 -0400 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) @@ -55835,7 +56220,7 @@ diff -urNp linux-2.6.32.24/net/dccp/dccp.h linux-2.6.32.24/net/dccp/dccp.h extern struct inet_hashinfo dccp_hashinfo; diff -urNp linux-2.6.32.24/net/decnet/sysctl_net_decnet.c linux-2.6.32.24/net/decnet/sysctl_net_decnet.c --- linux-2.6.32.24/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/decnet/sysctl_net_decnet.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/decnet/sysctl_net_decnet.c 2010-10-23 19:59:20.000000000 -0400 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -55856,7 +56241,7 @@ diff -urNp linux-2.6.32.24/net/decnet/sysctl_net_decnet.c linux-2.6.32.24/net/de *lenp = len; diff -urNp linux-2.6.32.24/net/ipv4/inet_hashtables.c linux-2.6.32.24/net/ipv4/inet_hashtables.c --- linux-2.6.32.24/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/inet_hashtables.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/inet_hashtables.c 2010-10-23 19:59:20.000000000 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -55881,9 +56266,33 @@ diff -urNp linux-2.6.32.24/net/ipv4/inet_hashtables.c linux-2.6.32.24/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); +diff -urNp linux-2.6.32.24/net/ipv4/inetpeer.c linux-2.6.32.24/net/ipv4/inetpeer.c +--- linux-2.6.32.24/net/ipv4/inetpeer.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/inetpeer.c 2010-10-23 19:59:24.000000000 -0400 +@@ -389,7 +389,7 @@ struct inet_peer *inet_getpeer(__be32 da + return NULL; + n->v4daddr = daddr; + atomic_set(&n->refcnt, 1); +- atomic_set(&n->rid, 0); ++ atomic_set_unchecked(&n->rid, 0); + n->ip_id_count = secure_ip_id(daddr); + n->tcp_ts_stamp = 0; + +diff -urNp linux-2.6.32.24/net/ipv4/ip_fragment.c linux-2.6.32.24/net/ipv4/ip_fragment.c +--- linux-2.6.32.24/net/ipv4/ip_fragment.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/ip_fragment.c 2010-10-23 19:59:24.000000000 -0400 +@@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct + return 0; + + start = qp->rid; +- end = atomic_inc_return(&peer->rid); ++ end = atomic_inc_return_unchecked(&peer->rid); + qp->rid = end; + + rc = qp->q.fragments && (end - start) > max; diff -urNp linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c --- linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-10-23 19:59:20.000000000 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -55895,7 +56304,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.2 printk("OOM in bsalg (%d)\n", __LINE__); diff -urNp linux-2.6.32.24/net/ipv4/tcp_ipv4.c linux-2.6.32.24/net/ipv4/tcp_ipv4.c --- linux-2.6.32.24/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/tcp_ipv4.c 2010-09-14 21:42:19.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/tcp_ipv4.c 2010-10-23 19:59:20.000000000 -0400 @@ -84,6 +84,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -55993,7 +56402,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/tcp_ipv4.c linux-2.6.32.24/net/ipv4/tcp_ipv4 #define TMPSZ 150 diff -urNp linux-2.6.32.24/net/ipv4/tcp_minisocks.c linux-2.6.32.24/net/ipv4/tcp_minisocks.c --- linux-2.6.32.24/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/tcp_minisocks.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/tcp_minisocks.c 2010-10-23 19:59:20.000000000 -0400 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -56018,7 +56427,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/tcp_minisocks.c linux-2.6.32.24/net/ipv4/tcp diff -urNp linux-2.6.32.24/net/ipv4/tcp_probe.c linux-2.6.32.24/net/ipv4/tcp_probe.c --- linux-2.6.32.24/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/tcp_probe.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/tcp_probe.c 2010-10-23 19:59:20.000000000 -0400 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -56030,7 +56439,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/tcp_probe.c linux-2.6.32.24/net/ipv4/tcp_pro } diff -urNp linux-2.6.32.24/net/ipv4/tcp_timer.c linux-2.6.32.24/net/ipv4/tcp_timer.c --- linux-2.6.32.24/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/tcp_timer.c 2010-09-26 17:26:57.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/tcp_timer.c 2010-10-23 19:59:20.000000000 -0400 @@ -21,6 +21,10 @@ #include <linux/module.h> #include <net/tcp.h> @@ -56058,7 +56467,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/tcp_timer.c linux-2.6.32.24/net/ipv4/tcp_tim tcp_write_err(sk); diff -urNp linux-2.6.32.24/net/ipv4/udp.c linux-2.6.32.24/net/ipv4/udp.c --- linux-2.6.32.24/net/ipv4/udp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv4/udp.c 2010-09-14 21:43:22.000000000 -0400 ++++ linux-2.6.32.24/net/ipv4/udp.c 2010-10-23 19:59:20.000000000 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -56144,7 +56553,7 @@ diff -urNp linux-2.6.32.24/net/ipv4/udp.c linux-2.6.32.24/net/ipv4/udp.c diff -urNp linux-2.6.32.24/net/ipv6/exthdrs.c linux-2.6.32.24/net/ipv6/exthdrs.c --- linux-2.6.32.24/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv6/exthdrs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv6/exthdrs.c 2010-10-23 19:59:20.000000000 -0400 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -56156,7 +56565,7 @@ diff -urNp linux-2.6.32.24/net/ipv6/exthdrs.c linux-2.6.32.24/net/ipv6/exthdrs.c int ipv6_parse_hopopts(struct sk_buff *skb) diff -urNp linux-2.6.32.24/net/ipv6/raw.c linux-2.6.32.24/net/ipv6/raw.c --- linux-2.6.32.24/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv6/raw.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv6/raw.c 2010-10-23 19:59:20.000000000 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -56168,7 +56577,7 @@ diff -urNp linux-2.6.32.24/net/ipv6/raw.c linux-2.6.32.24/net/ipv6/raw.c { diff -urNp linux-2.6.32.24/net/ipv6/tcp_ipv6.c linux-2.6.32.24/net/ipv6/tcp_ipv6.c --- linux-2.6.32.24/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv6/tcp_ipv6.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv6/tcp_ipv6.c 2010-10-23 19:59:20.000000000 -0400 @@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -56226,7 +56635,7 @@ diff -urNp linux-2.6.32.24/net/ipv6/tcp_ipv6.c linux-2.6.32.24/net/ipv6/tcp_ipv6 diff -urNp linux-2.6.32.24/net/ipv6/udp.c linux-2.6.32.24/net/ipv6/udp.c --- linux-2.6.32.24/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/ipv6/udp.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/ipv6/udp.c 2010-10-23 19:59:20.000000000 -0400 @@ -49,6 +49,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -56250,7 +56659,7 @@ diff -urNp linux-2.6.32.24/net/ipv6/udp.c linux-2.6.32.24/net/ipv6/udp.c kfree_skb(skb); diff -urNp linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c --- linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c 2010-10-23 19:59:20.000000000 -0400 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -56375,7 +56784,7 @@ diff -urNp linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c linux-2.6.32.24/net/irda diff -urNp linux-2.6.32.24/net/key/af_key.c linux-2.6.32.24/net/key/af_key.c --- linux-2.6.32.24/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/key/af_key.c 2010-09-14 21:25:29.000000000 -0400 ++++ linux-2.6.32.24/net/key/af_key.c 2010-10-23 19:59:20.000000000 -0400 @@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); else @@ -56390,7 +56799,7 @@ diff -urNp linux-2.6.32.24/net/key/af_key.c linux-2.6.32.24/net/key/af_key.c sk_wmem_alloc_get(s), diff -urNp linux-2.6.32.24/net/mac80211/ieee80211_i.h linux-2.6.32.24/net/mac80211/ieee80211_i.h --- linux-2.6.32.24/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/ieee80211_i.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/ieee80211_i.h 2010-10-23 19:59:20.000000000 -0400 @@ -635,7 +635,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -56402,7 +56811,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/ieee80211_i.h linux-2.6.32.24/net/mac802 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; diff -urNp linux-2.6.32.24/net/mac80211/iface.c linux-2.6.32.24/net/mac80211/iface.c --- linux-2.6.32.24/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/iface.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/iface.c 2010-10-23 19:59:20.000000000 -0400 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -56459,7 +56868,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/iface.c linux-2.6.32.24/net/mac80211/ifa diff -urNp linux-2.6.32.24/net/mac80211/main.c linux-2.6.32.24/net/mac80211/main.c --- linux-2.6.32.24/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/main.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/main.c 2010-10-23 19:59:20.000000000 -0400 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -56471,7 +56880,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/main.c linux-2.6.32.24/net/mac80211/main * Goal: diff -urNp linux-2.6.32.24/net/mac80211/pm.c linux-2.6.32.24/net/mac80211/pm.c --- linux-2.6.32.24/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/pm.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/pm.c 2010-10-23 19:59:20.000000000 -0400 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -56483,7 +56892,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/pm.c linux-2.6.32.24/net/mac80211/pm.c local->suspended = true; diff -urNp linux-2.6.32.24/net/mac80211/rate.c linux-2.6.32.24/net/mac80211/rate.c --- linux-2.6.32.24/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/rate.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/rate.c 2010-10-23 19:59:20.000000000 -0400 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -56495,7 +56904,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/rate.c linux-2.6.32.24/net/mac80211/rate ref = rate_control_alloc(name, local); diff -urNp linux-2.6.32.24/net/mac80211/tx.c linux-2.6.32.24/net/mac80211/tx.c --- linux-2.6.32.24/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/tx.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/tx.c 2010-10-23 19:59:20.000000000 -0400 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct return cpu_to_le16(dur); } @@ -56507,7 +56916,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/tx.c linux-2.6.32.24/net/mac80211/tx.c return local == wdev_priv(dev->ieee80211_ptr); diff -urNp linux-2.6.32.24/net/mac80211/util.c linux-2.6.32.24/net/mac80211/util.c --- linux-2.6.32.24/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/mac80211/util.c 2010-09-28 18:23:33.000000000 -0400 ++++ linux-2.6.32.24/net/mac80211/util.c 2010-10-23 19:59:20.000000000 -0400 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -56519,7 +56928,7 @@ diff -urNp linux-2.6.32.24/net/mac80211/util.c linux-2.6.32.24/net/mac80211/util * various platform / driver / bus issues, so restarting diff -urNp linux-2.6.32.24/net/netfilter/Kconfig linux-2.6.32.24/net/netfilter/Kconfig --- linux-2.6.32.24/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/netfilter/Kconfig 2010-09-28 18:10:16.000000000 -0400 ++++ linux-2.6.32.24/net/netfilter/Kconfig 2010-10-23 19:59:20.000000000 -0400 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP To compile it as a module, choose M here. If unsure, say N. @@ -56539,7 +56948,7 @@ diff -urNp linux-2.6.32.24/net/netfilter/Kconfig linux-2.6.32.24/net/netfilter/K depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) diff -urNp linux-2.6.32.24/net/netfilter/Makefile linux-2.6.32.24/net/netfilter/Makefile --- linux-2.6.32.24/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/netfilter/Makefile 2010-09-28 18:01:53.000000000 -0400 ++++ linux-2.6.32.24/net/netfilter/Makefile 2010-10-23 19:59:20.000000000 -0400 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o @@ -56550,7 +56959,7 @@ diff -urNp linux-2.6.32.24/net/netfilter/Makefile linux-2.6.32.24/net/netfilter/ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o diff -urNp linux-2.6.32.24/net/netfilter/xt_gradm.c linux-2.6.32.24/net/netfilter/xt_gradm.c --- linux-2.6.32.24/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.24/net/netfilter/xt_gradm.c 2010-09-28 18:01:53.000000000 -0400 ++++ linux-2.6.32.24/net/netfilter/xt_gradm.c 2010-10-23 19:59:20.000000000 -0400 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -56605,7 +57014,7 @@ diff -urNp linux-2.6.32.24/net/netfilter/xt_gradm.c linux-2.6.32.24/net/netfilte +MODULE_ALIAS("ip6t_gradm"); diff -urNp linux-2.6.32.24/net/netlink/af_netlink.c linux-2.6.32.24/net/netlink/af_netlink.c --- linux-2.6.32.24/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/net/netlink/af_netlink.c 2010-09-15 02:14:48.000000000 -0400 ++++ linux-2.6.32.24/net/netlink/af_netlink.c 2010-10-23 19:59:20.000000000 -0400 @@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f struct netlink_sock *nlk = nlk_sk(s); @@ -56630,7 +57039,7 @@ diff -urNp linux-2.6.32.24/net/netlink/af_netlink.c linux-2.6.32.24/net/netlink/ ); diff -urNp linux-2.6.32.24/net/packet/af_packet.c linux-2.6.32.24/net/packet/af_packet.c --- linux-2.6.32.24/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/packet/af_packet.c 2010-09-14 21:26:39.000000000 -0400 ++++ linux-2.6.32.24/net/packet/af_packet.c 2010-10-23 19:59:20.000000000 -0400 @@ -2426,7 +2426,11 @@ static int packet_seq_show(struct seq_fi seq_printf(seq, @@ -56643,9 +57052,71 @@ diff -urNp linux-2.6.32.24/net/packet/af_packet.c linux-2.6.32.24/net/packet/af_ atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), +diff -urNp linux-2.6.32.24/net/phonet/af_phonet.c linux-2.6.32.24/net/phonet/af_phonet.c +--- linux-2.6.32.24/net/phonet/af_phonet.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/net/phonet/af_phonet.c 2010-10-23 19:59:20.000000000 -0400 +@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr + { + struct phonet_protocol *pp; + +- if (protocol >= PHONET_NPROTO) ++ if (protocol < 0 || protocol >= PHONET_NPROTO) + return NULL; + + spin_lock(&proto_tab_lock); +@@ -398,7 +398,7 @@ int __init_or_module phonet_proto_regist + { + int err = 0; + +- if (protocol >= PHONET_NPROTO) ++ if (protocol < 0 || protocol >= PHONET_NPROTO) + return -EINVAL; + + err = proto_register(pp->prot, 1); +diff -urNp linux-2.6.32.24/net/rds/page.c linux-2.6.32.24/net/rds/page.c +--- linux-2.6.32.24/net/rds/page.c 2010-08-13 16:24:37.000000000 -0400 ++++ linux-2.6.32.24/net/rds/page.c 2010-10-23 19:59:20.000000000 -0400 +@@ -56,30 +56,17 @@ int rds_page_copy_user(struct page *page + unsigned long ret; + void *addr; + +- if (to_user) ++ addr = kmap(page); ++ if (to_user) { + rds_stats_add(s_copy_to_user, bytes); +- else ++ ret = copy_to_user(ptr, addr + offset, bytes); ++ } else { + rds_stats_add(s_copy_from_user, bytes); +- +- addr = kmap_atomic(page, KM_USER0); +- if (to_user) +- ret = __copy_to_user_inatomic(ptr, addr + offset, bytes); +- else +- ret = __copy_from_user_inatomic(addr + offset, ptr, bytes); +- kunmap_atomic(addr, KM_USER0); +- +- if (ret) { +- addr = kmap(page); +- if (to_user) +- ret = copy_to_user(ptr, addr + offset, bytes); +- else +- ret = copy_from_user(addr + offset, ptr, bytes); +- kunmap(page); +- if (ret) +- return -EFAULT; ++ ret = copy_from_user(addr + offset, ptr, bytes); + } ++ kunmap(page); + +- return 0; ++ return ret ? -EFAULT : 0; + } + EXPORT_SYMBOL_GPL(rds_page_copy_user); + diff -urNp linux-2.6.32.24/net/rose/af_rose.c linux-2.6.32.24/net/rose/af_rose.c --- linux-2.6.32.24/net/rose/af_rose.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/rose/af_rose.c 2010-09-20 17:17:15.000000000 -0400 ++++ linux-2.6.32.24/net/rose/af_rose.c 2010-10-23 19:59:20.000000000 -0400 @@ -677,7 +677,7 @@ static int rose_bind(struct socket *sock if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) return -EINVAL; @@ -56666,7 +57137,7 @@ diff -urNp linux-2.6.32.24/net/rose/af_rose.c linux-2.6.32.24/net/rose/af_rose.c /* Source + Destination digis should not exceed ROSE_MAX_DIGIS */ diff -urNp linux-2.6.32.24/net/sctp/auth.c linux-2.6.32.24/net/sctp/auth.c --- linux-2.6.32.24/net/sctp/auth.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/sctp/auth.c 2010-09-28 18:26:47.000000000 -0400 ++++ linux-2.6.32.24/net/sctp/auth.c 2010-10-23 19:59:20.000000000 -0400 @@ -542,16 +542,20 @@ struct sctp_hmac *sctp_auth_asoc_get_hma id = ntohs(hmacs->hmac_ids[i]); @@ -56692,7 +57163,7 @@ diff -urNp linux-2.6.32.24/net/sctp/auth.c linux-2.6.32.24/net/sctp/auth.c } diff -urNp linux-2.6.32.24/net/sctp/socket.c linux-2.6.32.24/net/sctp/socket.c --- linux-2.6.32.24/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/sctp/socket.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/sctp/socket.c 2010-10-23 19:59:20.000000000 -0400 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -56712,7 +57183,7 @@ diff -urNp linux-2.6.32.24/net/sctp/socket.c linux-2.6.32.24/net/sctp/socket.c if (pp->fastreuse && sk->sk_reuse && diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c --- linux-2.6.32.24/net/socket.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/socket.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/socket.c 2010-10-23 19:59:20.000000000 -0400 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -56752,7 +57223,16 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c static struct file_system_type sock_fs_type = { .name = "sockfs", -@@ -1283,6 +1299,16 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1154,6 +1170,8 @@ static int __sock_create(struct net *net + return -EAFNOSUPPORT; + if (type < 0 || type >= SOCK_MAX) + return -EINVAL; ++ if (protocol < 0) ++ return -EINVAL; + + /* Compatibility. + +@@ -1283,6 +1301,16 @@ SYSCALL_DEFINE3(socket, int, family, int if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; @@ -56769,7 +57249,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c retval = sock_create(family, type, protocol, &sock); if (retval < 0) goto out; -@@ -1415,6 +1441,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1415,6 +1443,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so if (sock) { err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address); if (err >= 0) { @@ -56784,7 +57264,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c err = security_socket_bind(sock, (struct sockaddr *)&address, addrlen); -@@ -1423,6 +1457,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1423,6 +1459,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so (struct sockaddr *) &address, addrlen); } @@ -56792,7 +57272,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1446,10 +1481,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba +@@ -1446,10 +1483,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba if ((unsigned)backlog > somaxconn) backlog = somaxconn; @@ -56813,7 +57293,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1492,6 +1537,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1492,6 +1539,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct newsock->type = sock->type; newsock->ops = sock->ops; @@ -56832,7 +57312,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c /* * We don't need try_module_get here, as the listening socket (sock) * has the protocol module (sock->ops->owner) held. -@@ -1534,6 +1591,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1534,6 +1593,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct fd_install(newfd, newfile); err = newfd; @@ -56841,7 +57321,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c out_put: fput_light(sock->file, fput_needed); out: -@@ -1571,6 +1630,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct +@@ -1571,6 +1632,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct int, addrlen) { struct socket *sock; @@ -56849,7 +57329,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c struct sockaddr_storage address; int err, fput_needed; -@@ -1581,6 +1641,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct +@@ -1581,6 +1643,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct if (err < 0) goto out_put; @@ -56869,7 +57349,7 @@ diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c if (err) diff -urNp linux-2.6.32.24/net/sunrpc/sched.c linux-2.6.32.24/net/sunrpc/sched.c --- linux-2.6.32.24/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/sunrpc/sched.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/sunrpc/sched.c 2010-10-23 19:59:20.000000000 -0400 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -56885,7 +57365,7 @@ diff -urNp linux-2.6.32.24/net/sunrpc/sched.c linux-2.6.32.24/net/sunrpc/sched.c static inline void rpc_task_set_debuginfo(struct rpc_task *task) diff -urNp linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c --- linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c 2010-10-23 19:59:20.000000000 -0400 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta len -= *ppos; if (len > *lenp) @@ -56897,7 +57377,7 @@ diff -urNp linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.24/net/su *ppos += len; diff -urNp linux-2.6.32.24/net/sysctl_net.c linux-2.6.32.24/net/sysctl_net.c --- linux-2.6.32.24/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/sysctl_net.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/sysctl_net.c 2010-10-23 19:59:20.000000000 -0400 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -56909,7 +57389,7 @@ diff -urNp linux-2.6.32.24/net/sysctl_net.c linux-2.6.32.24/net/sysctl_net.c } diff -urNp linux-2.6.32.24/net/tipc/socket.c linux-2.6.32.24/net/tipc/socket.c --- linux-2.6.32.24/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/tipc/socket.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/tipc/socket.c 2010-10-23 19:59:20.000000000 -0400 @@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, } else { if (res == 0) @@ -56924,7 +57404,7 @@ diff -urNp linux-2.6.32.24/net/tipc/socket.c linux-2.6.32.24/net/tipc/socket.c diff -urNp linux-2.6.32.24/net/unix/af_unix.c linux-2.6.32.24/net/unix/af_unix.c --- linux-2.6.32.24/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400 -+++ linux-2.6.32.24/net/unix/af_unix.c 2010-09-26 17:27:02.000000000 -0400 ++++ linux-2.6.32.24/net/unix/af_unix.c 2010-10-23 19:59:20.000000000 -0400 @@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -56996,7 +57476,7 @@ diff -urNp linux-2.6.32.24/net/unix/af_unix.c linux-2.6.32.24/net/unix/af_unix.c s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, diff -urNp linux-2.6.32.24/net/wireless/wext.c linux-2.6.32.24/net/wireless/wext.c --- linux-2.6.32.24/net/wireless/wext.c 2010-09-20 17:26:42.000000000 -0400 -+++ linux-2.6.32.24/net/wireless/wext.c 2010-09-23 19:57:05.000000000 -0400 ++++ linux-2.6.32.24/net/wireless/wext.c 2010-10-23 19:59:20.000000000 -0400 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc */ @@ -57032,7 +57512,7 @@ diff -urNp linux-2.6.32.24/net/wireless/wext.c linux-2.6.32.24/net/wireless/wext iwp->length += essid_compat; diff -urNp linux-2.6.32.24/net/xfrm/xfrm_policy.c linux-2.6.32.24/net/xfrm/xfrm_policy.c --- linux-2.6.32.24/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/net/xfrm/xfrm_policy.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/net/xfrm/xfrm_policy.c 2010-10-23 19:59:20.000000000 -0400 @@ -1477,7 +1477,7 @@ free_dst: goto out; } @@ -57062,7 +57542,7 @@ diff -urNp linux-2.6.32.24/net/xfrm/xfrm_policy.c linux-2.6.32.24/net/xfrm/xfrm_ #ifdef CONFIG_XFRM_SUB_POLICY diff -urNp linux-2.6.32.24/samples/kobject/kset-example.c linux-2.6.32.24/samples/kobject/kset-example.c --- linux-2.6.32.24/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/samples/kobject/kset-example.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/samples/kobject/kset-example.c 2010-10-23 19:59:20.000000000 -0400 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -57074,7 +57554,7 @@ diff -urNp linux-2.6.32.24/samples/kobject/kset-example.c linux-2.6.32.24/sample }; diff -urNp linux-2.6.32.24/scripts/basic/fixdep.c linux-2.6.32.24/scripts/basic/fixdep.c --- linux-2.6.32.24/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/basic/fixdep.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/basic/fixdep.c 2010-10-23 19:59:20.000000000 -0400 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen static void parse_config_file(char *map, size_t len) @@ -57098,7 +57578,7 @@ diff -urNp linux-2.6.32.24/scripts/basic/fixdep.c linux-2.6.32.24/scripts/basic/ fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", diff -urNp linux-2.6.32.24/scripts/kallsyms.c linux-2.6.32.24/scripts/kallsyms.c --- linux-2.6.32.24/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/kallsyms.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/kallsyms.c 2010-10-23 19:59:20.000000000 -0400 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -57116,7 +57596,7 @@ diff -urNp linux-2.6.32.24/scripts/kallsyms.c linux-2.6.32.24/scripts/kallsyms.c #define text_range_inittext (&text_ranges[1]) diff -urNp linux-2.6.32.24/scripts/mod/file2alias.c linux-2.6.32.24/scripts/mod/file2alias.c --- linux-2.6.32.24/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/mod/file2alias.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/mod/file2alias.c 2010-10-23 19:59:20.000000000 -0400 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -57173,7 +57653,7 @@ diff -urNp linux-2.6.32.24/scripts/mod/file2alias.c linux-2.6.32.24/scripts/mod/ diff -urNp linux-2.6.32.24/scripts/mod/modpost.c linux-2.6.32.24/scripts/mod/modpost.c --- linux-2.6.32.24/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/mod/modpost.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/mod/modpost.c 2010-10-23 19:59:20.000000000 -0400 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -57243,7 +57723,7 @@ diff -urNp linux-2.6.32.24/scripts/mod/modpost.c linux-2.6.32.24/scripts/mod/mod tmp = NOFAIL(malloc(b->pos)); diff -urNp linux-2.6.32.24/scripts/mod/modpost.h linux-2.6.32.24/scripts/mod/modpost.h --- linux-2.6.32.24/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/mod/modpost.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/mod/modpost.h 2010-10-23 19:59:20.000000000 -0400 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -57265,7 +57745,7 @@ diff -urNp linux-2.6.32.24/scripts/mod/modpost.h linux-2.6.32.24/scripts/mod/mod struct module *next; diff -urNp linux-2.6.32.24/scripts/mod/sumversion.c linux-2.6.32.24/scripts/mod/sumversion.c --- linux-2.6.32.24/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/mod/sumversion.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/mod/sumversion.c 2010-10-23 19:59:20.000000000 -0400 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -57277,7 +57757,7 @@ diff -urNp linux-2.6.32.24/scripts/mod/sumversion.c linux-2.6.32.24/scripts/mod/ goto out; diff -urNp linux-2.6.32.24/scripts/pnmtologo.c linux-2.6.32.24/scripts/pnmtologo.c --- linux-2.6.32.24/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/scripts/pnmtologo.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/scripts/pnmtologo.c 2010-10-23 19:59:20.000000000 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -57306,7 +57786,7 @@ diff -urNp linux-2.6.32.24/scripts/pnmtologo.c linux-2.6.32.24/scripts/pnmtologo for (i = 0; i < logo_clutsize; i++) { diff -urNp linux-2.6.32.24/security/capability.c linux-2.6.32.24/security/capability.c --- linux-2.6.32.24/security/capability.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/capability.c 2010-09-14 23:49:20.000000000 -0400 ++++ linux-2.6.32.24/security/capability.c 2010-10-23 19:59:20.000000000 -0400 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls } #endif /* CONFIG_AUDIT */ @@ -57318,7 +57798,7 @@ diff -urNp linux-2.6.32.24/security/capability.c linux-2.6.32.24/security/capabi diff -urNp linux-2.6.32.24/security/commoncap.c linux-2.6.32.24/security/commoncap.c --- linux-2.6.32.24/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/commoncap.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/commoncap.c 2010-10-23 19:59:20.000000000 -0400 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -57343,7 +57823,7 @@ diff -urNp linux-2.6.32.24/security/commoncap.c linux-2.6.32.24/security/commonc diff -urNp linux-2.6.32.24/security/integrity/ima/ima_api.c linux-2.6.32.24/security/integrity/ima/ima_api.c --- linux-2.6.32.24/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/integrity/ima/ima_api.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/integrity/ima/ima_api.c 2010-10-23 19:59:20.000000000 -0400 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -57355,7 +57835,7 @@ diff -urNp linux-2.6.32.24/security/integrity/ima/ima_api.c linux-2.6.32.24/secu if (!entry) { diff -urNp linux-2.6.32.24/security/integrity/ima/ima_fs.c linux-2.6.32.24/security/integrity/ima/ima_fs.c --- linux-2.6.32.24/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/integrity/ima/ima_fs.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/integrity/ima/ima_fs.c 2010-10-23 19:59:20.000000000 -0400 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -57373,7 +57853,7 @@ diff -urNp linux-2.6.32.24/security/integrity/ima/ima_fs.c linux-2.6.32.24/secur diff -urNp linux-2.6.32.24/security/integrity/ima/ima.h linux-2.6.32.24/security/integrity/ima/ima.h --- linux-2.6.32.24/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/integrity/ima/ima.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/integrity/ima/ima.h 2010-10-23 19:59:20.000000000 -0400 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -57387,7 +57867,7 @@ diff -urNp linux-2.6.32.24/security/integrity/ima/ima.h linux-2.6.32.24/security extern struct ima_h_table ima_htable; diff -urNp linux-2.6.32.24/security/integrity/ima/ima_queue.c linux-2.6.32.24/security/integrity/ima/ima_queue.c --- linux-2.6.32.24/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/integrity/ima/ima_queue.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/integrity/ima/ima_queue.c 2010-10-23 19:59:20.000000000 -0400 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -57399,7 +57879,7 @@ diff -urNp linux-2.6.32.24/security/integrity/ima/ima_queue.c linux-2.6.32.24/se return 0; diff -urNp linux-2.6.32.24/security/Kconfig linux-2.6.32.24/security/Kconfig --- linux-2.6.32.24/security/Kconfig 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/Kconfig 2010-09-17 17:39:35.000000000 -0400 ++++ linux-2.6.32.24/security/Kconfig 2010-10-23 19:59:20.000000000 -0400 @@ -4,6 +4,505 @@ menu "Security options" @@ -57917,7 +58397,7 @@ diff -urNp linux-2.6.32.24/security/Kconfig linux-2.6.32.24/security/Kconfig from userspace allocation. Keeping a user from writing to low pages diff -urNp linux-2.6.32.24/security/min_addr.c linux-2.6.32.24/security/min_addr.c --- linux-2.6.32.24/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/min_addr.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/security/min_addr.c 2010-10-23 19:59:20.000000000 -0400 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -57936,7 +58416,7 @@ diff -urNp linux-2.6.32.24/security/min_addr.c linux-2.6.32.24/security/min_addr /* diff -urNp linux-2.6.32.24/security/root_plug.c linux-2.6.32.24/security/root_plug.c --- linux-2.6.32.24/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/root_plug.c 2010-09-14 23:33:54.000000000 -0400 ++++ linux-2.6.32.24/security/root_plug.c 2010-10-23 19:59:20.000000000 -0400 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security return 0; } @@ -57948,7 +58428,7 @@ diff -urNp linux-2.6.32.24/security/root_plug.c linux-2.6.32.24/security/root_pl diff -urNp linux-2.6.32.24/security/security.c linux-2.6.32.24/security/security.c --- linux-2.6.32.24/security/security.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/security.c 2010-09-28 18:16:26.000000000 -0400 ++++ linux-2.6.32.24/security/security.c 2010-10-23 19:59:20.000000000 -0400 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI extern struct security_operations default_security_ops; extern void security_fixup_ops(struct security_operations *ops); @@ -57969,7 +58449,7 @@ diff -urNp linux-2.6.32.24/security/security.c linux-2.6.32.24/security/security printk(KERN_DEBUG "%s could not verify " diff -urNp linux-2.6.32.24/security/selinux/hooks.c linux-2.6.32.24/security/selinux/hooks.c --- linux-2.6.32.24/security/selinux/hooks.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/selinux/hooks.c 2010-09-14 23:36:11.000000000 -0400 ++++ linux-2.6.32.24/security/selinux/hooks.c 2010-10-23 19:59:20.000000000 -0400 @@ -131,7 +131,7 @@ int selinux_enabled = 1; * Minimal support for a secondary security module, * just to allow the use of the capability module. @@ -58000,7 +58480,7 @@ diff -urNp linux-2.6.32.24/security/selinux/hooks.c linux-2.6.32.24/security/sel selinux_nf_ip_exit(); diff -urNp linux-2.6.32.24/security/smack/smack_lsm.c linux-2.6.32.24/security/smack/smack_lsm.c --- linux-2.6.32.24/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/smack/smack_lsm.c 2010-09-14 23:37:03.000000000 -0400 ++++ linux-2.6.32.24/security/smack/smack_lsm.c 2010-10-23 19:59:20.000000000 -0400 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct return 0; } @@ -58012,7 +58492,7 @@ diff -urNp linux-2.6.32.24/security/smack/smack_lsm.c linux-2.6.32.24/security/s .ptrace_access_check = smack_ptrace_access_check, diff -urNp linux-2.6.32.24/security/tomoyo/tomoyo.c linux-2.6.32.24/security/tomoyo/tomoyo.c --- linux-2.6.32.24/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/security/tomoyo/tomoyo.c 2010-09-14 23:32:36.000000000 -0400 ++++ linux-2.6.32.24/security/tomoyo/tomoyo.c 2010-10-23 19:59:20.000000000 -0400 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil * tomoyo_security_ops is a "struct security_operations" which is used for * registering TOMOYO. @@ -58024,7 +58504,7 @@ diff -urNp linux-2.6.32.24/security/tomoyo/tomoyo.c linux-2.6.32.24/security/tom .cred_prepare = tomoyo_cred_prepare, diff -urNp linux-2.6.32.24/sound/aoa/codecs/onyx.c linux-2.6.32.24/sound/aoa/codecs/onyx.c --- linux-2.6.32.24/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/aoa/codecs/onyx.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/aoa/codecs/onyx.c 2010-10-23 19:59:20.000000000 -0400 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -58055,7 +58535,7 @@ diff -urNp linux-2.6.32.24/sound/aoa/codecs/onyx.c linux-2.6.32.24/sound/aoa/cod diff -urNp linux-2.6.32.24/sound/core/control.c linux-2.6.32.24/sound/core/control.c --- linux-2.6.32.24/sound/core/control.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/core/control.c 2010-10-12 10:26:46.000000000 -0400 ++++ linux-2.6.32.24/sound/core/control.c 2010-10-23 19:59:20.000000000 -0400 @@ -31,6 +31,7 @@ /* max number of user-defined controls */ @@ -58077,7 +58557,7 @@ diff -urNp linux-2.6.32.24/sound/core/control.c linux-2.6.32.24/sound/core/contr snd_printk(KERN_ERR "Cannot allocate control instance\n"); diff -urNp linux-2.6.32.24/sound/core/oss/pcm_oss.c linux-2.6.32.24/sound/core/oss/pcm_oss.c --- linux-2.6.32.24/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/core/oss/pcm_oss.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/core/oss/pcm_oss.c 2010-10-23 19:59:20.000000000 -0400 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -58091,7 +58571,7 @@ diff -urNp linux-2.6.32.24/sound/core/oss/pcm_oss.c linux-2.6.32.24/sound/core/o /* diff -urNp linux-2.6.32.24/sound/core/seq/seq_lock.h linux-2.6.32.24/sound/core/seq/seq_lock.h --- linux-2.6.32.24/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/core/seq/seq_lock.h 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/core/seq/seq_lock.h 2010-10-23 19:59:20.000000000 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -58109,7 +58589,7 @@ diff -urNp linux-2.6.32.24/sound/core/seq/seq_lock.h linux-2.6.32.24/sound/core/ diff -urNp linux-2.6.32.24/sound/drivers/mts64.c linux-2.6.32.24/sound/drivers/mts64.c --- linux-2.6.32.24/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/drivers/mts64.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/drivers/mts64.c 2010-10-23 19:59:20.000000000 -0400 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -58160,7 +58640,7 @@ diff -urNp linux-2.6.32.24/sound/drivers/mts64.c linux-2.6.32.24/sound/drivers/m } diff -urNp linux-2.6.32.24/sound/drivers/portman2x4.c linux-2.6.32.24/sound/drivers/portman2x4.c --- linux-2.6.32.24/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/drivers/portman2x4.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/drivers/portman2x4.c 2010-10-23 19:59:20.000000000 -0400 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -58172,7 +58652,7 @@ diff -urNp linux-2.6.32.24/sound/drivers/portman2x4.c linux-2.6.32.24/sound/driv }; diff -urNp linux-2.6.32.24/sound/oss/sb_audio.c linux-2.6.32.24/sound/oss/sb_audio.c --- linux-2.6.32.24/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/oss/sb_audio.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/oss/sb_audio.c 2010-10-23 19:59:20.000000000 -0400 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -58184,7 +58664,7 @@ diff -urNp linux-2.6.32.24/sound/oss/sb_audio.c linux-2.6.32.24/sound/oss/sb_aud locallen)) diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_codec.c linux-2.6.32.24/sound/pci/ac97/ac97_codec.c --- linux-2.6.32.24/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/ac97/ac97_codec.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/ac97/ac97_codec.c 2010-10-23 19:59:20.000000000 -0400 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -58196,7 +58676,7 @@ diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_codec.c linux-2.6.32.24/sound/pci static void do_update_power(struct work_struct *work) diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_patch.c linux-2.6.32.24/sound/pci/ac97/ac97_patch.c --- linux-2.6.32.24/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/ac97/ac97_patch.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/ac97/ac97_patch.c 2010-10-23 19:59:20.000000000 -0400 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -58505,7 +58985,7 @@ diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_patch.c linux-2.6.32.24/sound/pci diff -urNp linux-2.6.32.24/sound/pci/ens1370.c linux-2.6.32.24/sound/pci/ens1370.c --- linux-2.6.32.24/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/ens1370.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/ens1370.c 2010-10-23 19:59:20.000000000 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ @@ -58517,7 +58997,7 @@ diff -urNp linux-2.6.32.24/sound/pci/ens1370.c linux-2.6.32.24/sound/pci/ens1370 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); diff -urNp linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c --- linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c 2010-10-23 19:59:20.000000000 -0400 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); @@ -58535,7 +59015,7 @@ diff -urNp linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.24/sound diff -urNp linux-2.6.32.24/sound/pci/intel8x0.c linux-2.6.32.24/sound/pci/intel8x0.c --- linux-2.6.32.24/sound/pci/intel8x0.c 2010-08-29 21:08:20.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/intel8x0.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/intel8x0.c 2010-10-23 19:59:20.000000000 -0400 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ @@ -58556,7 +59036,7 @@ diff -urNp linux-2.6.32.24/sound/pci/intel8x0.c linux-2.6.32.24/sound/pci/intel8 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, diff -urNp linux-2.6.32.24/sound/pci/intel8x0m.c linux-2.6.32.24/sound/pci/intel8x0m.c --- linux-2.6.32.24/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/sound/pci/intel8x0m.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/sound/pci/intel8x0m.c 2010-10-23 19:59:20.000000000 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ @@ -58577,7 +59057,7 @@ diff -urNp linux-2.6.32.24/sound/pci/intel8x0m.c linux-2.6.32.24/sound/pci/intel static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, diff -urNp linux-2.6.32.24/usr/gen_init_cpio.c linux-2.6.32.24/usr/gen_init_cpio.c --- linux-2.6.32.24/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/usr/gen_init_cpio.c 2010-09-04 15:54:52.000000000 -0400 ++++ linux-2.6.32.24/usr/gen_init_cpio.c 2010-10-23 19:59:20.000000000 -0400 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -58602,7 +59082,7 @@ diff -urNp linux-2.6.32.24/usr/gen_init_cpio.c linux-2.6.32.24/usr/gen_init_cpio } diff -urNp linux-2.6.32.24/virt/kvm/kvm_main.c linux-2.6.32.24/virt/kvm/kvm_main.c --- linux-2.6.32.24/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400 -+++ linux-2.6.32.24/virt/kvm/kvm_main.c 2010-09-26 22:08:46.000000000 -0400 ++++ linux-2.6.32.24/virt/kvm/kvm_main.c 2010-10-23 19:59:20.000000000 -0400 @@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode return 0; } diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 888818701c..a6dfc1cddc 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.24 -# Tue Oct 5 09:05:07 2010 +# Mon Oct 25 09:47:44 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4431,6 +4431,7 @@ CONFIG_GRKERNSEC_SIGNAL=y CONFIG_GRKERNSEC_FORKFAIL=y CONFIG_GRKERNSEC_TIME=y CONFIG_GRKERNSEC_PROC_IPADDR=y +# CONFIG_GRKERNSEC_RWXMAP_LOG is not set # CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set # |