diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2011-11-13 18:02:14 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2011-11-13 18:02:14 -0500 |
| commit | f1a054e63fd3b928f7c0417486a7523d2460d8c5 (patch) | |
| tree | 7729a2fc2e6a073561cae312549ce0675432e33c | |
| parent | Ignore hardened-rsbac-patches tarballs (diff) | |
| download | hardened-patchset-f1a054e63fd3b928f7c0417486a7523d2460d8c5.tar.gz hardened-patchset-f1a054e63fd3b928f7c0417486a7523d2460d8c5.tar.bz2 hardened-patchset-f1a054e63fd3b928f7c0417486a7523d2460d8c5.zip | |
EOL 3.0.8|Grsec/PaX: 2.2.2-{2.6.32.48,3.0.9}-20111112131020111112
| -rw-r--r-- | 2.6.32/0000_README | 2 | ||||
| -rw-r--r-- | 2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch (renamed from 2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110250925.patch) | 10283 | ||||
| -rw-r--r-- | 3.0.9/0000_README (renamed from 3.0.8/0000_README) | 6 | ||||
| -rw-r--r-- | 3.0.9/1007_linux-3.0.8.patch (renamed from 3.0.8/1007_linux-3.0.8.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/1008_linux-3.0.9.patch | 10991 | ||||
| -rw-r--r-- | 3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch (renamed from 3.0.8/4420_grsecurity-2.2.2-3.0.8-201110250925.patch) | 9145 | ||||
| -rw-r--r-- | 3.0.9/4421_grsec-remove-localversion-grsec.patch (renamed from 3.0.8/4421_grsec-remove-localversion-grsec.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4422_grsec-mute-warnings.patch (renamed from 3.0.8/4422_grsec-mute-warnings.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4423_grsec-remove-protected-paths.patch (renamed from 3.0.8/4423_grsec-remove-protected-paths.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4425_grsec-pax-without-grsec.patch (renamed from 3.0.8/4425_grsec-pax-without-grsec.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4430_grsec-kconfig-default-gids.patch (renamed from 3.0.8/4430_grsec-kconfig-default-gids.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4435_grsec-kconfig-gentoo.patch (renamed from 3.0.8/4435_grsec-kconfig-gentoo.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4437-grsec-kconfig-proc-user.patch (renamed from 3.0.8/4437-grsec-kconfig-proc-user.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4440_selinux-avc_audit-log-curr_ip.patch (renamed from 3.0.8/4440_selinux-avc_audit-log-curr_ip.patch) | 0 | ||||
| -rw-r--r-- | 3.0.9/4445_disable-compat_vdso.patch (renamed from 3.0.8/4445_disable-compat_vdso.patch) | 0 |
15 files changed, 20668 insertions, 9759 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README index dc308cc..5e969f0 100644 --- a/2.6.32/0000_README +++ b/2.6.32/0000_README @@ -3,7 +3,7 @@ README Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-2.2.2-2.6.32.46-201110250925.patch +Patch: 4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110250925.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch index 82fee55..fa7931f 100644 --- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110250925.patch +++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.48-201111121310.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.46/arch/alpha/include/asm/elf.h linux-2.6.32.46/arch/alpha/include/asm/elf.h ---- linux-2.6.32.46/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/alpha/include/asm/elf.h linux-2.6.32.48/arch/alpha/include/asm/elf.h +--- linux-2.6.32.48/arch/alpha/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/alpha/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.46/arch/alpha/include/asm/elf.h linux-2.6.32.46/arch/alp /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.46/arch/alpha/include/asm/pgtable.h linux-2.6.32.46/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.46/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/alpha/include/asm/pgtable.h linux-2.6.32.48/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/alpha/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.46/arch/alpha/include/asm/pgtable.h linux-2.6.32.46/arch #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.46/arch/alpha/kernel/module.c linux-2.6.32.46/arch/alpha/kernel/module.c ---- linux-2.6.32.46/arch/alpha/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/alpha/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/alpha/kernel/module.c linux-2.6.32.48/arch/alpha/kernel/module.c +--- linux-2.6.32.48/arch/alpha/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/alpha/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.46/arch/alpha/kernel/module.c linux-2.6.32.46/arch/alpha got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.46/arch/alpha/kernel/osf_sys.c linux-2.6.32.46/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.46/arch/alpha/kernel/osf_sys.c 2011-08-09 18:35:28.000000000 -0400 -+++ linux-2.6.32.46/arch/alpha/kernel/osf_sys.c 2011-06-13 17:19:47.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/alpha/kernel/osf_sys.c linux-2.6.32.48/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/alpha/kernel/osf_sys.c 2011-11-12 12:46:42.000000000 -0500 @@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.46/arch/alpha/kernel/osf_sys.c linux-2.6.32.46/arch/alph if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.46/arch/alpha/mm/fault.c linux-2.6.32.46/arch/alpha/mm/fault.c ---- linux-2.6.32.46/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/alpha/mm/fault.c linux-2.6.32.48/arch/alpha/mm/fault.c +--- linux-2.6.32.48/arch/alpha/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/alpha/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.46/arch/alpha/mm/fault.c linux-2.6.32.46/arch/alpha/mm/f } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.46/arch/arm/include/asm/elf.h linux-2.6.32.46/arch/arm/include/asm/elf.h ---- linux-2.6.32.46/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/include/asm/elf.h linux-2.6.32.48/arch/arm/include/asm/elf.h +--- linux-2.6.32.48/arch/arm/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -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. */ @@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.46/arch/arm/include/asm/elf.h linux-2.6.32.46/arch/arm/i /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.32.46/arch/arm/include/asm/kmap_types.h linux-2.6.32.46/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.46/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/include/asm/kmap_types.h linux-2.6.32.48/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.46/arch/arm/include/asm/kmap_types.h linux-2.6.32.46/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.46/arch/arm/include/asm/uaccess.h linux-2.6.32.46/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.46/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/include/asm/uaccess.h 2011-06-29 21:02:24.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/include/asm/uaccess.h linux-2.6.32.48/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -22,6 +22,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -329,9 +329,9 @@ diff -urNp linux-2.6.32.46/arch/arm/include/asm/uaccess.h linux-2.6.32.46/arch/a if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.46/arch/arm/kernel/armksyms.c linux-2.6.32.46/arch/arm/kernel/armksyms.c ---- linux-2.6.32.46/arch/arm/kernel/armksyms.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/kernel/armksyms.c 2011-07-06 19:51:50.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/kernel/armksyms.c linux-2.6.32.48/arch/arm/kernel/armksyms.c +--- linux-2.6.32.48/arch/arm/kernel/armksyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/kernel/armksyms.c 2011-11-12 12:46:42.000000000 -0500 @@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user); #ifdef CONFIG_MMU EXPORT_SYMBOL(copy_page); @@ -343,9 +343,9 @@ diff -urNp linux-2.6.32.46/arch/arm/kernel/armksyms.c linux-2.6.32.46/arch/arm/k EXPORT_SYMBOL(__clear_user); EXPORT_SYMBOL(__get_user_1); -diff -urNp linux-2.6.32.46/arch/arm/kernel/kgdb.c linux-2.6.32.46/arch/arm/kernel/kgdb.c ---- linux-2.6.32.46/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/kernel/kgdb.c linux-2.6.32.48/arch/arm/kernel/kgdb.c +--- linux-2.6.32.48/arch/arm/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -355,9 +355,9 @@ diff -urNp linux-2.6.32.46/arch/arm/kernel/kgdb.c linux-2.6.32.46/arch/arm/kerne #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.46/arch/arm/kernel/traps.c linux-2.6.32.46/arch/arm/kernel/traps.c ---- linux-2.6.32.46/arch/arm/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/kernel/traps.c 2011-06-13 21:31:18.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/kernel/traps.c linux-2.6.32.48/arch/arm/kernel/traps.c +--- linux-2.6.32.48/arch/arm/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500 @@ -247,6 +247,8 @@ static void __die(const char *str, int e DEFINE_SPINLOCK(die_lock); @@ -376,9 +376,9 @@ diff -urNp linux-2.6.32.46/arch/arm/kernel/traps.c linux-2.6.32.46/arch/arm/kern do_exit(SIGSEGV); } -diff -urNp linux-2.6.32.46/arch/arm/lib/copy_from_user.S linux-2.6.32.46/arch/arm/lib/copy_from_user.S ---- linux-2.6.32.46/arch/arm/lib/copy_from_user.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/lib/copy_from_user.S 2011-06-29 20:48:38.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/lib/copy_from_user.S linux-2.6.32.48/arch/arm/lib/copy_from_user.S +--- linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/lib/copy_from_user.S 2011-11-12 12:46:42.000000000 -0500 @@ -16,7 +16,7 @@ /* * Prototype: @@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.46/arch/arm/lib/copy_from_user.S linux-2.6.32.46/arch/ar .section .fixup,"ax" .align 0 -diff -urNp linux-2.6.32.46/arch/arm/lib/copy_to_user.S linux-2.6.32.46/arch/arm/lib/copy_to_user.S ---- linux-2.6.32.46/arch/arm/lib/copy_to_user.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/lib/copy_to_user.S 2011-06-29 20:46:49.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/lib/copy_to_user.S linux-2.6.32.48/arch/arm/lib/copy_to_user.S +--- linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/lib/copy_to_user.S 2011-11-12 12:46:42.000000000 -0500 @@ -16,7 +16,7 @@ /* * Prototype: @@ -428,9 +428,9 @@ diff -urNp linux-2.6.32.46/arch/arm/lib/copy_to_user.S linux-2.6.32.46/arch/arm/ .section .fixup,"ax" .align 0 -diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess.S linux-2.6.32.46/arch/arm/lib/uaccess.S ---- linux-2.6.32.46/arch/arm/lib/uaccess.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/lib/uaccess.S 2011-06-29 20:48:53.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess.S linux-2.6.32.48/arch/arm/lib/uaccess.S +--- linux-2.6.32.48/arch/arm/lib/uaccess.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/lib/uaccess.S 2011-11-12 12:46:42.000000000 -0500 @@ -19,7 +19,7 @@ #define PAGE_SHIFT 12 @@ -484,9 +484,9 @@ diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess.S linux-2.6.32.46/arch/arm/lib/u .section .fixup,"ax" .align 0 -diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c ---- linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c 2011-06-29 20:44:35.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c +--- linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/lib/uaccess_with_memcpy.c 2011-11-12 12:46:42.000000000 -0500 @@ -97,7 +97,7 @@ out: } @@ -496,9 +496,9 @@ diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.46/ar { /* * This test is stubbed out of the main function above to keep -diff -urNp linux-2.6.32.46/arch/arm/mach-at91/pm.c linux-2.6.32.46/arch/arm/mach-at91/pm.c ---- linux-2.6.32.46/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-at91/pm.c linux-2.6.32.48/arch/arm/mach-at91/pm.c +--- linux-2.6.32.48/arch/arm/mach-at91/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-at91/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -508,9 +508,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-at91/pm.c linux-2.6.32.46/arch/arm/mach .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.46/arch/arm/mach-omap1/pm.c linux-2.6.32.46/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.46/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-omap1/pm.c linux-2.6.32.48/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-omap1/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -520,9 +520,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-omap1/pm.c linux-2.6.32.46/arch/arm/mac .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-omap2/pm24xx.c 2011-11-12 12:46:42.000000000 -0500 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -532,9 +532,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.46/arch/arm .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-omap2/pm34xx.c 2011-11-12 12:46:42.000000000 -0500 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -544,9 +544,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.46/arch/arm .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-pnx4008/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -556,9 +556,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c linux-2.6.32.46/arch/arm/m .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/pm.c linux-2.6.32.46/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.46/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/pm.c linux-2.6.32.48/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-pxa/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -568,9 +568,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/pm.c linux-2.6.32.46/arch/arm/mach- .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-pxa/sharpsl_pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -580,9 +580,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.46/arch/a .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.46/arch/arm/mach-sa1100/pm.c linux-2.6.32.46/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.46/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mach-sa1100/pm.c linux-2.6.32.48/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mach-sa1100/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -592,9 +592,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mach-sa1100/pm.c linux-2.6.32.46/arch/arm/ma .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.46/arch/arm/mm/fault.c linux-2.6.32.46/arch/arm/mm/fault.c ---- linux-2.6.32.46/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mm/fault.c linux-2.6.32.48/arch/arm/mm/fault.c +--- linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -643,9 +643,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mm/fault.c linux-2.6.32.46/arch/arm/mm/fault /* * First Level Translation Fault Handler * -diff -urNp linux-2.6.32.46/arch/arm/mm/mmap.c linux-2.6.32.46/arch/arm/mm/mmap.c ---- linux-2.6.32.46/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/mm/mmap.c linux-2.6.32.48/arch/arm/mm/mmap.c +--- linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -695,9 +695,9 @@ diff -urNp linux-2.6.32.46/arch/arm/mm/mmap.c linux-2.6.32.46/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-2.6.32.46/arch/arm/plat-s3c/pm.c linux-2.6.32.46/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.46/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/arm/plat-s3c/pm.c linux-2.6.32.48/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/arm/plat-s3c/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -707,9 +707,9 @@ diff -urNp linux-2.6.32.46/arch/arm/plat-s3c/pm.c linux-2.6.32.46/arch/arm/plat- .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.46/arch/avr32/include/asm/elf.h linux-2.6.32.46/arch/avr32/include/asm/elf.h ---- linux-2.6.32.46/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/avr32/include/asm/elf.h linux-2.6.32.48/arch/avr32/include/asm/elf.h +--- linux-2.6.32.48/arch/avr32/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/avr32/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -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. */ @@ -726,9 +726,9 @@ diff -urNp linux-2.6.32.46/arch/avr32/include/asm/elf.h linux-2.6.32.46/arch/avr /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/avr32/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -739,9 +739,9 @@ diff -urNp linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h linux-2.6.32.46/a }; #undef D -diff -urNp linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/avr32/mach-at32ap/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -176,7 +176,7 @@ out: return 0; } @@ -751,9 +751,9 @@ diff -urNp linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c linux-2.6.32.46/arch/avr3 .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.46/arch/avr32/mm/fault.c linux-2.6.32.46/arch/avr32/mm/fault.c ---- linux-2.6.32.46/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/avr32/mm/fault.c linux-2.6.32.48/arch/avr32/mm/fault.c +--- linux-2.6.32.48/arch/avr32/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/avr32/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.46/arch/avr32/mm/fault.c linux-2.6.32.46/arch/avr32/mm/f if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.46/arch/blackfin/kernel/kgdb.c linux-2.6.32.46/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.46/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/blackfin/kernel/kgdb.c linux-2.6.32.48/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/blackfin/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -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 */ } @@ -807,9 +807,9 @@ diff -urNp linux-2.6.32.46/arch/blackfin/kernel/kgdb.c linux-2.6.32.46/arch/blac .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.46/arch/blackfin/mach-common/pm.c linux-2.6.32.46/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.46/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/blackfin/mach-common/pm.c linux-2.6.32.48/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/blackfin/mach-common/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -819,9 +819,9 @@ diff -urNp linux-2.6.32.46/arch/blackfin/mach-common/pm.c linux-2.6.32.46/arch/b .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -diff -urNp linux-2.6.32.46/arch/frv/include/asm/kmap_types.h linux-2.6.32.46/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.46/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/frv/include/asm/kmap_types.h linux-2.6.32.48/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/frv/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -830,9 +830,9 @@ diff -urNp linux-2.6.32.46/arch/frv/include/asm/kmap_types.h linux-2.6.32.46/arc KM_TYPE_NR }; -diff -urNp linux-2.6.32.46/arch/frv/mm/elf-fdpic.c linux-2.6.32.46/arch/frv/mm/elf-fdpic.c ---- linux-2.6.32.46/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/frv/mm/elf-fdpic.c linux-2.6.32.48/arch/frv/mm/elf-fdpic.c +--- linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/frv/mm/elf-fdpic.c 2011-11-12 12:46:42.000000000 -0500 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr = PAGE_ALIGN(addr); @@ -861,9 +861,9 @@ diff -urNp linux-2.6.32.46/arch/frv/mm/elf-fdpic.c linux-2.6.32.46/arch/frv/mm/e goto success; addr = vma->vm_end; } -diff -urNp linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/hp/common/hwsw_iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -882,9 +882,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.46/arch { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/hp/common/sba_iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -903,9 +903,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.46/arch/ .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/ia32/binfmt_elf32.c 2011-11-12 12:46:42.000000000 -0500 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -920,9 +920,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.46/arch/ia /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.46/arch/ia64/ia32/ia32priv.h linux-2.6.32.46/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.46/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/ia32/ia32priv.h linux-2.6.32.48/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/ia32/ia32priv.h 2011-11-12 12:46:42.000000000 -0500 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -939,9 +939,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/ia32/ia32priv.h linux-2.6.32.46/arch/ia64/i #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -985,9 +985,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.46/a return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/elf.h linux-2.6.32.46/arch/ia64/include/asm/elf.h ---- linux-2.6.32.46/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/elf.h linux-2.6.32.48/arch/ia64/include/asm/elf.h +--- linux-2.6.32.48/arch/ia64/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -1002,9 +1002,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/elf.h linux-2.6.32.46/arch/ia64 #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/machvec.h linux-2.6.32.46/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.46/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/machvec.h linux-2.6.32.48/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/machvec.h 2011-11-12 12:46:42.000000000 -0500 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -1023,9 +1023,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/machvec.h linux-2.6.32.46/arch/ /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/pgtable.h linux-2.6.32.46/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.46/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/pgtable.h linux-2.6.32.48/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500 @@ -12,7 +12,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -1053,9 +1053,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/pgtable.h linux-2.6.32.46/arch/ #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/spinlock.h linux-2.6.32.46/arch/ia64/include/asm/spinlock.h ---- linux-2.6.32.46/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/spinlock.h linux-2.6.32.48/arch/ia64/include/asm/spinlock.h +--- linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/spinlock.h 2011-11-12 12:46:42.000000000 -0500 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; @@ -1065,9 +1065,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/spinlock.h linux-2.6.32.46/arch } static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock) -diff -urNp linux-2.6.32.46/arch/ia64/include/asm/uaccess.h linux-2.6.32.46/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.46/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/include/asm/uaccess.h linux-2.6.32.48/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/include/asm/uaccess.h linux-2.6.32.46/arch/ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/dma-mapping.c 2011-11-12 12:46:42.000000000 -0500 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -1107,9 +1107,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c linux-2.6.32.46/arch/i { return dma_ops; } -diff -urNp linux-2.6.32.46/arch/ia64/kernel/module.c linux-2.6.32.46/arch/ia64/kernel/module.c ---- linux-2.6.32.46/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/module.c linux-2.6.32.48/arch/ia64/kernel/module.c +--- linux-2.6.32.48/arch/ia64/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1198,9 +1198,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/module.c linux-2.6.32.46/arch/ia64/k mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-dma.c linux-2.6.32.46/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.46/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-dma.c linux-2.6.32.48/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/pci-dma.c 2011-11-12 12:46:42.000000000 -0500 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -1252,9 +1252,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-dma.c linux-2.6.32.46/arch/ia64/ /* * The order of these functions is important for -diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/pci-swiotlb.c 2011-11-12 12:46:42.000000000 -0500 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -1264,9 +1264,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.46/arch/i .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:46:42.000000000 -0500 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1299,9 +1299,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c linux-2.6.32.46/arch/ia64 /* Remember the address where we stopped this search: */ mm->free_area_cache = addr + len; return addr; -diff -urNp linux-2.6.32.46/arch/ia64/kernel/topology.c linux-2.6.32.46/arch/ia64/kernel/topology.c ---- linux-2.6.32.46/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/topology.c linux-2.6.32.48/arch/ia64/kernel/topology.c +--- linux-2.6.32.48/arch/ia64/kernel/topology.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/topology.c 2011-11-12 12:46:42.000000000 -0500 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -1311,9 +1311,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/topology.c linux-2.6.32.46/arch/ia64 .show = cache_show }; -diff -urNp linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/kernel/vmlinux.lds.S 2011-11-12 12:46:42.000000000 -0500 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1323,9 +1323,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.46/arch/i . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.46/arch/ia64/mm/fault.c linux-2.6.32.46/arch/ia64/mm/fault.c ---- linux-2.6.32.46/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/mm/fault.c linux-2.6.32.48/arch/ia64/mm/fault.c +--- linux-2.6.32.48/arch/ia64/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1375,9 +1375,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/mm/fault.c linux-2.6.32.46/arch/ia64/mm/fau survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c ---- linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c +--- linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -1387,9 +1387,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c linux-2.6.32.46/arch/ia64/ return addr; addr = ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-2.6.32.46/arch/ia64/mm/init.c linux-2.6.32.46/arch/ia64/mm/init.c ---- linux-2.6.32.46/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/mm/init.c linux-2.6.32.48/arch/ia64/mm/init.c +--- linux-2.6.32.48/arch/ia64/mm/init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/mm/init.c 2011-11-12 12:46:42.000000000 -0500 @@ -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; @@ -1410,9 +1410,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/mm/init.c linux-2.6.32.46/arch/ia64/mm/init vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/ia64/sn/pci/pci_dma.c 2011-11-12 12:46:42.000000000 -0500 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1422,9 +1422,9 @@ diff -urNp linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.46/arch/ia64/ .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.32.46/arch/m32r/lib/usercopy.c linux-2.6.32.46/arch/m32r/lib/usercopy.c ---- linux-2.6.32.46/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/m32r/lib/usercopy.c linux-2.6.32.48/arch/m32r/lib/usercopy.c +--- linux-2.6.32.48/arch/m32r/lib/usercopy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/m32r/lib/usercopy.c 2011-11-12 12:46:42.000000000 -0500 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1445,9 +1445,9 @@ diff -urNp linux-2.6.32.46/arch/m32r/lib/usercopy.c linux-2.6.32.46/arch/m32r/li prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/alchemy/devboards/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1457,9 +1457,9 @@ diff -urNp linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c linux-2.6.32.46/arch .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.46/arch/mips/include/asm/elf.h linux-2.6.32.46/arch/mips/include/asm/elf.h ---- linux-2.6.32.46/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/include/asm/elf.h linux-2.6.32.48/arch/mips/include/asm/elf.h +--- linux-2.6.32.48/arch/mips/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1472,9 +1472,9 @@ diff -urNp linux-2.6.32.46/arch/mips/include/asm/elf.h linux-2.6.32.46/arch/mips +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.46/arch/mips/include/asm/page.h linux-2.6.32.46/arch/mips/include/asm/page.h ---- linux-2.6.32.46/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/include/asm/page.h linux-2.6.32.48/arch/mips/include/asm/page.h +--- linux-2.6.32.48/arch/mips/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500 @@ -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; @@ -1484,9 +1484,9 @@ diff -urNp linux-2.6.32.46/arch/mips/include/asm/page.h linux-2.6.32.46/arch/mip #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.46/arch/mips/include/asm/reboot.h linux-2.6.32.46/arch/mips/include/asm/reboot.h ---- linux-2.6.32.46/arch/mips/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/include/asm/reboot.h 2011-08-21 17:35:02.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/include/asm/reboot.h linux-2.6.32.48/arch/mips/include/asm/reboot.h +--- linux-2.6.32.48/arch/mips/include/asm/reboot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/include/asm/reboot.h 2011-11-12 12:46:42.000000000 -0500 @@ -9,7 +9,7 @@ #ifndef _ASM_REBOOT_H #define _ASM_REBOOT_H @@ -1497,9 +1497,9 @@ diff -urNp linux-2.6.32.46/arch/mips/include/asm/reboot.h linux-2.6.32.46/arch/m +extern void (*__noreturn _machine_halt)(void); #endif /* _ASM_REBOOT_H */ -diff -urNp linux-2.6.32.46/arch/mips/include/asm/system.h linux-2.6.32.46/arch/mips/include/asm/system.h ---- linux-2.6.32.46/arch/mips/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/include/asm/system.h linux-2.6.32.48/arch/mips/include/asm/system.h +--- linux-2.6.32.48/arch/mips/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1508,9 +1508,9 @@ diff -urNp linux-2.6.32.46/arch/mips/include/asm/system.h linux-2.6.32.46/arch/m +#define arch_align_stack(x) ((x) & ~0xfUL) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfn32.c 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -1525,9 +1525,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.46/arch #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/binfmt_elfo32.c 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -1542,9 +1542,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.46/arch #include <asm/processor.h> /* -diff -urNp linux-2.6.32.46/arch/mips/kernel/kgdb.c linux-2.6.32.46/arch/mips/kernel/kgdb.c ---- linux-2.6.32.46/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/kgdb.c linux-2.6.32.48/arch/mips/kernel/kgdb.c +--- linux-2.6.32.48/arch/mips/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1553,9 +1553,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/kgdb.c linux-2.6.32.46/arch/mips/ker struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.46/arch/mips/kernel/process.c linux-2.6.32.46/arch/mips/kernel/process.c ---- linux-2.6.32.46/arch/mips/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/process.c linux-2.6.32.48/arch/mips/kernel/process.c +--- linux-2.6.32.48/arch/mips/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/process.c 2011-11-12 12:46:42.000000000 -0500 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1572,9 +1572,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/process.c linux-2.6.32.46/arch/mips/ - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.46/arch/mips/kernel/reset.c linux-2.6.32.46/arch/mips/kernel/reset.c ---- linux-2.6.32.46/arch/mips/kernel/reset.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/reset.c 2011-08-21 17:35:26.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/reset.c linux-2.6.32.48/arch/mips/kernel/reset.c +--- linux-2.6.32.48/arch/mips/kernel/reset.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/reset.c 2011-11-12 12:46:42.000000000 -0500 @@ -19,8 +19,8 @@ * So handle all using function pointers to machine specific * functions. @@ -1606,9 +1606,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/reset.c linux-2.6.32.46/arch/mips/ke pm_power_off(); + BUG(); } -diff -urNp linux-2.6.32.46/arch/mips/kernel/syscall.c linux-2.6.32.46/arch/mips/kernel/syscall.c ---- linux-2.6.32.46/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/kernel/syscall.c linux-2.6.32.48/arch/mips/kernel/syscall.c +--- linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/kernel/syscall.c 2011-11-12 12:46:42.000000000 -0500 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1643,9 +1643,9 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/syscall.c linux-2.6.32.46/arch/mips/ return addr; addr = vmm->vm_end; if (do_color_align) -diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile ---- linux-2.6.32.46/arch/mips/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/Makefile 2011-08-21 19:26:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/Makefile linux-2.6.32.48/arch/mips/Makefile +--- linux-2.6.32.48/arch/mips/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -51,6 +51,8 @@ endif cflags-y := -ffunction-sections cflags-y += $(call cc-option, -mno-check-zero-division) @@ -1655,9 +1655,9 @@ diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile ifdef CONFIG_32BIT ld-emul = $(32bit-emul) vmlinux-32 = vmlinux -diff -urNp linux-2.6.32.46/arch/mips/mm/fault.c linux-2.6.32.46/arch/mips/mm/fault.c ---- linux-2.6.32.46/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/mips/mm/fault.c linux-2.6.32.48/arch/mips/mm/fault.c +--- linux-2.6.32.48/arch/mips/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/mips/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1682,9 +1682,9 @@ diff -urNp linux-2.6.32.46/arch/mips/mm/fault.c linux-2.6.32.46/arch/mips/mm/fau /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.46/arch/parisc/include/asm/elf.h linux-2.6.32.46/arch/parisc/include/asm/elf.h ---- linux-2.6.32.46/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/include/asm/elf.h linux-2.6.32.48/arch/parisc/include/asm/elf.h +--- linux-2.6.32.48/arch/parisc/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1699,9 +1699,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/include/asm/elf.h linux-2.6.32.46/arch/pa /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.46/arch/parisc/include/asm/pgtable.h linux-2.6.32.46/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.46/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/include/asm/pgtable.h linux-2.6.32.48/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1720,9 +1720,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/include/asm/pgtable.h linux-2.6.32.46/arc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.46/arch/parisc/kernel/module.c linux-2.6.32.46/arch/parisc/kernel/module.c ---- linux-2.6.32.46/arch/parisc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/kernel/module.c linux-2.6.32.48/arch/parisc/kernel/module.c +--- linux-2.6.32.48/arch/parisc/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1823,9 +1823,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/kernel/module.c linux-2.6.32.46/arch/pari DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:46:42.000000000 -0500 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1853,9 +1853,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c linux-2.6.32.46/arch/ if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.46/arch/parisc/kernel/traps.c linux-2.6.32.46/arch/parisc/kernel/traps.c ---- linux-2.6.32.46/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/kernel/traps.c linux-2.6.32.48/arch/parisc/kernel/traps.c +--- linux-2.6.32.48/arch/parisc/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1867,9 +1867,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/kernel/traps.c linux-2.6.32.46/arch/paris fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.46/arch/parisc/mm/fault.c linux-2.6.32.46/arch/parisc/mm/fault.c ---- linux-2.6.32.46/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/parisc/mm/fault.c linux-2.6.32.48/arch/parisc/mm/fault.c +--- linux-2.6.32.48/arch/parisc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/parisc/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -2039,9 +2039,9 @@ diff -urNp linux-2.6.32.46/arch/parisc/mm/fault.c linux-2.6.32.46/arch/parisc/mm /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/device.h linux-2.6.32.46/arch/powerpc/include/asm/device.h ---- linux-2.6.32.46/arch/powerpc/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/device.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/device.h linux-2.6.32.48/arch/powerpc/include/asm/device.h +--- linux-2.6.32.48/arch/powerpc/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/device.h 2011-11-12 12:46:42.000000000 -0500 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -2051,9 +2051,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/device.h linux-2.6.32.46/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.46/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 extern struct dma_map_ops dma_iommu_ops; @@ -2120,9 +2120,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.4 if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/elf.h linux-2.6.32.46/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.46/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/elf.h linux-2.6.32.48/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -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. */ @@ -2155,9 +2155,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/elf.h linux-2.6.32.46/arch/p #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/iommu.h linux-2.6.32.46/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.46/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/iommu.h linux-2.6.32.48/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/iommu.h 2011-11-12 12:46:42.000000000 -0500 @@ -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); @@ -2168,9 +2168,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/iommu.h linux-2.6.32.46/arch #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -2179,9 +2179,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.46 KM_TYPE_NR }; -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.46/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page_64.h linux-2.6.32.48/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/page_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -2203,9 +2203,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/ar #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/powerpc/include/asm/page.h ---- linux-2.6.32.46/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/page.h 2011-08-21 16:07:39.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/page.h linux-2.6.32.48/arch/powerpc/include/asm/page.h +--- linux-2.6.32.48/arch/powerpc/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -2228,9 +2228,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pci.h linux-2.6.32.46/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.46/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pci.h linux-2.6.32.48/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/pci.h 2011-11-12 12:46:42.000000000 -0500 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -2242,9 +2242,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pci.h linux-2.6.32.46/arch/p #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h ---- linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h +--- linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -2253,9 +2253,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h linux-2.6.32.46/ar #ifndef __ASSEMBLY__ #include <asm/processor.h> /* For TASK_SIZE */ #include <asm/mmu.h> -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/pte-hash32.h 2011-11-12 12:46:42.000000000 -0500 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2264,9 +2264,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.46 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h ---- linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h 2011-08-21 15:53:58.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h +--- linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/ptrace.h 2011-11-12 12:46:42.000000000 -0500 @@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct p } while(0) @@ -2276,9 +2276,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h linux-2.6.32.46/arc extern int ptrace_put_reg(struct task_struct *task, int regno, unsigned long data); -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/reg.h linux-2.6.32.46/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.46/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/reg.h linux-2.6.32.48/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/reg.h 2011-11-12 12:46:42.000000000 -0500 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2287,9 +2287,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/reg.h linux-2.6.32.46/arch/p #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/swiotlb.h 2011-11-12 12:46:42.000000000 -0500 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.46/ar static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/system.h linux-2.6.32.46/arch/powerpc/include/asm/system.h ---- linux-2.6.32.46/arch/powerpc/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/system.h linux-2.6.32.48/arch/powerpc/include/asm/system.h +--- linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #endif @@ -2311,9 +2311,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/system.h linux-2.6.32.46/arc /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -2491,9 +2491,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h linux-2.6.32.46/ar extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/cacheinfo.c 2011-11-12 12:46:42.000000000 -0500 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2503,9 +2503,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.46/arch/ .show = cache_index_show, }; -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerpc/kernel/dma.c ---- linux-2.6.32.46/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma.c linux-2.6.32.48/arch/powerpc/kernel/dma.c +--- linux-2.6.32.48/arch/powerpc/kernel/dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/dma.c 2011-11-12 12:46:42.000000000 -0500 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2515,9 +2515,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerp .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/dma-iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2527,9 +2527,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.46/arch/ { struct iommu_table *tbl = get_iommu_table_base(dev); -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/dma-swiotlb.c 2011-11-12 12:46:42.000000000 -0500 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2539,9 +2539,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.46/arc .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S ---- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64e.S 2011-11-12 12:46:42.000000000 -0500 @@ -455,6 +455,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -2560,9 +2560,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.46/ addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S ---- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/exceptions-64s.S 2011-11-12 12:46:42.000000000 -0500 @@ -818,10 +818,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -2575,9 +2575,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.46/ mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/ibmebus.c 2011-11-12 12:46:42.000000000 -0500 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2587,9 +2587,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c linux-2.6.32.46/arch/po .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/kgdb.c linux-2.6.32.46/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.46/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/kgdb.c linux-2.6.32.48/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2608,9 +2608,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/kgdb.c linux-2.6.32.46/arch/power .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.46/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module_32.c linux-2.6.32.48/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/module_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2640,9 +2640,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/powerpc/kernel/module.c ---- linux-2.6.32.46/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/module.c linux-2.6.32.48/arch/powerpc/kernel/module.c +--- linux-2.6.32.48/arch/powerpc/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2682,9 +2682,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/pow static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/pci-common.c linux-2.6.32.46/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.46/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/pci-common.c linux-2.6.32.48/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/pci-common.c 2011-11-12 12:46:42.000000000 -0500 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2703,9 +2703,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/pci-common.c linux-2.6.32.46/arch { return pci_dma_ops; } -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/process.c linux-2.6.32.46/arch/powerpc/kernel/process.c ---- linux-2.6.32.46/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/process.c linux-2.6.32.48/arch/powerpc/kernel/process.c +--- linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/process.c 2011-11-12 12:46:42.000000000 -0500 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2798,9 +2798,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/process.c linux-2.6.32.46/arch/po - - return ret; -} -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ptrace.c linux-2.6.32.46/arch/powerpc/kernel/ptrace.c ---- linux-2.6.32.46/arch/powerpc/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/ptrace.c 2011-08-21 15:53:39.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/ptrace.c linux-2.6.32.48/arch/powerpc/kernel/ptrace.c +--- linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/ptrace.c 2011-11-12 12:46:42.000000000 -0500 @@ -86,7 +86,7 @@ static int set_user_trap(struct task_str /* * Get contents of register REGNO in task TASK. @@ -2819,9 +2819,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ptrace.c linux-2.6.32.46/arch/pow } else { flush_fp_to_thread(child); tmp = ((unsigned long *)child->thread.fpr) -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_32.c linux-2.6.32.46/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.46/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_32.c linux-2.6.32.48/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/signal_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2831,9 +2831,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_32.c linux-2.6.32.46/arch/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_64.c linux-2.6.32.46/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.46/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/signal_64.c linux-2.6.32.48/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/signal_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2843,9 +2843,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_64.c linux-2.6.32.46/arch/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/sys_ppc32.c 2011-11-12 12:46:42.000000000 -0500 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2859,9 +2859,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.46/arch/ } return error; } -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/traps.c linux-2.6.32.46/arch/powerpc/kernel/traps.c ---- linux-2.6.32.46/arch/powerpc/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/traps.c 2011-06-13 21:33:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/traps.c linux-2.6.32.48/arch/powerpc/kernel/traps.c +--- linux-2.6.32.48/arch/powerpc/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500 @@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void) static inline void pmac_backlight_unblank(void) { } #endif @@ -2880,9 +2880,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/traps.c linux-2.6.32.46/arch/powe oops_exit(); do_exit(err); -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vdso.c linux-2.6.32.46/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.46/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vdso.c linux-2.6.32.48/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/vdso.c 2011-11-12 12:46:42.000000000 -0500 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2909,9 +2909,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vdso.c linux-2.6.32.46/arch/power if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vio.c linux-2.6.32.46/arch/powerpc/kernel/vio.c ---- linux-2.6.32.46/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/kernel/vio.c linux-2.6.32.48/arch/powerpc/kernel/vio.c +--- linux-2.6.32.48/arch/powerpc/kernel/vio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/kernel/vio.c 2011-11-12 12:46:42.000000000 -0500 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2934,9 +2934,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vio.c linux-2.6.32.46/arch/powerp viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/lib/usercopy_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2968,9 +2968,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c linux-2.6.32.46/arch/p -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Makefile ---- linux-2.6.32.46/arch/powerpc/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/Makefile 2011-08-21 19:27:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/Makefile linux-2.6.32.48/arch/powerpc/Makefile +--- linux-2.6.32.48/arch/powerpc/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -74,6 +74,8 @@ KBUILD_AFLAGS += -Iarch/$(ARCH) KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) CPP = $(CC) -E $(KBUILD_CFLAGS) @@ -2980,9 +2980,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Ma CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__ ifeq ($(CONFIG_PPC64),y) -diff -urNp linux-2.6.32.46/arch/powerpc/mm/fault.c linux-2.6.32.46/arch/powerpc/mm/fault.c ---- linux-2.6.32.46/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/mm/fault.c linux-2.6.32.48/arch/powerpc/mm/fault.c +--- linux-2.6.32.48/arch/powerpc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -3087,9 +3087,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/mm/fault.c linux-2.6.32.46/arch/powerpc/ _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.46/arch/powerpc/mm/mem.c linux-2.6.32.46/arch/powerpc/mm/mem.c ---- linux-2.6.32.46/arch/powerpc/mm/mem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/mm/mem.c 2011-08-21 15:50:39.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/mm/mem.c linux-2.6.32.48/arch/powerpc/mm/mem.c +--- linux-2.6.32.48/arch/powerpc/mm/mem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/mm/mem.c 2011-11-12 12:46:42.000000000 -0500 @@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(voi { unsigned long lmb_next_region_start_pfn, @@ -3099,9 +3099,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/mm/mem.c linux-2.6.32.46/arch/powerpc/mm for (i = 0; i < lmb.memory.cnt - 1; i++) { lmb_region_max_pfn = -diff -urNp linux-2.6.32.46/arch/powerpc/mm/mmap_64.c linux-2.6.32.46/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.46/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/mm/mmap_64.c linux-2.6.32.48/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/mm/mmap_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3125,9 +3125,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/mm/mmap_64.c linux-2.6.32.46/arch/powerp mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.46/arch/powerpc/mm/slice.c linux-2.6.32.46/arch/powerpc/mm/slice.c ---- linux-2.6.32.46/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/mm/slice.c linux-2.6.32.48/arch/powerpc/mm/slice.c +--- linux-2.6.32.48/arch/powerpc/mm/slice.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/mm/slice.c 2011-11-12 12:46:42.000000000 -0500 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/mm/slice.c linux-2.6.32.46/arch/powerpc/ /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -3206,9 +3206,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3 .valid = lite5200_pm_valid, .begin = lite5200_pm_begin, .prepare = lite5200_pm_prepare, -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -3218,9 +3218,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32 .valid = mpc52xx_pm_valid, .prepare = mpc52xx_pm_prepare, .enter = mpc52xx_pm_enter, -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/83xx/suspend.c 2011-11-12 12:46:42.000000000 -0500 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -3230,9 +3230,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.46 .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/cell/iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); @@ -3242,9 +3242,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.46/a .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/ps3/system-bus.c 2011-11-12 12:46:42.000000000 -0500 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -3263,9 +3263,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32. .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig ---- linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/powerpc/platforms/pseries/Kconfig 2011-11-12 12:46:42.000000000 -0500 @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" @@ -3275,9 +3275,9 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.4 select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING -diff -urNp linux-2.6.32.46/arch/s390/include/asm/elf.h linux-2.6.32.46/arch/s390/include/asm/elf.h ---- linux-2.6.32.46/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/include/asm/elf.h linux-2.6.32.48/arch/s390/include/asm/elf.h +--- linux-2.6.32.48/arch/s390/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -3292,9 +3292,9 @@ diff -urNp linux-2.6.32.46/arch/s390/include/asm/elf.h linux-2.6.32.46/arch/s390 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. */ -diff -urNp linux-2.6.32.46/arch/s390/include/asm/setup.h linux-2.6.32.46/arch/s390/include/asm/setup.h ---- linux-2.6.32.46/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/include/asm/setup.h linux-2.6.32.48/arch/s390/include/asm/setup.h +--- linux-2.6.32.48/arch/s390/include/asm/setup.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/include/asm/setup.h 2011-11-12 12:46:42.000000000 -0500 @@ -50,13 +50,13 @@ extern unsigned long memory_end; void detect_memory_layout(struct mem_chunk chunk[]); @@ -3311,9 +3311,9 @@ diff -urNp linux-2.6.32.46/arch/s390/include/asm/setup.h linux-2.6.32.46/arch/s3 #else #define s390_noexec (0) #endif -diff -urNp linux-2.6.32.46/arch/s390/include/asm/uaccess.h linux-2.6.32.46/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.46/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/include/asm/uaccess.h linux-2.6.32.48/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -3346,9 +3346,9 @@ diff -urNp linux-2.6.32.46/arch/s390/include/asm/uaccess.h linux-2.6.32.46/arch/ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig ---- linux-2.6.32.46/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/Kconfig linux-2.6.32.48/arch/s390/Kconfig +--- linux-2.6.32.48/arch/s390/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/Kconfig 2011-11-12 12:46:42.000000000 -0500 @@ -194,28 +194,26 @@ config AUDIT_ARCH config S390_SWITCH_AMODE @@ -3386,9 +3386,9 @@ diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig comment "Code generation options" -diff -urNp linux-2.6.32.46/arch/s390/kernel/module.c linux-2.6.32.46/arch/s390/kernel/module.c ---- linux-2.6.32.46/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/kernel/module.c linux-2.6.32.48/arch/s390/kernel/module.c +--- linux-2.6.32.48/arch/s390/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -3460,9 +3460,9 @@ diff -urNp linux-2.6.32.46/arch/s390/kernel/module.c linux-2.6.32.46/arch/s390/k rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.46/arch/s390/kernel/setup.c linux-2.6.32.46/arch/s390/kernel/setup.c ---- linux-2.6.32.46/arch/s390/kernel/setup.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/kernel/setup.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/kernel/setup.c linux-2.6.32.48/arch/s390/kernel/setup.c +--- linux-2.6.32.48/arch/s390/kernel/setup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/kernel/setup.c 2011-11-12 12:46:42.000000000 -0500 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char * early_param("mem", early_parse_mem); @@ -3516,9 +3516,9 @@ diff -urNp linux-2.6.32.46/arch/s390/kernel/setup.c linux-2.6.32.46/arch/s390/ke static void setup_addressing_mode(void) { if (s390_noexec) { -diff -urNp linux-2.6.32.46/arch/s390/mm/mmap.c linux-2.6.32.46/arch/s390/mm/mmap.c ---- linux-2.6.32.46/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/s390/mm/mmap.c linux-2.6.32.48/arch/s390/mm/mmap.c +--- linux-2.6.32.48/arch/s390/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/s390/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -3565,9 +3565,9 @@ diff -urNp linux-2.6.32.46/arch/s390/mm/mmap.c linux-2.6.32.46/arch/s390/mm/mmap mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.46/arch/score/include/asm/system.h linux-2.6.32.46/arch/score/include/asm/system.h ---- linux-2.6.32.46/arch/score/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/score/include/asm/system.h 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/score/include/asm/system.h linux-2.6.32.48/arch/score/include/asm/system.h +--- linux-2.6.32.48/arch/score/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/score/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) @@ -3577,9 +3577,9 @@ diff -urNp linux-2.6.32.46/arch/score/include/asm/system.h linux-2.6.32.46/arch/ #define mb() barrier() #define rmb() barrier() -diff -urNp linux-2.6.32.46/arch/score/kernel/process.c linux-2.6.32.46/arch/score/kernel/process.c ---- linux-2.6.32.46/arch/score/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/score/kernel/process.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/score/kernel/process.c linux-2.6.32.48/arch/score/kernel/process.c +--- linux-2.6.32.48/arch/score/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/score/kernel/process.c 2011-11-12 12:46:42.000000000 -0500 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru return task_pt_regs(task)->cp0_epc; @@ -3589,9 +3589,9 @@ diff -urNp linux-2.6.32.46/arch/score/kernel/process.c linux-2.6.32.46/arch/scor -{ - return sp; -} -diff -urNp linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sh/boards/mach-hp6xx/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -3601,9 +3601,9 @@ diff -urNp linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.46/arch/s .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sh/kernel/cpu/sh4/sq.c 2011-11-12 12:46:42.000000000 -0500 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -3613,9 +3613,9 @@ diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.46/arch/sh/k .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sh/kernel/cpu/shmobile/pm.c 2011-11-12 12:46:42.000000000 -0500 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -3625,9 +3625,9 @@ diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.46/arch .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.46/arch/sh/kernel/kgdb.c linux-2.6.32.46/arch/sh/kernel/kgdb.c ---- linux-2.6.32.46/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sh/kernel/kgdb.c linux-2.6.32.48/arch/sh/kernel/kgdb.c +--- linux-2.6.32.48/arch/sh/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sh/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -3637,9 +3637,9 @@ diff -urNp linux-2.6.32.46/arch/sh/kernel/kgdb.c linux-2.6.32.46/arch/sh/kernel/ /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.46/arch/sh/mm/mmap.c linux-2.6.32.46/arch/sh/mm/mmap.c ---- linux-2.6.32.46/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sh/mm/mmap.c linux-2.6.32.48/arch/sh/mm/mmap.c +--- linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sh/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr = PAGE_ALIGN(addr); @@ -3714,9 +3714,9 @@ diff -urNp linux-2.6.32.46/arch/sh/mm/mmap.c linux-2.6.32.46/arch/sh/mm/mmap.c bottomup: /* -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h 2011-08-18 23:11:34.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3909,9 +3909,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h linux-2.6.32.46/ar } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/cache.h linux-2.6.32.46/arch/sparc/include/asm/cache.h ---- linux-2.6.32.46/arch/sparc/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/cache.h 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/cache.h linux-2.6.32.48/arch/sparc/include/asm/cache.h +--- linux-2.6.32.48/arch/sparc/include/asm/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/cache.h 2011-11-12 12:46:42.000000000 -0500 @@ -8,7 +8,7 @@ #define _SPARC_CACHE_H @@ -3921,9 +3921,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/cache.h linux-2.6.32.46/arch/s #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))) #ifdef CONFIG_SPARC32 -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.46/ debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); ops->free_coherent(dev, size, cpu_addr, dma_handle); -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_32.h linux-2.6.32.46/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.46/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/elf_32.h linux-2.6.32.48/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/elf_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3972,9 +3972,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_32.h linux-2.6.32.46/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_64.h linux-2.6.32.46/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.46/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/elf_64.h linux-2.6.32.48/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/elf_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3988,9 +3988,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_64.h linux-2.6.32.46/arch/ /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/pgtable_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -4022,9 +4022,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.46/a extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/pgtsrmmu.h 2011-11-12 12:46:42.000000000 -0500 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -4039,9 +4039,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.46/arc #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h 2011-08-18 23:19:30.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/spinlock_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ @@ -4139,9 +4139,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.46/ { unsigned long mask, tmp1, tmp2, result; -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h ---- linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h 2011-06-04 20:46:01.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h +--- linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -50,6 +50,8 @@ struct thread_info { unsigned long w_saved; @@ -4151,9 +4151,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h linux-2.6.32. }; /* -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h ---- linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h 2011-06-04 20:46:21.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h +--- linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -68,6 +68,8 @@ struct thread_info { struct pt_regs *kern_una_regs; unsigned int kern_una_insn; @@ -4163,9 +4163,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h linux-2.6.32. unsigned long fpregs[0] __attribute__ ((aligned(64))); }; -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -4217,9 +4217,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.46/a return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -4262,9 +4262,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.46/a if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch/sparc/include/asm/uaccess.h ---- linux-2.6.32.46/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/include/asm/uaccess.h linux-2.6.32.48/arch/sparc/include/asm/uaccess.h +--- linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -4279,9 +4279,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch #if defined(__sparc__) && defined(__arch64__) #include <asm/uaccess_64.h> #else -diff -urNp linux-2.6.32.46/arch/sparc/kernel/iommu.c linux-2.6.32.46/arch/sparc/kernel/iommu.c ---- linux-2.6.32.46/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/iommu.c linux-2.6.32.48/arch/sparc/kernel/iommu.c +--- linux-2.6.32.48/arch/sparc/kernel/iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -4300,9 +4300,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/iommu.c linux-2.6.32.46/arch/sparc/ EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.46/arch/sparc/kernel/ioport.c linux-2.6.32.46/arch/sparc/kernel/ioport.c ---- linux-2.6.32.46/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/ioport.c linux-2.6.32.48/arch/sparc/kernel/ioport.c +--- linux-2.6.32.48/arch/sparc/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/ioport.c 2011-11-12 12:46:42.000000000 -0500 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -4330,9 +4330,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/ioport.c linux-2.6.32.46/arch/sparc .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/kgdb_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -4342,9 +4342,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c linux-2.6.32.46/arch/spar /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/kgdb_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -4354,9 +4354,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c linux-2.6.32.46/arch/spar /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc/kernel/Makefile ---- linux-2.6.32.46/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/Makefile linux-2.6.32.48/arch/sparc/kernel/Makefile +--- linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -3,7 +3,7 @@ # @@ -4366,9 +4366,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/pci_sun4v.c 2011-11-12 12:46:42.000000000 -0500 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -4378,9 +4378,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.46/arch/sp .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_32.c linux-2.6.32.46/arch/sparc/kernel/process_32.c ---- linux-2.6.32.46/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_32.c linux-2.6.32.48/arch/sparc/kernel/process_32.c +--- linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/process_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -4416,9 +4416,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_32.c linux-2.6.32.46/arch/s fp = rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_64.c linux-2.6.32.46/arch/sparc/kernel/process_64.c ---- linux-2.6.32.46/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/process_64.c linux-2.6.32.48/arch/sparc/kernel/process_64.c +--- linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/process_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -4454,9 +4454,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_64.c linux-2.6.32.46/arch/s (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -4475,9 +4475,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.46/arch return addr; addr = vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -4625,9 +4625,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.46/arch mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_32.c linux-2.6.32.46/arch/sparc/kernel/traps_32.c ---- linux-2.6.32.46/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/traps_32.c 2011-06-13 21:25:39.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_32.c linux-2.6.32.48/arch/sparc/kernel/traps_32.c +--- linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/traps_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t") #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t") @@ -4657,9 +4657,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_32.c linux-2.6.32.46/arch/spa do_exit(SIGSEGV); } -diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_64.c linux-2.6.32.46/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.46/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/traps_64.c 2011-06-13 21:24:11.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/traps_64.c linux-2.6.32.48/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/traps_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -4791,9 +4791,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_64.c linux-2.6.32.46/arch/spa do_exit(SIGSEGV); } EXPORT_SYMBOL(die_if_kernel); -diff -urNp linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S ---- linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S 2011-07-13 22:20:05.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S +--- linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/una_asm_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -127,7 +127,7 @@ do_int_load: wr %o5, 0x0, %asi retl @@ -4803,9 +4803,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S linux-2.6.32.46/arch/s .section __ex_table,"a" .word 4b, __retl_efault -diff -urNp linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c ---- linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c +--- linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/kernel/unaligned_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs if (count < 5) { last_time = jiffies; @@ -4815,9 +4815,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c linux-2.6.32.46/arch regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-2.6.32.46/arch/sparc/lib/atomic_64.S linux-2.6.32.46/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.46/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/lib/atomic_64.S linux-2.6.32.48/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/lib/atomic_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -5052,9 +5052,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/atomic_64.S linux-2.6.32.46/arch/sparc casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.46/arch/sparc/lib/ksyms.c linux-2.6.32.46/arch/sparc/lib/ksyms.c ---- linux-2.6.32.46/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/lib/ksyms.c 2011-08-19 23:05:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/lib/ksyms.c linux-2.6.32.48/arch/sparc/lib/ksyms.c +--- linux-2.6.32.48/arch/sparc/lib/ksyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/lib/ksyms.c 2011-11-12 12:46:42.000000000 -0500 @@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -5074,9 +5074,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/ksyms.c linux-2.6.32.46/arch/sparc/lib EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ -diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/lib/Makefile ---- linux-2.6.32.46/arch/sparc/lib/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/lib/Makefile 2011-05-17 19:26:34.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/lib/Makefile linux-2.6.32.48/arch/sparc/lib/Makefile +--- linux-2.6.32.48/arch/sparc/lib/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/lib/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -2,7 +2,7 @@ # @@ -5086,9 +5086,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/li lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o lib-$(CONFIG_SPARC32) += memcpy.o memset.o -diff -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.46/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/lib/rwsem_64.S linux-2.6.32.48/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/lib/rwsem_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -5187,9 +5187,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/ cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefile ---- linux-2.6.32.46/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/Makefile linux-2.6.32.48/arch/sparc/Makefile +--- linux-2.6.32.48/arch/sparc/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -5199,9 +5199,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefi VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_32.c linux-2.6.32.46/arch/sparc/mm/fault_32.c ---- linux-2.6.32.46/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_32.c linux-2.6.32.48/arch/sparc/mm/fault_32.c +--- linux-2.6.32.48/arch/sparc/mm/fault_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/fault_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -5505,9 +5505,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_32.c linux-2.6.32.46/arch/sparc/m /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_64.c linux-2.6.32.46/arch/sparc/mm/fault_64.c ---- linux-2.6.32.46/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/fault_64.c linux-2.6.32.48/arch/sparc/mm/fault_64.c +--- linux-2.6.32.48/arch/sparc/mm/fault_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/fault_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -6014,9 +6014,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_64.c linux-2.6.32.46/arch/sparc/m /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c ---- linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c +--- linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500 @@ -69,7 +69,7 @@ full_search: } return -ENOMEM; @@ -6076,9 +6076,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c linux-2.6.32.46/arch/spar return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-2.6.32.46/arch/sparc/mm/init_32.c linux-2.6.32.46/arch/sparc/mm/init_32.c ---- linux-2.6.32.46/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/init_32.c linux-2.6.32.48/arch/sparc/mm/init_32.c +--- linux-2.6.32.48/arch/sparc/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/init_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -6113,9 +6113,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/init_32.c linux-2.6.32.46/arch/sparc/mm protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/Makefile ---- linux-2.6.32.46/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/Makefile linux-2.6.32.48/arch/sparc/mm/Makefile +--- linux-2.6.32.48/arch/sparc/mm/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -2,7 +2,7 @@ # @@ -6125,9 +6125,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.46/arch/sparc/mm/srmmu.c linux-2.6.32.46/arch/sparc/mm/srmmu.c ---- linux-2.6.32.46/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/sparc/mm/srmmu.c linux-2.6.32.48/arch/sparc/mm/srmmu.c +--- linux-2.6.32.48/arch/sparc/mm/srmmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/sparc/mm/srmmu.c 2011-11-12 12:46:42.000000000 -0500 @@ -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)); @@ -6142,9 +6142,9 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/srmmu.c linux-2.6.32.46/arch/sparc/mm/s BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.32.46/arch/um/include/asm/kmap_types.h linux-2.6.32.46/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.46/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/um/include/asm/kmap_types.h linux-2.6.32.48/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/um/include/asm/kmap_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -6153,9 +6153,9 @@ diff -urNp linux-2.6.32.46/arch/um/include/asm/kmap_types.h linux-2.6.32.46/arch KM_TYPE_NR }; -diff -urNp linux-2.6.32.46/arch/um/include/asm/page.h linux-2.6.32.46/arch/um/include/asm/page.h ---- linux-2.6.32.46/arch/um/include/asm/page.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/um/include/asm/page.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/um/include/asm/page.h linux-2.6.32.48/arch/um/include/asm/page.h +--- linux-2.6.32.48/arch/um/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/um/include/asm/page.h 2011-11-12 12:46:42.000000000 -0500 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -6166,9 +6166,9 @@ diff -urNp linux-2.6.32.46/arch/um/include/asm/page.h linux-2.6.32.46/arch/um/in #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.46/arch/um/kernel/process.c linux-2.6.32.46/arch/um/kernel/process.c ---- linux-2.6.32.46/arch/um/kernel/process.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/um/kernel/process.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/um/kernel/process.c linux-2.6.32.48/arch/um/kernel/process.c +--- linux-2.6.32.48/arch/um/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/um/kernel/process.c 2011-11-12 12:46:42.000000000 -0500 @@ -393,22 +393,6 @@ int singlestepping(void * t) return 2; } @@ -6192,9 +6192,9 @@ diff -urNp linux-2.6.32.46/arch/um/kernel/process.c linux-2.6.32.46/arch/um/kern unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-2.6.32.46/arch/um/sys-i386/syscalls.c linux-2.6.32.46/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.46/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/um/sys-i386/syscalls.c linux-2.6.32.48/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/um/sys-i386/syscalls.c 2011-11-12 12:46:42.000000000 -0500 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -6217,9 +6217,9 @@ diff -urNp linux-2.6.32.46/arch/um/sys-i386/syscalls.c linux-2.6.32.46/arch/um/s /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.46/arch/x86/boot/bitops.h linux-2.6.32.46/arch/x86/boot/bitops.h ---- linux-2.6.32.46/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/bitops.h linux-2.6.32.48/arch/x86/boot/bitops.h +--- linux-2.6.32.48/arch/x86/boot/bitops.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/bitops.h 2011-11-12 12:46:42.000000000 -0500 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -6238,9 +6238,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/bitops.h linux-2.6.32.46/arch/x86/boot/ } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.46/arch/x86/boot/boot.h linux-2.6.32.46/arch/x86/boot/boot.h ---- linux-2.6.32.46/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/boot.h linux-2.6.32.48/arch/x86/boot/boot.h +--- linux-2.6.32.48/arch/x86/boot/boot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/boot.h 2011-11-12 12:46:42.000000000 -0500 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -6259,9 +6259,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/boot.h linux-2.6.32.46/arch/x86/boot/bo : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_32.S linux-2.6.32.46/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.46/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_32.S linux-2.6.32.48/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/head_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -6290,9 +6290,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_32.S linux-2.6.32.46/ar addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_64.S linux-2.6.32.46/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.46/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/head_64.S 2011-07-01 18:53:00.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/head_64.S linux-2.6.32.48/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/head_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -6320,9 +6320,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_64.S linux-2.6.32.46/ar #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arch/x86/boot/compressed/Makefile ---- linux-2.6.32.46/arch/x86/boot/compressed/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/Makefile 2011-08-07 14:38:34.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/Makefile linux-2.6.32.48/arch/x86/boot/compressed/Makefile +--- linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(call cc-option,-ffreestanding) @@ -6333,9 +6333,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arc KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/misc.c linux-2.6.32.46/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.46/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/misc.c linux-2.6.32.48/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/misc.c 2011-11-12 12:46:42.000000000 -0500 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -6354,9 +6354,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/misc.c linux-2.6.32.46/arch/ error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/mkpiggy.c 2011-11-12 12:46:42.000000000 -0500 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -6366,9 +6366,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.46/ar offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/relocs.c linux-2.6.32.46/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.46/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/compressed/relocs.c linux-2.6.32.48/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/compressed/relocs.c 2011-11-12 12:46:42.000000000 -0500 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -6569,9 +6569,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/relocs.c linux-2.6.32.46/arc read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.46/arch/x86/boot/cpucheck.c linux-2.6.32.46/arch/x86/boot/cpucheck.c ---- linux-2.6.32.46/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/cpucheck.c linux-2.6.32.48/arch/x86/boot/cpucheck.c +--- linux-2.6.32.48/arch/x86/boot/cpucheck.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/cpucheck.c 2011-11-12 12:46:42.000000000 -0500 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -6667,9 +6667,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/cpucheck.c linux-2.6.32.46/arch/x86/boo err = check_flags(); } -diff -urNp linux-2.6.32.46/arch/x86/boot/header.S linux-2.6.32.46/arch/x86/boot/header.S ---- linux-2.6.32.46/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/header.S linux-2.6.32.48/arch/x86/boot/header.S +--- linux-2.6.32.48/arch/x86/boot/header.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/header.S 2011-11-12 12:46:42.000000000 -0500 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -6679,9 +6679,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/header.S linux-2.6.32.46/arch/x86/boot/ #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/Makefile ---- linux-2.6.32.46/arch/x86/boot/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/Makefile 2011-08-07 14:38:13.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/Makefile linux-2.6.32.48/arch/x86/boot/Makefile +--- linux-2.6.32.48/arch/x86/boot/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) @@ -6692,9 +6692,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/memory.c ---- linux-2.6.32.46/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/memory.c linux-2.6.32.48/arch/x86/boot/memory.c +--- linux-2.6.32.48/arch/x86/boot/memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/memory.c 2011-11-12 12:46:42.000000000 -0500 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -6704,9 +6704,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/ struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/video.c ---- linux-2.6.32.46/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/video.c linux-2.6.32.48/arch/x86/boot/video.c +--- linux-2.6.32.48/arch/x86/boot/video.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/video.c 2011-11-12 12:46:42.000000000 -0500 @@ -90,7 +90,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -6716,9 +6716,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/v int key; unsigned int v; -diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/boot/video-vesa.c ---- linux-2.6.32.46/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/boot/video-vesa.c linux-2.6.32.48/arch/x86/boot/video-vesa.c +--- linux-2.6.32.48/arch/x86/boot/video-vesa.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/boot/video-vesa.c 2011-11-12 12:46:42.000000000 -0500 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -6727,9 +6727,9 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/b } /* -diff -urNp linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S ---- linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S +--- linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -8,6 +8,8 @@ * including this sentence is retained in full. */ @@ -6748,9 +6748,9 @@ diff -urNp linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.46/a #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \ movq r1,r2; \ movq r3,r4; \ -diff -urNp linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S ---- linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S +--- linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -1,3 +1,5 @@ +#include <asm/alternative-asm.h> + @@ -6779,9 +6779,9 @@ diff -urNp linux-2.6.32.46/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-2.6.32. mov %rsi,%rdx + pax_force_retaddr ret -diff -urNp linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S ---- linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S +--- linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -21,6 +21,7 @@ .text @@ -6804,9 +6804,9 @@ diff -urNp linux-2.6.32.46/arch/x86/crypto/twofish-x86_64-asm_64.S linux-2.6.32. movq $1,%rax + pax_force_retaddr ret -diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_aout.c linux-2.6.32.46/arch/x86/ia32/ia32_aout.c ---- linux-2.6.32.46/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_aout.c linux-2.6.32.48/arch/x86/ia32/ia32_aout.c +--- linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/ia32/ia32_aout.c 2011-11-12 12:46:42.000000000 -0500 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -6829,9 +6829,9 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_aout.c linux-2.6.32.46/arch/x86/ia end_coredump: set_fs(fs); return has_dumped; -diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia32/ia32entry.S ---- linux-2.6.32.46/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/ia32/ia32entry.S 2011-08-25 17:42:18.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32entry.S linux-2.6.32.48/arch/x86/ia32/ia32entry.S +--- linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/ia32/ia32entry.S 2011-11-12 12:46:42.000000000 -0500 @@ -13,6 +13,7 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -7008,9 +7008,9 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST cmpq $(IA32_NR_syscalls-1),%rax -diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.46/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/ia32/ia32_signal.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/ia32/ia32_signal.c linux-2.6.32.48/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/ia32/ia32_signal.c 2011-11-12 12:46:42.000000000 -0500 @@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const } seg = get_fs(); @@ -7087,9 +7087,9 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ } put_user_catch(err); if (err) -diff -urNp linux-2.6.32.46/arch/x86/ia32/sys_ia32.c linux-2.6.32.46/arch/x86/ia32/sys_ia32.c ---- linux-2.6.32.46/arch/x86/ia32/sys_ia32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/ia32/sys_ia32.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/ia32/sys_ia32.c linux-2.6.32.48/arch/x86/ia32/sys_ia32.c +--- linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/ia32/sys_ia32.c 2011-11-12 12:46:42.000000000 -0500 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign */ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat) @@ -7148,9 +7148,9 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/sys_ia32.c linux-2.6.32.46/arch/x86/ia3 count); set_fs(old_fs); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h ---- linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h 2011-10-08 08:14:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h +--- linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/alternative-asm.h 2011-11-12 12:46:42.000000000 -0500 @@ -19,4 +19,18 @@ .endm #endif @@ -7170,9 +7170,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative-asm.h linux-2.6.32.4 +#endif + #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative.h linux-2.6.32.46/arch/x86/include/asm/alternative.h ---- linux-2.6.32.46/arch/x86/include/asm/alternative.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/alternative.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/alternative.h linux-2.6.32.48/arch/x86/include/asm/alternative.h +--- linux-2.6.32.48/arch/x86/include/asm/alternative.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/alternative.h 2011-11-12 12:46:42.000000000 -0500 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -7182,9 +7182,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative.h linux-2.6.32.46/ar "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.46/arch/x86/include/asm/apic.h linux-2.6.32.46/arch/x86/include/asm/apic.h ---- linux-2.6.32.46/arch/x86/include/asm/apic.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/apic.h 2011-08-17 20:01:15.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/apic.h linux-2.6.32.48/arch/x86/include/asm/apic.h +--- linux-2.6.32.48/arch/x86/include/asm/apic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/apic.h 2011-11-12 12:46:42.000000000 -0500 @@ -46,7 +46,7 @@ static inline void generic_apic_probe(vo #ifdef CONFIG_X86_LOCAL_APIC @@ -7194,9 +7194,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/apic.h linux-2.6.32.46/arch/x86/ extern int local_apic_timer_c2_ok; extern int disable_apic; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/apm.h linux-2.6.32.46/arch/x86/include/asm/apm.h ---- linux-2.6.32.46/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/apm.h linux-2.6.32.48/arch/x86/include/asm/apm.h +--- linux-2.6.32.48/arch/x86/include/asm/apm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/apm.h 2011-11-12 12:46:42.000000000 -0500 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -7215,9 +7215,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/apm.h linux-2.6.32.46/arch/x86/i "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_32.h linux-2.6.32.46/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.46/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/atomic_32.h 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_32.h linux-2.6.32.48/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/atomic_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -7731,9 +7731,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_32.h linux-2.6.32.46/arch * atomic64_dec_and_test - decrement and test * @ptr: pointer to type atomic64_t * -diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_64.h linux-2.6.32.46/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.46/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/atomic_64.h 2011-05-04 18:35:31.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/atomic_64.h linux-2.6.32.48/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/atomic_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -8398,9 +8398,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_64.h linux-2.6.32.46/arch } /** -diff -urNp linux-2.6.32.46/arch/x86/include/asm/bitops.h linux-2.6.32.46/arch/x86/include/asm/bitops.h ---- linux-2.6.32.46/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/bitops.h linux-2.6.32.48/arch/x86/include/asm/bitops.h +--- linux-2.6.32.48/arch/x86/include/asm/bitops.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/bitops.h 2011-11-12 12:46:42.000000000 -0500 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -8410,9 +8410,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/bitops.h linux-2.6.32.46/arch/x8 #define CONST_MASK(nr) (1 << ((nr) & 7)) /** -diff -urNp linux-2.6.32.46/arch/x86/include/asm/boot.h linux-2.6.32.46/arch/x86/include/asm/boot.h ---- linux-2.6.32.46/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/boot.h linux-2.6.32.48/arch/x86/include/asm/boot.h +--- linux-2.6.32.48/arch/x86/include/asm/boot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/boot.h 2011-11-12 12:46:42.000000000 -0500 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -8430,9 +8430,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/boot.h linux-2.6.32.46/arch/x86/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arch/x86/include/asm/cacheflush.h ---- linux-2.6.32.46/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/cacheflush.h linux-2.6.32.48/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/cacheflush.h 2011-11-12 12:46:42.000000000 -0500 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) static inline unsigned long get_page_memtype(struct page *pg) { @@ -8451,9 +8451,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arc ClearPageUncached(pg); ClearPageWC(pg); break; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86/include/asm/cache.h ---- linux-2.6.32.46/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/cache.h 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/cache.h linux-2.6.32.48/arch/x86/include/asm/cache.h +--- linux-2.6.32.48/arch/x86/include/asm/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/cache.h 2011-11-12 12:46:42.000000000 -0500 @@ -5,9 +5,10 @@ /* L1 cache line size */ @@ -8466,9 +8466,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86 #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/calling.h linux-2.6.32.46/arch/x86/include/asm/calling.h ---- linux-2.6.32.46/arch/x86/include/asm/calling.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/calling.h 2011-10-06 10:08:42.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/calling.h linux-2.6.32.48/arch/x86/include/asm/calling.h +--- linux-2.6.32.48/arch/x86/include/asm/calling.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/calling.h 2011-11-12 12:46:42.000000000 -0500 @@ -52,32 +52,32 @@ For 32-bit we have the following convent * for assembly code: */ @@ -8523,9 +8523,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/calling.h linux-2.6.32.46/arch/x #define ARGOFFSET R11 #define SWFRAME ORIG_RAX -diff -urNp linux-2.6.32.46/arch/x86/include/asm/checksum_32.h linux-2.6.32.46/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.46/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/checksum_32.h linux-2.6.32.48/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/checksum_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -8559,9 +8559,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/checksum_32.h linux-2.6.32.46/ar len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch/x86/include/asm/desc_defs.h ---- linux-2.6.32.46/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc_defs.h linux-2.6.32.48/arch/x86/include/asm/desc_defs.h +--- linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/desc_defs.h 2011-11-12 12:46:42.000000000 -0500 @@ -31,6 +31,12 @@ struct desc_struct { unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; @@ -8575,9 +8575,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch }; } __attribute__((packed)); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/include/asm/desc.h ---- linux-2.6.32.46/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/desc.h 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/desc.h linux-2.6.32.48/arch/x86/include/asm/desc.h +--- linux-2.6.32.48/arch/x86/include/asm/desc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/desc.h 2011-11-12 12:46:42.000000000 -0500 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -8758,9 +8758,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/device.h linux-2.6.32.46/arch/x86/include/asm/device.h ---- linux-2.6.32.46/arch/x86/include/asm/device.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/device.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/device.h linux-2.6.32.48/arch/x86/include/asm/device.h +--- linux-2.6.32.48/arch/x86/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/device.h 2011-11-12 12:46:42.000000000 -0500 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -8770,9 +8770,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/device.h linux-2.6.32.46/arch/x8 #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/dma-mapping.h 2011-11-12 12:46:42.000000000 -0500 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -8812,9 +8812,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h linux-2.6.32.46/ar WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/e820.h linux-2.6.32.46/arch/x86/include/asm/e820.h ---- linux-2.6.32.46/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/e820.h linux-2.6.32.48/arch/x86/include/asm/e820.h +--- linux-2.6.32.48/arch/x86/include/asm/e820.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/e820.h 2011-11-12 12:46:42.000000000 -0500 @@ -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) @@ -8824,9 +8824,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/e820.h linux-2.6.32.46/arch/x86/ #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/elf.h linux-2.6.32.46/arch/x86/include/asm/elf.h ---- linux-2.6.32.46/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/elf.h 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/elf.h linux-2.6.32.48/arch/x86/include/asm/elf.h +--- linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/elf.h 2011-11-12 12:46:42.000000000 -0500 @@ -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. */ @@ -8881,9 +8881,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/elf.h linux-2.6.32.46/arch/x86/i -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h ---- linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h 2011-05-22 23:02:06.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h +--- linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/emergency-restart.h 2011-11-12 12:46:42.000000000 -0500 @@ -15,6 +15,6 @@ enum reboot_type { extern enum reboot_type reboot_type; @@ -8892,9 +8892,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h linux-2.6.32 +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/futex.h linux-2.6.32.46/arch/x86/include/asm/futex.h ---- linux-2.6.32.46/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/futex.h 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/futex.h linux-2.6.32.48/arch/x86/include/asm/futex.h +--- linux-2.6.32.48/arch/x86/include/asm/futex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/futex.h 2011-11-12 12:46:42.000000000 -0500 @@ -12,16 +12,18 @@ #include <asm/system.h> @@ -8970,9 +8970,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/futex.h linux-2.6.32.46/arch/x86 : "i" (-EFAULT), "r" (newval), "0" (oldval) : "memory" ); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/hw_irq.h linux-2.6.32.46/arch/x86/include/asm/hw_irq.h ---- linux-2.6.32.46/arch/x86/include/asm/hw_irq.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/hw_irq.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/hw_irq.h linux-2.6.32.48/arch/x86/include/asm/hw_irq.h +--- linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/hw_irq.h 2011-11-12 12:46:42.000000000 -0500 @@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); @@ -8984,9 +8984,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/hw_irq.h linux-2.6.32.46/arch/x8 /* EISA */ extern void eisa_set_level_irq(unsigned int irq); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/i387.h linux-2.6.32.46/arch/x86/include/asm/i387.h ---- linux-2.6.32.46/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/i387.h linux-2.6.32.48/arch/x86/include/asm/i387.h +--- linux-2.6.32.48/arch/x86/include/asm/i387.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/i387.h 2011-11-12 12:46:42.000000000 -0500 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc { int err; @@ -9036,9 +9036,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/i387.h linux-2.6.32.46/arch/x86/ else clts(); } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_32.h linux-2.6.32.46/arch/x86/include/asm/io_32.h ---- linux-2.6.32.46/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_32.h linux-2.6.32.48/arch/x86/include/asm/io_32.h +--- linux-2.6.32.48/arch/x86/include/asm/io_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/io_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -3,6 +3,7 @@ #include <linux/string.h> @@ -9065,9 +9065,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_32.h linux-2.6.32.46/arch/x86 #include <asm-generic/iomap.h> #include <linux/vmalloc.h> -diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_64.h linux-2.6.32.46/arch/x86/include/asm/io_64.h ---- linux-2.6.32.46/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/io_64.h linux-2.6.32.48/arch/x86/include/asm/io_64.h +--- linux-2.6.32.48/arch/x86/include/asm/io_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/io_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -9086,9 +9086,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_64.h linux-2.6.32.46/arch/x86 #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/iommu.h linux-2.6.32.46/arch/x86/include/asm/iommu.h ---- linux-2.6.32.46/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/iommu.h linux-2.6.32.48/arch/x86/include/asm/iommu.h +--- linux-2.6.32.48/arch/x86/include/asm/iommu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/iommu.h 2011-11-12 12:46:42.000000000 -0500 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -9098,9 +9098,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/iommu.h linux-2.6.32.46/arch/x86 extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/irqflags.h linux-2.6.32.46/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.46/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/irqflags.h linux-2.6.32.48/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/irqflags.h 2011-11-12 12:46:42.000000000 -0500 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ sti; \ sysexit @@ -9113,9 +9113,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/irqflags.h linux-2.6.32.46/arch/ #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-2.6.32.46/arch/x86/include/asm/kprobes.h linux-2.6.32.46/arch/x86/include/asm/kprobes.h ---- linux-2.6.32.46/arch/x86/include/asm/kprobes.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/kprobes.h 2011-04-23 12:56:12.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/kprobes.h linux-2.6.32.48/arch/x86/include/asm/kprobes.h +--- linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/kprobes.h 2011-11-12 12:46:42.000000000 -0500 @@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t; #define BREAKPOINT_INSTRUCTION 0xcc #define RELATIVEJUMP_INSTRUCTION 0xe9 @@ -9132,9 +9132,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/kprobes.h linux-2.6.32.46/arch/x #define flush_insn_slot(p) do { } while (0) -diff -urNp linux-2.6.32.46/arch/x86/include/asm/kvm_host.h linux-2.6.32.46/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.46/arch/x86/include/asm/kvm_host.h 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/kvm_host.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/kvm_host.h linux-2.6.32.48/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/kvm_host.h 2011-11-12 12:46:42.000000000 -0500 @@ -534,9 +534,9 @@ struct kvm_x86_ops { bool (*gb_page_enable)(void); @@ -9147,9 +9147,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/kvm_host.h linux-2.6.32.46/arch/ int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/local.h linux-2.6.32.46/arch/x86/include/asm/local.h ---- linux-2.6.32.46/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/local.h linux-2.6.32.48/arch/x86/include/asm/local.h +--- linux-2.6.32.48/arch/x86/include/asm/local.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/local.h 2011-11-12 12:46:42.000000000 -0500 @@ -18,26 +18,58 @@ typedef struct { static inline void local_inc(local_t *l) @@ -9302,9 +9302,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/local.h linux-2.6.32.46/arch/x86 : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/microcode.h linux-2.6.32.46/arch/x86/include/asm/microcode.h ---- linux-2.6.32.46/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/microcode.h linux-2.6.32.48/arch/x86/include/asm/microcode.h +--- linux-2.6.32.48/arch/x86/include/asm/microcode.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/microcode.h 2011-11-12 12:46:42.000000000 -0500 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -9345,9 +9345,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/microcode.h linux-2.6.32.46/arch { return NULL; } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/mman.h linux-2.6.32.46/arch/x86/include/asm/mman.h ---- linux-2.6.32.46/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/mman.h linux-2.6.32.48/arch/x86/include/asm/mman.h +--- linux-2.6.32.48/arch/x86/include/asm/mman.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/mman.h 2011-11-12 12:46:42.000000000 -0500 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -9363,9 +9363,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/mman.h linux-2.6.32.46/arch/x86/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.46/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/mmu_context.h 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu_context.h linux-2.6.32.48/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/mmu_context.h 2011-11-12 12:46:42.000000000 -0500 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -9486,9 +9486,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/ar } #define activate_mm(prev, next) \ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/include/asm/mmu.h ---- linux-2.6.32.46/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/mmu.h linux-2.6.32.48/arch/x86/include/asm/mmu.h +--- linux-2.6.32.48/arch/x86/include/asm/mmu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/mmu.h 2011-11-12 12:46:42.000000000 -0500 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -9515,9 +9515,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/i } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.46/arch/x86/include/asm/module.h linux-2.6.32.46/arch/x86/include/asm/module.h ---- linux-2.6.32.46/arch/x86/include/asm/module.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/module.h 2011-10-08 08:16:59.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/module.h linux-2.6.32.48/arch/x86/include/asm/module.h +--- linux-2.6.32.48/arch/x86/include/asm/module.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/module.h 2011-11-12 12:46:42.000000000 -0500 @@ -5,6 +5,7 @@ #ifdef CONFIG_X86_64 @@ -9558,9 +9558,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/module.h linux-2.6.32.46/arch/x8 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF + #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/page_64_types.h linux-2.6.32.46/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.46/arch/x86/include/asm/page_64_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/page_64_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/page_64_types.h linux-2.6.32.48/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/page_64_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); /* duplicated to the one in bootmem.h */ @@ -9570,9 +9570,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/page_64_types.h linux-2.6.32.46/ extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt.h linux-2.6.32.46/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.46/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/paravirt.h 2011-08-23 21:36:48.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt.h linux-2.6.32.48/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/paravirt.h 2011-11-12 12:46:42.000000000 -0500 @@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp, val); } @@ -9645,9 +9645,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt.h linux-2.6.32.46/arch/ #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/paravirt_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -78,19 +78,19 @@ struct pv_init_ops { */ unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, @@ -9719,9 +9719,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h linux-2.6.32.46 /* This contains all the paravirt structures: we get a convenient * number for each function using the offset which we use to indicate -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pci_x86.h linux-2.6.32.46/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.46/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pci_x86.h linux-2.6.32.48/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pci_x86.h 2011-11-12 12:46:42.000000000 -0500 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -9744,9 +9744,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pci_x86.h linux-2.6.32.46/arch/x extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/percpu.h linux-2.6.32.46/arch/x86/include/asm/percpu.h ---- linux-2.6.32.46/arch/x86/include/asm/percpu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/percpu.h 2011-08-17 19:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/percpu.h linux-2.6.32.48/arch/x86/include/asm/percpu.h +--- linux-2.6.32.48/arch/x86/include/asm/percpu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/percpu.h 2011-11-12 12:46:42.000000000 -0500 @@ -78,6 +78,7 @@ do { \ if (0) { \ T__ tmp__; \ @@ -9755,9 +9755,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/percpu.h linux-2.6.32.46/arch/x8 } \ switch (sizeof(var)) { \ case 1: \ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgalloc.h linux-2.6.32.46/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.46/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgalloc.h linux-2.6.32.48/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgalloc.h 2011-11-12 12:46:42.000000000 -0500 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -9772,9 +9772,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgalloc.h linux-2.6.32.46/arch/x set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable-2level.h 2011-11-12 12:46:42.000000000 -0500 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -9785,9 +9785,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.46 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -26,9 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -9831,9 +9831,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arc /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_32_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -9863,9 +9863,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32. #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:46:42.000000000 -0500 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -9883,9 +9883,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46 } /* -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -9926,9 +9926,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arc *pgdp = pgd; } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_64_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -9940,9 +9940,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32. +#define ktva_ktla(addr) (addr) #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable.h 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable.h linux-2.6.32.48/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable.h 2011-11-12 12:46:42.000000000 -0500 @@ -39,6 +39,7 @@ extern struct list_head pgd_list; #ifndef __PAGETABLE_PUD_FOLDED @@ -10120,9 +10120,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/pgtable_types.h 2011-11-12 12:46:42.000000000 -0500 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -10243,9 +10243,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h linux-2.6.32.46/ #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch/x86/include/asm/processor.h ---- linux-2.6.32.46/arch/x86/include/asm/processor.h 2011-04-22 19:16:29.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/processor.h 2011-05-11 18:25:15.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/processor.h linux-2.6.32.48/arch/x86/include/asm/processor.h +--- linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/processor.h 2011-11-12 12:46:42.000000000 -0500 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -10255,7 +10255,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch /* * Save the original ist values for checking stack pointers during debugging -@@ -888,11 +888,18 @@ static inline void spin_lock_prefetch(co +@@ -911,11 +911,18 @@ static inline void spin_lock_prefetch(co */ #define TASK_SIZE PAGE_OFFSET #define TASK_SIZE_MAX TASK_SIZE @@ -10276,7 +10276,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch .vm86_info = NULL, \ .sysenter_cs = __KERNEL_CS, \ .io_bitmap_ptr = NULL, \ -@@ -906,7 +913,7 @@ static inline void spin_lock_prefetch(co +@@ -929,7 +936,7 @@ static inline void spin_lock_prefetch(co */ #define INIT_TSS { \ .x86_tss = { \ @@ -10285,7 +10285,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ -@@ -917,11 +924,7 @@ static inline void spin_lock_prefetch(co +@@ -940,11 +947,7 @@ static inline void spin_lock_prefetch(co extern unsigned long thread_saved_pc(struct task_struct *tsk); #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) @@ -10298,7 +10298,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. -@@ -936,7 +939,7 @@ extern unsigned long thread_saved_pc(str +@@ -959,7 +962,7 @@ extern unsigned long thread_saved_pc(str #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ @@ -10307,7 +10307,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch __regs__ - 1; \ }) -@@ -946,13 +949,13 @@ extern unsigned long thread_saved_pc(str +@@ -969,13 +972,13 @@ extern unsigned long thread_saved_pc(str /* * User space process size. 47bits minus one guard page. */ @@ -10323,7 +10323,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) -@@ -963,11 +966,11 @@ extern unsigned long thread_saved_pc(str +@@ -986,11 +989,11 @@ extern unsigned long thread_saved_pc(str #define STACK_TOP_MAX TASK_SIZE_MAX #define INIT_THREAD { \ @@ -10337,7 +10337,7 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch } /* -@@ -989,6 +992,10 @@ extern void start_thread(struct pt_regs +@@ -1012,6 +1015,10 @@ extern void start_thread(struct pt_regs */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) @@ -10348,9 +10348,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/ptrace.h linux-2.6.32.46/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.46/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/ptrace.h linux-2.6.32.48/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/ptrace.h 2011-11-12 12:46:42.000000000 -0500 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -10387,9 +10387,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/ptrace.h linux-2.6.32.46/arch/x8 #endif } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/reboot.h linux-2.6.32.46/arch/x86/include/asm/reboot.h ---- linux-2.6.32.46/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/reboot.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/reboot.h linux-2.6.32.48/arch/x86/include/asm/reboot.h +--- linux-2.6.32.48/arch/x86/include/asm/reboot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/reboot.h 2011-11-12 12:46:42.000000000 -0500 @@ -6,19 +6,19 @@ struct pt_regs; @@ -10416,9 +10416,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/reboot.h linux-2.6.32.46/arch/x8 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/rwsem.h linux-2.6.32.46/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.46/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/rwsem.h linux-2.6.32.48/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/rwsem.h 2011-11-12 12:46:42.000000000 -0500 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -10543,9 +10543,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/rwsem.h linux-2.6.32.46/arch/x86 : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/segment.h linux-2.6.32.46/arch/x86/include/asm/segment.h ---- linux-2.6.32.46/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/segment.h 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/segment.h linux-2.6.32.48/arch/x86/include/asm/segment.h +--- linux-2.6.32.48/arch/x86/include/asm/segment.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/segment.h 2011-11-12 12:46:42.000000000 -0500 @@ -62,10 +62,15 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -10621,9 +10621,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/segment.h linux-2.6.32.46/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.46/arch/x86/include/asm/smp.h linux-2.6.32.46/arch/x86/include/asm/smp.h ---- linux-2.6.32.46/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/smp.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/smp.h linux-2.6.32.48/arch/x86/include/asm/smp.h +--- linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/smp.h 2011-11-12 12:46:42.000000000 -0500 @@ -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); @@ -10671,9 +10671,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/smp.h linux-2.6.32.46/arch/x86/i #define safe_smp_processor_id() smp_processor_id() #endif -diff -urNp linux-2.6.32.46/arch/x86/include/asm/spinlock.h linux-2.6.32.46/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.46/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/spinlock.h linux-2.6.32.48/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/spinlock.h 2011-11-12 12:46:42.000000000 -0500 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -10736,9 +10736,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/spinlock.h linux-2.6.32.46/arch/ : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/stackprotector.h linux-2.6.32.46/arch/x86/include/asm/stackprotector.h ---- linux-2.6.32.46/arch/x86/include/asm/stackprotector.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/stackprotector.h 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/stackprotector.h linux-2.6.32.48/arch/x86/include/asm/stackprotector.h +--- linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/stackprotector.h 2011-11-12 12:46:42.000000000 -0500 @@ -48,7 +48,7 @@ * head_32 for boot CPU and setup_per_cpu_areas() for others. */ @@ -10757,9 +10757,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/stackprotector.h linux-2.6.32.46 asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-2.6.32.46/arch/x86/include/asm/system.h linux-2.6.32.46/arch/x86/include/asm/system.h ---- linux-2.6.32.46/arch/x86/include/asm/system.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/system.h 2011-05-22 23:02:03.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/system.h linux-2.6.32.48/arch/x86/include/asm/system.h +--- linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/system.h 2011-11-12 12:46:42.000000000 -0500 @@ -132,7 +132,7 @@ do { \ "thread_return:\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -10802,9 +10802,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/system.h linux-2.6.32.46/arch/x8 /* * Force strict CPU ordering. -diff -urNp linux-2.6.32.46/arch/x86/include/asm/thread_info.h linux-2.6.32.46/arch/x86/include/asm/thread_info.h ---- linux-2.6.32.46/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/thread_info.h 2011-05-17 19:26:34.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/thread_info.h linux-2.6.32.48/arch/x86/include/asm/thread_info.h +--- linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/thread_info.h 2011-11-12 12:46:42.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <asm/page.h> @@ -10952,9 +10952,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/thread_info.h linux-2.6.32.46/ar + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/uaccess_32.h 2011-11-12 12:46:42.000000000 -0500 @@ -44,6 +44,11 @@ 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) @@ -11095,9 +11095,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h linux-2.6.32.46/arc long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/uaccess_64.h 2011-11-12 12:46:42.000000000 -0500 @@ -9,6 +9,9 @@ #include <linux/prefetch.h> #include <linux/lockdep.h> @@ -11481,9 +11481,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h linux-2.6.32.46/arc +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.46/arch/x86/include/asm/uaccess.h 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/uaccess.h 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/uaccess.h linux-2.6.32.48/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/uaccess.h 2011-11-12 12:46:42.000000000 -0500 @@ -8,12 +8,15 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -11711,9 +11711,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.46/arch/x86/include/asm/vdso.h linux-2.6.32.46/arch/x86/include/asm/vdso.h ---- linux-2.6.32.46/arch/x86/include/asm/vdso.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/vdso.h 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/vdso.h linux-2.6.32.48/arch/x86/include/asm/vdso.h +--- linux-2.6.32.48/arch/x86/include/asm/vdso.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/vdso.h 2011-11-12 12:46:42.000000000 -0500 @@ -25,7 +25,7 @@ extern const char VDSO32_PRELINK[]; #define VDSO32_SYMBOL(base, name) \ ({ \ @@ -11723,9 +11723,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/vdso.h linux-2.6.32.46/arch/x86/ }) #endif -diff -urNp linux-2.6.32.46/arch/x86/include/asm/vgtod.h linux-2.6.32.46/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.46/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/vgtod.h linux-2.6.32.48/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/vgtod.h 2011-11-12 12:46:42.000000000 -0500 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -11734,9 +11734,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/vgtod.h linux-2.6.32.46/arch/x86 cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi.h linux-2.6.32.46/arch/x86/include/asm/vmi.h ---- linux-2.6.32.46/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi.h linux-2.6.32.48/arch/x86/include/asm/vmi.h +--- linux-2.6.32.48/arch/x86/include/asm/vmi.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/vmi.h 2011-11-12 12:46:42.000000000 -0500 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -11745,9 +11745,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi.h linux-2.6.32.46/arch/x86/i } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi_time.h linux-2.6.32.46/arch/x86/include/asm/vmi_time.h ---- linux-2.6.32.46/arch/x86/include/asm/vmi_time.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/vmi_time.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/vmi_time.h linux-2.6.32.48/arch/x86/include/asm/vmi_time.h +--- linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/vmi_time.h 2011-11-12 12:46:42.000000000 -0500 @@ -43,7 +43,7 @@ extern struct vmi_timer_ops { int (*wallclock_updated)(void); void (*set_alarm)(u32 flags, u64 expiry, u64 period); @@ -11757,9 +11757,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi_time.h linux-2.6.32.46/arch/ /* Prototypes */ extern void __init vmi_time_init(void); -diff -urNp linux-2.6.32.46/arch/x86/include/asm/vsyscall.h linux-2.6.32.46/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.46/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/vsyscall.h linux-2.6.32.48/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/vsyscall.h 2011-11-12 12:46:42.000000000 -0500 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -11790,9 +11790,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/vsyscall.h linux-2.6.32.46/arch/ #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.46/arch/x86/include/asm/x86_init.h linux-2.6.32.46/arch/x86/include/asm/x86_init.h ---- linux-2.6.32.46/arch/x86/include/asm/x86_init.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/x86_init.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/x86_init.h linux-2.6.32.48/arch/x86/include/asm/x86_init.h +--- linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/x86_init.h 2011-11-12 12:46:42.000000000 -0500 @@ -28,7 +28,7 @@ struct x86_init_mpparse { void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); void (*find_smp_config)(unsigned int reserve); @@ -11874,9 +11874,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/x86_init.h linux-2.6.32.46/arch/ extern struct x86_init_ops x86_init; extern struct x86_cpuinit_ops x86_cpuinit; -diff -urNp linux-2.6.32.46/arch/x86/include/asm/xsave.h linux-2.6.32.46/arch/x86/include/asm/xsave.h ---- linux-2.6.32.46/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/include/asm/xsave.h 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/include/asm/xsave.h linux-2.6.32.48/arch/x86/include/asm/xsave.h +--- linux-2.6.32.48/arch/x86/include/asm/xsave.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/include/asm/xsave.h 2011-11-12 12:46:42.000000000 -0500 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct static inline int xsave_user(struct xsave_struct __user *buf) { @@ -11907,9 +11907,9 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/xsave.h linux-2.6.32.46/arch/x86 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig ---- linux-2.6.32.46/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/Kconfig 2011-10-07 08:11:49.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/Kconfig linux-2.6.32.48/arch/x86/Kconfig +--- linux-2.6.32.48/arch/x86/Kconfig 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/Kconfig 2011-11-12 12:46:42.000000000 -0500 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE config X86_32_LAZY_GS @@ -11982,9 +11982,9 @@ diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig.cpu ---- linux-2.6.32.46/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/Kconfig.cpu linux-2.6.32.48/arch/x86/Kconfig.cpu +--- linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/Kconfig.cpu 2011-11-12 12:46:42.000000000 -0500 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -12012,9 +12012,9 @@ diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconfig.debug ---- linux-2.6.32.46/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/Kconfig.debug linux-2.6.32.48/arch/x86/Kconfig.debug +--- linux-2.6.32.48/arch/x86/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/Kconfig.debug 2011-11-12 12:46:42.000000000 -0500 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -12024,9 +12024,9 @@ diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconf ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile ---- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile 2011-08-07 14:38:58.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile +--- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) @@ -12037,9 +12037,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.4 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-01 18:53:40.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-12 12:46:42.000000000 -0500 @@ -91,6 +91,9 @@ _start: /* Do any other stuff... */ @@ -12067,9 +12067,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.4 #else pushw $0 pushw trampoline_segment -diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c 2011-07-01 19:01:34.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/acpi/sleep.c 2011-11-12 12:46:42.000000000 -0500 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -12116,9 +12116,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c linux-2.6.32.46/arch/x86 } -diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/acpi/wakeup_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -12135,9 +12135,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.46/arch bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.46/arch/x86/kernel/alternative.c linux-2.6.32.46/arch/x86/kernel/alternative.c ---- linux-2.6.32.46/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/alternative.c linux-2.6.32.48/arch/x86/kernel/alternative.c +--- linux-2.6.32.48/arch/x86/kernel/alternative.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/alternative.c 2011-11-12 12:46:42.000000000 -0500 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -12220,9 +12220,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/alternative.c linux-2.6.32.46/arch/x8 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/amd_iommu.c linux-2.6.32.46/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.46/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/amd_iommu.c linux-2.6.32.48/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/amd_iommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains( } } @@ -12232,9 +12232,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/amd_iommu.c linux-2.6.32.46/arch/x86/ .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/apic.c linux-2.6.32.46/arch/x86/kernel/apic/apic.c ---- linux-2.6.32.46/arch/x86/kernel/apic/apic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/apic/apic.c 2011-08-17 20:00:16.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/apic.c linux-2.6.32.48/arch/x86/kernel/apic/apic.c +--- linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/apic/apic.c 2011-11-12 12:46:42.000000000 -0500 @@ -170,7 +170,7 @@ int first_system_vector = 0xfe; /* * Debug level, exported for io_apic.c @@ -12262,9 +12262,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/apic.c linux-2.6.32.46/arch/x86/ bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); -diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:46:42.000000000 -0500 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -12319,9 +12319,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c linux-2.6.32.46/arch/x spin_lock(&ioapic_lock); __mask_and_edge_IO_APIC_irq(cfg); __unmask_and_level_IO_APIC_irq(cfg); -diff -urNp linux-2.6.32.46/arch/x86/kernel/apm_32.c linux-2.6.32.46/arch/x86/kernel/apm_32.c ---- linux-2.6.32.46/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/apm_32.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/apm_32.c linux-2.6.32.48/arch/x86/kernel/apm_32.c +--- linux-2.6.32.48/arch/x86/kernel/apm_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/apm_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -12402,9 +12402,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/apm_32.c linux-2.6.32.46/arch/x86/ker proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -51,7 +51,6 @@ void foo(void) OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); BLANK(); @@ -12442,9 +12442,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.46/arch #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/asm-offsets_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -44,6 +44,8 @@ int main(void) ENTRY(addr_limit); ENTRY(preempt_count); @@ -12489,9 +12489,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.46/arch #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/amd.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/amd.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/amd.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/amd.c linux-2.6.32.48/arch/x86/kernel/cpu/amd.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/amd.c 2011-11-12 12:46:42.000000000 -0500 @@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { @@ -12501,9 +12501,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/amd.c linux-2.6.32.46/arch/x86/ke /* Duron Rev A0 */ if (c->x86_model == 3 && c->x86_mask == 0) size = 64; -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/common.c linux-2.6.32.46/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/common.c 2011-05-11 18:25:15.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/common.c linux-2.6.32.48/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/common.c 2011-11-12 12:46:42.000000000 -0500 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -12648,9 +12648,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/common.c linux-2.6.32.46/arch/x86 struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel.c linux-2.6.32.46/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel.c linux-2.6.32.48/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/intel.c 2011-11-12 12:46:42.000000000 -0500 @@ -162,7 +162,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. @@ -12660,9 +12660,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel.c linux-2.6.32.46/arch/x86/ load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-12 12:46:42.000000000 -0500 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -12672,9 +12672,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.46 .show = show, .store = store, }; -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.46/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/Makefile linux-2.6.32.48/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -12686,9 +12686,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86 obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:56:59.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:57:13.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-11-12 12:46:42.000000000 -0500 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -12698,9 +12698,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/ .show = show, .store = store, }; -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:46:42.000000000 -0500 @@ -43,6 +43,7 @@ #include <asm/ipi.h> #include <asm/mce.h> @@ -12802,9 +12802,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-12 12:46:42.000000000 -0500 @@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi static int inject_init(void) { @@ -12816,9 +12816,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32. register_die_notifier(&mce_raise_nb); return 0; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/amd.c 2011-11-12 12:46:42.000000000 -0500 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -12828,9 +12828,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.46/arch/x .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/centaur.c 2011-11-12 12:46:42.000000000 -0500 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -12840,9 +12840,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.46/ar .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-11-12 12:46:42.000000000 -0500 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -12852,9 +12852,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.46/arch .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/generic.c 2011-11-12 12:46:42.000000000 -0500 @@ -752,7 +752,7 @@ int positive_have_wrcomb(void) /* * Generic structure... @@ -12864,9 +12864,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.46/ar .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:46:42.000000000 -0500 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -12885,9 +12885,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.46/arch/ { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-08-26 20:23:57.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-12 12:46:42.000000000 -0500 @@ -25,14 +25,14 @@ struct mtrr_ops { int (*validate_add_page)(unsigned long base, unsigned long size, unsigned int type); @@ -12918,9 +12918,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.46/arch/ #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-11-12 12:46:42.000000000 -0500 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -12954,9 +12954,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.4 static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:46:42.000000000 -0500 @@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event * count to the generic event atomically: */ @@ -12997,9 +12997,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch } } -diff -urNp linux-2.6.32.46/arch/x86/kernel/crash.c linux-2.6.32.46/arch/x86/kernel/crash.c ---- linux-2.6.32.46/arch/x86/kernel/crash.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/crash.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/crash.c linux-2.6.32.48/arch/x86/kernel/crash.c +--- linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/crash.c 2011-11-12 12:46:42.000000000 -0500 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -13009,9 +13009,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/crash.c linux-2.6.32.46/arch/x86/kern crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/doublefault_32.c linux-2.6.32.46/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.46/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/doublefault_32.c linux-2.6.32.48/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/doublefault_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -13043,9 +13043,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/doublefault_32.c linux-2.6.32.46/arch .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/dumpstack_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task #endif @@ -13111,9 +13111,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c ---- linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c +--- linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/dumpstack_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task unsigned long *irq_stack_end = (unsigned long *)per_cpu(irq_stack_ptr, cpu); @@ -13164,9 +13164,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x put_cpu(); } EXPORT_SYMBOL(dump_trace); -diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.c linux-2.6.32.46/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.46/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.c linux-2.6.32.48/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/dumpstack.c 2011-11-12 12:46:42.000000000 -0500 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -13283,9 +13283,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.c linux-2.6.32.46/arch/x86/ report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.h linux-2.6.32.46/arch/x86/kernel/dumpstack.h ---- linux-2.6.32.46/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/dumpstack.h 2011-04-23 13:25:26.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/dumpstack.h linux-2.6.32.48/arch/x86/kernel/dumpstack.h +--- linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/dumpstack.h 2011-11-12 12:46:42.000000000 -0500 @@ -15,7 +15,7 @@ #endif @@ -13295,9 +13295,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.h linux-2.6.32.46/arch/x86/ unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data, unsigned long *end, int *graph); -diff -urNp linux-2.6.32.46/arch/x86/kernel/e820.c linux-2.6.32.46/arch/x86/kernel/e820.c ---- linux-2.6.32.46/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/e820.c linux-2.6.32.48/arch/x86/kernel/e820.c +--- linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/e820.c 2011-11-12 12:46:42.000000000 -0500 @@ -733,7 +733,7 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -13307,9 +13307,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/e820.c linux-2.6.32.46/arch/x86/kerne }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.46/arch/x86/kernel/early_printk.c linux-2.6.32.46/arch/x86/kernel/early_printk.c ---- linux-2.6.32.46/arch/x86/kernel/early_printk.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/early_printk.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/early_printk.c linux-2.6.32.48/arch/x86/kernel/early_printk.c +--- linux-2.6.32.48/arch/x86/kernel/early_printk.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/early_printk.c 2011-11-12 12:46:42.000000000 -0500 @@ -7,6 +7,7 @@ #include <linux/pci_regs.h> #include <linux/pci_ids.h> @@ -13327,9 +13327,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/early_printk.c linux-2.6.32.46/arch/x va_start(ap, fmt); n = vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); -diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_32.c linux-2.6.32.46/arch/x86/kernel/efi_32.c ---- linux-2.6.32.46/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/efi_32.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_32.c linux-2.6.32.48/arch/x86/kernel/efi_32.c +--- linux-2.6.32.48/arch/x86/kernel/efi_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/efi_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -38,70 +38,56 @@ */ @@ -13427,9 +13427,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_32.c linux-2.6.32.46/arch/x86/ker /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/efi_stub_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -6,7 +6,9 @@ */ @@ -13538,9 +13538,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S linux-2.6.32.46/arch/x8 saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S ---- linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S +--- linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/efi_stub_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -7,6 +7,7 @@ */ @@ -13604,9 +13604,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_64.S linux-2.6.32.46/arch/x8 + pax_force_retaddr ret ENDPROC(efi_call6) -diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_32.S linux-2.6.32.46/arch/x86/kernel/entry_32.S ---- linux-2.6.32.46/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/entry_32.S 2011-08-30 18:19:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_32.S linux-2.6.32.48/arch/x86/kernel/entry_32.S +--- linux-2.6.32.48/arch/x86/kernel/entry_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/entry_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -185,13 +185,146 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -14095,9 +14095,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_32.S linux-2.6.32.46/arch/x86/k RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_64.S linux-2.6.32.46/arch/x86/kernel/entry_64.S ---- linux-2.6.32.46/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/entry_64.S 2011-10-08 08:14:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/entry_64.S linux-2.6.32.48/arch/x86/kernel/entry_64.S +--- linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/entry_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -53,6 +53,8 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -14811,9 +14811,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_64.S linux-2.6.32.46/arch/x86/k jmp irq_return nmi_userspace: GET_THREAD_INFO(%rcx) -diff -urNp linux-2.6.32.46/arch/x86/kernel/ftrace.c linux-2.6.32.46/arch/x86/kernel/ftrace.c ---- linux-2.6.32.46/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/ftrace.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/ftrace.c linux-2.6.32.48/arch/x86/kernel/ftrace.c +--- linux-2.6.32.48/arch/x86/kernel/ftrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/ftrace.c 2011-11-12 12:46:42.000000000 -0500 @@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the static void *mod_code_newcode; /* holds the text to write to the IP */ @@ -14899,9 +14899,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/ftrace.c linux-2.6.32.46/arch/x86/ker if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.46/arch/x86/kernel/head32.c linux-2.6.32.46/arch/x86/kernel/head32.c ---- linux-2.6.32.46/arch/x86/kernel/head32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/head32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/head32.c linux-2.6.32.48/arch/x86/kernel/head32.c +--- linux-2.6.32.48/arch/x86/kernel/head32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/head32.c 2011-11-12 12:46:42.000000000 -0500 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -14919,9 +14919,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/head32.c linux-2.6.32.46/arch/x86/ker #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.46/arch/x86/kernel/head_32.S linux-2.6.32.46/arch/x86/kernel/head_32.S ---- linux-2.6.32.46/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/head_32.S 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/head_32.S linux-2.6.32.48/arch/x86/kernel/head_32.S +--- linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/head_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -15443,9 +15443,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/head_32.S linux-2.6.32.46/arch/x86/ke + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.46/arch/x86/kernel/head_64.S linux-2.6.32.46/arch/x86/kernel/head_64.S ---- linux-2.6.32.46/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/head_64.S linux-2.6.32.48/arch/x86/kernel/head_64.S +--- linux-2.6.32.48/arch/x86/kernel/head_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/head_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -15716,9 +15716,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/head_64.S linux-2.6.32.46/arch/x86/ke __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/i386_ksyms_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -15740,9 +15740,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.46/arch/ +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.46/arch/x86/kernel/i8259.c linux-2.6.32.46/arch/x86/kernel/i8259.c ---- linux-2.6.32.46/arch/x86/kernel/i8259.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/i8259.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/i8259.c linux-2.6.32.48/arch/x86/kernel/i8259.c +--- linux-2.6.32.48/arch/x86/kernel/i8259.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/i8259.c 2011-11-12 12:46:42.000000000 -0500 @@ -208,7 +208,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; @@ -15752,9 +15752,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/i8259.c linux-2.6.32.46/arch/x86/kern /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is -diff -urNp linux-2.6.32.46/arch/x86/kernel/init_task.c linux-2.6.32.46/arch/x86/kernel/init_task.c ---- linux-2.6.32.46/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/init_task.c linux-2.6.32.48/arch/x86/kernel/init_task.c +--- linux-2.6.32.48/arch/x86/kernel/init_task.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/init_task.c 2011-11-12 12:46:42.000000000 -0500 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -15773,9 +15773,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/init_task.c linux-2.6.32.46/arch/x86/ - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.46/arch/x86/kernel/ioport.c linux-2.6.32.46/arch/x86/kernel/ioport.c ---- linux-2.6.32.46/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/ioport.c linux-2.6.32.48/arch/x86/kernel/ioport.c +--- linux-2.6.32.48/arch/x86/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/ioport.c 2011-11-12 12:46:42.000000000 -0500 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -15819,9 +15819,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/ioport.c linux-2.6.32.46/arch/x86/ker if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/kernel/irq_32.c ---- linux-2.6.32.46/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/irq_32.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/irq_32.c linux-2.6.32.48/arch/x86/kernel/irq_32.c +--- linux-2.6.32.48/arch/x86/kernel/irq_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/irq_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -35,7 +35,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=r" (sp) : "0" (THREAD_SIZE - 1)); @@ -15962,9 +15962,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/ker /* * Shouldnt happen, we returned above if in_interrupt(): */ -diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel/irq.c ---- linux-2.6.32.46/arch/x86/kernel/irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/irq.c linux-2.6.32.48/arch/x86/kernel/irq.c +--- linux-2.6.32.48/arch/x86/kernel/irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/irq.c 2011-11-12 12:46:42.000000000 -0500 @@ -15,7 +15,7 @@ #include <asm/mce.h> #include <asm/hw_irq.h> @@ -15999,9 +15999,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel #endif return sum; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/kgdb.c linux-2.6.32.46/arch/x86/kernel/kgdb.c ---- linux-2.6.32.46/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/kgdb.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/kgdb.c linux-2.6.32.48/arch/x86/kernel/kgdb.c +--- linux-2.6.32.48/arch/x86/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/kgdb.c 2011-11-12 12:46:42.000000000 -0500 @@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec /* clear the trace bit */ @@ -16036,10 +16036,10 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kgdb.c linux-2.6.32.46/arch/x86/kerne /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/kernel/kprobes.c ---- linux-2.6.32.46/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 -@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f +diff -urNp linux-2.6.32.48/arch/x86/kernel/kprobes.c linux-2.6.32.48/arch/x86/kernel/kprobes.c +--- linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/kprobes.c 2011-11-12 12:46:42.000000000 -0500 +@@ -168,9 +168,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; } __attribute__((packed)) * jop; @@ -16054,7 +16054,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke } /* -@@ -193,7 +197,7 @@ static int __kprobes can_boost(kprobe_op +@@ -195,7 +199,7 @@ static int __kprobes can_boost(kprobe_op kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; @@ -16063,7 +16063,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke return 0; /* Page fault may occur on this address. */ retry: -@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct +@@ -339,7 +343,9 @@ static void __kprobes fix_riprel(struct disp = (u8 *) p->addr + *((s32 *) insn) - (u8 *) p->ainsn.insn; BUG_ON((s64) (s32) disp != disp); /* Sanity check. */ @@ -16073,7 +16073,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke } } #endif -@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct +@@ -347,16 +353,18 @@ static void __kprobes fix_riprel(struct static void __kprobes arch_copy_kprobe(struct kprobe *p) { @@ -16095,7 +16095,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke } int __kprobes arch_prepare_kprobe(struct kprobe *p) -@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep +@@ -434,7 +442,7 @@ static void __kprobes prepare_singlestep if (p->opcode == BREAKPOINT_INSTRUCTION) regs->ip = (unsigned long)p->addr; else @@ -16104,7 +16104,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke } void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, -@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s +@@ -455,7 +463,7 @@ static void __kprobes setup_singlestep(s if (p->ainsn.boostable == 1 && !p->post_handler) { /* Boost up -- we can execute copied instructions directly */ reset_current_kprobe(); @@ -16113,7 +16113,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke preempt_enable_no_resched(); return; } -@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru +@@ -525,7 +533,7 @@ static int __kprobes kprobe_handler(stru struct kprobe_ctlblk *kcb; addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t)); @@ -16122,7 +16122,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed -@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s +@@ -777,7 +785,7 @@ static void __kprobes resume_execution(s struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); @@ -16131,7 +16131,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; -@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s +@@ -960,7 +968,7 @@ int __kprobes kprobe_exceptions_notify(s struct die_args *args = data; int ret = NOTIFY_DONE; @@ -16140,9 +16140,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/ke return ret; switch (val) { -diff -urNp linux-2.6.32.46/arch/x86/kernel/kvm.c linux-2.6.32.46/arch/x86/kernel/kvm.c ---- linux-2.6.32.46/arch/x86/kernel/kvm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/kvm.c 2011-08-24 18:35:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/kvm.c linux-2.6.32.48/arch/x86/kernel/kvm.c +--- linux-2.6.32.48/arch/x86/kernel/kvm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/kvm.c 2011-11-12 12:46:42.000000000 -0500 @@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(vo pv_mmu_ops.set_pud = kvm_set_pud; #if PAGETABLE_LEVELS == 4 @@ -16151,9 +16151,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/kvm.c linux-2.6.32.46/arch/x86/kernel #endif #endif pv_mmu_ops.flush_tlb_user = kvm_flush_tlb; -diff -urNp linux-2.6.32.46/arch/x86/kernel/ldt.c linux-2.6.32.46/arch/x86/kernel/ldt.c ---- linux-2.6.32.46/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/ldt.c linux-2.6.32.48/arch/x86/kernel/ldt.c +--- linux-2.6.32.48/arch/x86/kernel/ldt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/ldt.c 2011-11-12 12:46:42.000000000 -0500 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -16218,9 +16218,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/ldt.c linux-2.6.32.46/arch/x86/kernel fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/machine_kexec_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -16248,9 +16248,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.46/ar relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_amd.c linux-2.6.32.46/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.46/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_amd.c linux-2.6.32.48/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/microcode_amd.c 2011-11-12 12:46:42.000000000 -0500 @@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -16269,9 +16269,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_amd.c linux-2.6.32.46/arch/ { return µcode_amd_ops; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_core.c linux-2.6.32.46/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.46/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_core.c linux-2.6.32.48/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/microcode_core.c 2011-11-12 12:46:42.000000000 -0500 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -16281,9 +16281,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_core.c linux-2.6.32.46/arch /* * Synchronization. -diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_intel.c linux-2.6.32.46/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.46/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/microcode_intel.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/microcode_intel.c linux-2.6.32.48/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/microcode_intel.c 2011-11-12 12:46:42.000000000 -0500 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -16318,9 +16318,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_intel.c linux-2.6.32.46/arc { return µcode_intel_ops; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/module.c linux-2.6.32.46/arch/x86/kernel/module.c ---- linux-2.6.32.46/arch/x86/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/module.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/module.c linux-2.6.32.48/arch/x86/kernel/module.c +--- linux-2.6.32.48/arch/x86/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/module.c 2011-11-12 12:46:42.000000000 -0500 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -16461,9 +16461,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/module.c linux-2.6.32.46/arch/x86/ker #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/kernel/paravirt.c ---- linux-2.6.32.46/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/paravirt.c 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt.c linux-2.6.32.48/arch/x86/kernel/paravirt.c +--- linux-2.6.32.48/arch/x86/kernel/paravirt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/paravirt.c 2011-11-12 12:46:42.000000000 -0500 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x) { return x; @@ -16611,9 +16611,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/k }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/paravirt-spinlocks.c 2011-11-12 12:46:42.000000000 -0500 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -16623,9 +16623,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/ #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/pci-calgary_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -16635,9 +16635,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.46/arch .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-dma.c linux-2.6.32.46/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.46/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-dma.c linux-2.6.32.48/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/pci-dma.c 2011-11-12 12:46:42.000000000 -0500 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -16656,9 +16656,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-dma.c linux-2.6.32.46/arch/x86/ke #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/pci-gart_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -16668,9 +16668,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c linux-2.6.32.46/arch/x8 .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-nommu.c linux-2.6.32.46/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.46/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-nommu.c linux-2.6.32.48/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/pci-nommu.c 2011-11-12 12:46:42.000000000 -0500 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -16680,9 +16680,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-nommu.c linux-2.6.32.46/arch/x86/ .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/pci-swiotlb.c 2011-11-12 12:46:42.000000000 -0500 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -16692,9 +16692,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.46/arch/x8 .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.32.46/arch/x86/kernel/process_32.c linux-2.6.32.46/arch/x86/kernel/process_32.c ---- linux-2.6.32.46/arch/x86/kernel/process_32.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/process_32.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/process_32.c linux-2.6.32.48/arch/x86/kernel/process_32.c +--- linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/process_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -16795,9 +16795,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/process_32.c linux-2.6.32.46/arch/x86 return 0; } - -diff -urNp linux-2.6.32.46/arch/x86/kernel/process_64.c linux-2.6.32.46/arch/x86/kernel/process_64.c ---- linux-2.6.32.46/arch/x86/kernel/process_64.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/process_64.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/process_64.c linux-2.6.32.48/arch/x86/kernel/process_64.c +--- linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/process_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -16871,9 +16871,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/process_64.c linux-2.6.32.46/arch/x86 return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/kernel/process.c ---- linux-2.6.32.46/arch/x86/kernel/process.c 2011-04-22 19:16:29.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/process.c 2011-08-30 18:19:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/process.c linux-2.6.32.48/arch/x86/kernel/process.c +--- linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/process.c 2011-11-12 12:46:42.000000000 -0500 @@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru void free_thread_info(struct thread_info *ti) @@ -16988,9 +16988,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/ke } +#endif -diff -urNp linux-2.6.32.46/arch/x86/kernel/ptrace.c linux-2.6.32.46/arch/x86/kernel/ptrace.c ---- linux-2.6.32.46/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/ptrace.c linux-2.6.32.48/arch/x86/kernel/ptrace.c +--- linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/ptrace.c 2011-11-12 12:46:42.000000000 -0500 @@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { @@ -17077,9 +17077,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/ptrace.c linux-2.6.32.46/arch/x86/ker { if (unlikely(current->audit_context)) audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); -diff -urNp linux-2.6.32.46/arch/x86/kernel/reboot.c linux-2.6.32.46/arch/x86/kernel/reboot.c ---- linux-2.6.32.46/arch/x86/kernel/reboot.c 2011-08-09 18:35:28.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/reboot.c 2011-08-09 18:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/reboot.c linux-2.6.32.48/arch/x86/kernel/reboot.c +--- linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/reboot.c 2011-11-12 12:46:42.000000000 -0500 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -17206,9 +17206,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/reboot.c linux-2.6.32.46/arch/x86/ker } struct machine_ops machine_ops = { -diff -urNp linux-2.6.32.46/arch/x86/kernel/setup.c linux-2.6.32.46/arch/x86/kernel/setup.c ---- linux-2.6.32.46/arch/x86/kernel/setup.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/setup.c 2011-04-17 17:03:05.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/setup.c linux-2.6.32.48/arch/x86/kernel/setup.c +--- linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/setup.c 2011-11-12 12:46:42.000000000 -0500 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -17229,9 +17229,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/setup.c linux-2.6.32.46/arch/x86/kern data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.46/arch/x86/kernel/setup_percpu.c linux-2.6.32.46/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.46/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/setup_percpu.c 2011-06-04 20:36:29.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/setup_percpu.c linux-2.6.32.48/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/setup_percpu.c 2011-11-12 12:46:42.000000000 -0500 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -17295,9 +17295,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/setup_percpu.c linux-2.6.32.46/arch/x /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.32.46/arch/x86/kernel/signal.c linux-2.6.32.46/arch/x86/kernel/signal.c ---- linux-2.6.32.46/arch/x86/kernel/signal.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/signal.c 2011-05-22 23:02:03.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/signal.c linux-2.6.32.48/arch/x86/kernel/signal.c +--- linux-2.6.32.48/arch/x86/kernel/signal.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/signal.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -17381,9 +17381,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/signal.c linux-2.6.32.46/arch/x86/ker return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.46/arch/x86/kernel/smpboot.c linux-2.6.32.46/arch/x86/kernel/smpboot.c ---- linux-2.6.32.46/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/smpboot.c 2011-07-01 19:10:03.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/smpboot.c linux-2.6.32.48/arch/x86/kernel/smpboot.c +--- linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/smpboot.c 2011-11-12 12:46:42.000000000 -0500 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct */ static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); @@ -17453,9 +17453,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/smpboot.c linux-2.6.32.46/arch/x86/ke err = do_boot_cpu(apicid, cpu); if (err) { -diff -urNp linux-2.6.32.46/arch/x86/kernel/step.c linux-2.6.32.46/arch/x86/kernel/step.c ---- linux-2.6.32.46/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/step.c linux-2.6.32.48/arch/x86/kernel/step.c +--- linux-2.6.32.48/arch/x86/kernel/step.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/step.c 2011-11-12 12:46:42.000000000 -0500 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -17498,17 +17498,17 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/step.c linux-2.6.32.46/arch/x86/kerne /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -17780,9 +17780,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c linux-2.6.32.46/arch/x8 - : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory"); - return __res; -} -diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -32,8 +32,8 @@ out: return error; } @@ -17920,9 +17920,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c linux-2.6.32.46/arch/x86 mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.46/arch/x86/kernel/tboot.c linux-2.6.32.46/arch/x86/kernel/tboot.c ---- linux-2.6.32.46/arch/x86/kernel/tboot.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/tboot.c 2011-05-22 23:02:03.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/tboot.c linux-2.6.32.48/arch/x86/kernel/tboot.c +--- linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/tboot.c 2011-11-12 12:46:42.000000000 -0500 @@ -216,7 +216,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) @@ -17971,9 +17971,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/tboot.c linux-2.6.32.46/arch/x86/kern register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/time.c linux-2.6.32.46/arch/x86/kernel/time.c ---- linux-2.6.32.46/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/time.c linux-2.6.32.48/arch/x86/kernel/time.c +--- linux-2.6.32.48/arch/x86/kernel/time.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/time.c 2011-11-12 12:46:42.000000000 -0500 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -18012,9 +18012,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/time.c linux-2.6.32.46/arch/x86/kerne } return pc; } -diff -urNp linux-2.6.32.46/arch/x86/kernel/tls.c linux-2.6.32.46/arch/x86/kernel/tls.c ---- linux-2.6.32.46/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/tls.c linux-2.6.32.48/arch/x86/kernel/tls.c +--- linux-2.6.32.48/arch/x86/kernel/tls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/tls.c 2011-11-12 12:46:42.000000000 -0500 @@ -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; @@ -18027,9 +18027,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/tls.c linux-2.6.32.46/arch/x86/kernel set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_32.S linux-2.6.32.46/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.46/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/trampoline_32.S linux-2.6.32.48/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/trampoline_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -18052,9 +18052,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_32.S linux-2.6.32.46/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.46/arch/x86/kernel/trampoline_64.S linux-2.6.32.46/arch/x86/kernel/trampoline_64.S ---- linux-2.6.32.46/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/trampoline_64.S 2011-07-01 18:53:26.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/trampoline_64.S linux-2.6.32.48/arch/x86/kernel/trampoline_64.S +--- linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/trampoline_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -91,7 +91,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -18082,9 +18082,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_64.S linux-2.6.32.46/arch/ .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-2.6.32.46/arch/x86/kernel/traps.c linux-2.6.32.46/arch/x86/kernel/traps.c ---- linux-2.6.32.46/arch/x86/kernel/traps.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/traps.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/traps.c linux-2.6.32.48/arch/x86/kernel/traps.c +--- linux-2.6.32.48/arch/x86/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/traps.c 2011-11-12 12:46:42.000000000 -0500 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -18271,9 +18271,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/traps.c linux-2.6.32.46/arch/x86/kern if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S ---- linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S 1969-12-31 19:00:00.000000000 -0500 +diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S +--- linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/verify_cpu_64.S 1969-12-31 19:00:00.000000000 -0500 @@ -1,105 +0,0 @@ -/* - * @@ -18380,9 +18380,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/ - popfl # Restore caller passed flags - xorl %eax, %eax - ret -diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86/kernel/verify_cpu.S ---- linux-2.6.32.46/arch/x86/kernel/verify_cpu.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/arch/x86/kernel/verify_cpu.S 2011-07-01 18:28:42.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/verify_cpu.S linux-2.6.32.48/arch/x86/kernel/verify_cpu.S +--- linux-2.6.32.48/arch/x86/kernel/verify_cpu.S 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/verify_cpu.S 2011-11-12 12:46:42.000000000 -0500 @@ -0,0 +1,140 @@ +/* + * @@ -18524,9 +18524,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86 + popfl # Restore caller passed flags + xorl %eax, %eax + ret -diff -urNp linux-2.6.32.46/arch/x86/kernel/vm86_32.c linux-2.6.32.46/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.46/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/vm86_32.c linux-2.6.32.48/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/vm86_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -18591,9 +18591,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/vm86_32.c linux-2.6.32.46/arch/x86/ke if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.46/arch/x86/kernel/vmi_32.c linux-2.6.32.46/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.46/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/vmi_32.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/vmi_32.c linux-2.6.32.48/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/vmi_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -18756,9 +18756,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/vmi_32.c linux-2.6.32.46/arch/x86/ker return; local_irq_save(flags); -diff -urNp linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/vmlinux.lds.S 2011-11-12 12:46:42.000000000 -0500 @@ -26,6 +26,13 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -19051,9 +19051,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.46/arch/x8 "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -19071,9 +19071,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c linux-2.6.32.46/arch/x8 p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -diff -urNp linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/x8664_ksyms_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -19083,9 +19083,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.46/arch EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.46/arch/x86/kernel/xsave.c linux-2.6.32.46/arch/x86/kernel/xsave.c ---- linux-2.6.32.46/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kernel/xsave.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kernel/xsave.c linux-2.6.32.48/arch/x86/kernel/xsave.c +--- linux-2.6.32.48/arch/x86/kernel/xsave.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kernel/xsave.c 2011-11-12 12:46:42.000000000 -0500 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -19113,9 +19113,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/xsave.c linux-2.6.32.46/arch/x86/kern buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.46/arch/x86/kvm/emulate.c linux-2.6.32.46/arch/x86/kvm/emulate.c ---- linux-2.6.32.46/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kvm/emulate.c linux-2.6.32.48/arch/x86/kvm/emulate.c +--- linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/emulate.c 2011-11-12 12:46:42.000000000 -0500 @@ -81,8 +81,8 @@ #define Src2CL (1<<29) #define Src2ImmByte (2<<29) @@ -19152,9 +19152,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/emulate.c linux-2.6.32.46/arch/x86/kvm/e switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.46/arch/x86/kvm/lapic.c linux-2.6.32.46/arch/x86/kvm/lapic.c ---- linux-2.6.32.46/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kvm/lapic.c linux-2.6.32.48/arch/x86/kvm/lapic.c +--- linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/lapic.c 2011-11-12 12:46:42.000000000 -0500 @@ -52,7 +52,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -19164,9 +19164,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/lapic.c linux-2.6.32.46/arch/x86/kvm/lap #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h ---- linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h +--- linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:46:42.000000000 -0500 @@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_ int level = PT_PAGE_TABLE_LEVEL; unsigned long mmu_seq; @@ -19176,10 +19176,10 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h linux-2.6.32.46/arch/x86/k pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code); kvm_mmu_audit(vcpu, "pre page fault"); -diff -urNp linux-2.6.32.46/arch/x86/kvm/svm.c linux-2.6.32.46/arch/x86/kvm/svm.c ---- linux-2.6.32.46/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/svm.c 2011-08-05 20:33:55.000000000 -0400 -@@ -2485,7 +2485,11 @@ static void reload_tss(struct kvm_vcpu * +diff -urNp linux-2.6.32.48/arch/x86/kvm/svm.c linux-2.6.32.48/arch/x86/kvm/svm.c +--- linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/svm.c 2011-11-12 12:46:42.000000000 -0500 +@@ -2486,7 +2486,11 @@ static void reload_tss(struct kvm_vcpu * int cpu = raw_smp_processor_id(); struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu); @@ -19191,7 +19191,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/svm.c linux-2.6.32.46/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -2946,7 +2950,7 @@ static bool svm_gb_page_enable(void) +@@ -2947,7 +2951,7 @@ static bool svm_gb_page_enable(void) return true; } @@ -19200,9 +19200,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/svm.c linux-2.6.32.46/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c ---- linux-2.6.32.46/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/vmx.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kvm/vmx.c linux-2.6.32.48/arch/x86/kvm/vmx.c +--- linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/vmx.c 2011-11-12 12:46:42.000000000 -0500 @@ -570,7 +570,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -19215,7 +19215,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c load_TR_desc(); } -@@ -1409,8 +1413,11 @@ static __init int hardware_setup(void) +@@ -1410,8 +1414,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -19229,7 +19229,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2361,7 +2368,7 @@ static int vmx_vcpu_setup(struct vcpu_vm +@@ -2362,7 +2369,7 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); @@ -19238,7 +19238,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); -@@ -3717,6 +3724,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3718,6 +3725,12 @@ static void vmx_vcpu_run(struct kvm_vcpu "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " @@ -19251,7 +19251,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -3763,8 +3776,13 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3764,8 +3777,13 @@ static void vmx_vcpu_run(struct kvm_vcpu [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) @@ -19266,7 +19266,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c #ifdef CONFIG_X86_64 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" #endif -@@ -3781,7 +3799,16 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3782,7 +3800,16 @@ static void vmx_vcpu_run(struct kvm_vcpu if (vmx->rmode.irq.pending) fixup_rmode_irq(vmx); @@ -19284,7 +19284,7 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c vmx->launched = 1; vmx_complete_interrupts(vmx); -@@ -3956,7 +3983,7 @@ static bool vmx_gb_page_enable(void) +@@ -3957,7 +3984,7 @@ static bool vmx_gb_page_enable(void) return false; } @@ -19293,9 +19293,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.32.46/arch/x86/kvm/x86.c linux-2.6.32.46/arch/x86/kvm/x86.c ---- linux-2.6.32.46/arch/x86/kvm/x86.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/kvm/x86.c 2011-05-10 22:12:26.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/kvm/x86.c linux-2.6.32.48/arch/x86/kvm/x86.c +--- linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/kvm/x86.c 2011-11-12 12:46:42.000000000 -0500 @@ -82,7 +82,7 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -19375,9 +19375,9 @@ diff -urNp linux-2.6.32.46/arch/x86/kvm/x86.c linux-2.6.32.46/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.32.46/arch/x86/lguest/boot.c linux-2.6.32.46/arch/x86/lguest/boot.c ---- linux-2.6.32.46/arch/x86/lguest/boot.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lguest/boot.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lguest/boot.c linux-2.6.32.48/arch/x86/lguest/boot.c +--- linux-2.6.32.48/arch/x86/lguest/boot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lguest/boot.c 2011-11-12 12:46:42.000000000 -0500 @@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt * Rebooting also tells the Host we're finished, but the RESTART flag tells the * Launcher to reboot us. @@ -19390,9 +19390,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lguest/boot.c linux-2.6.32.46/arch/x86/lgues } /*G:050 -diff -urNp linux-2.6.32.46/arch/x86/lib/atomic64_32.c linux-2.6.32.46/arch/x86/lib/atomic64_32.c ---- linux-2.6.32.46/arch/x86/lib/atomic64_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/atomic64_32.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/atomic64_32.c linux-2.6.32.48/arch/x86/lib/atomic64_32.c +--- linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/atomic64_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6 } EXPORT_SYMBOL(atomic64_cmpxchg); @@ -19615,9 +19615,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/atomic64_32.c linux-2.6.32.46/arch/x86/l * atomic64_dec_and_test - decrement and test * @ptr: pointer to type atomic64_t * -diff -urNp linux-2.6.32.46/arch/x86/lib/checksum_32.S linux-2.6.32.46/arch/x86/lib/checksum_32.S ---- linux-2.6.32.46/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/checksum_32.S linux-2.6.32.48/arch/x86/lib/checksum_32.S +--- linux-2.6.32.48/arch/x86/lib/checksum_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/checksum_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -19878,9 +19878,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/checksum_32.S linux-2.6.32.46/arch/x86/l #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.32.46/arch/x86/lib/clear_page_64.S linux-2.6.32.46/arch/x86/lib/clear_page_64.S ---- linux-2.6.32.46/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/clear_page_64.S 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/clear_page_64.S linux-2.6.32.48/arch/x86/lib/clear_page_64.S +--- linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/clear_page_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -1,5 +1,6 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -19913,9 +19913,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/clear_page_64.S linux-2.6.32.46/arch/x86 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.46/arch/x86/lib/copy_page_64.S linux-2.6.32.46/arch/x86/lib/copy_page_64.S ---- linux-2.6.32.46/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/copy_page_64.S 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/copy_page_64.S linux-2.6.32.48/arch/x86/lib/copy_page_64.S +--- linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/copy_page_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -2,12 +2,14 @@ #include <linux/linkage.h> @@ -19948,9 +19948,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/copy_page_64.S linux-2.6.32.46/arch/x86/ 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_64.S linux-2.6.32.46/arch/x86/lib/copy_user_64.S ---- linux-2.6.32.46/arch/x86/lib/copy_user_64.S 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/copy_user_64.S 2011-10-06 10:12:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_64.S linux-2.6.32.48/arch/x86/lib/copy_user_64.S +--- linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/copy_user_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -15,13 +15,15 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -20043,9 +20043,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_64.S linux-2.6.32.46/arch/x86/ ret .section .fixup,"ax" -diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S ---- linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/copy_user_nocache_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -8,12 +8,14 @@ #include <linux/linkage.h> @@ -20085,9 +20085,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.46/a ret .section .fixup,"ax" -diff -urNp linux-2.6.32.46/arch/x86/lib/csum-copy_64.S linux-2.6.32.46/arch/x86/lib/csum-copy_64.S ---- linux-2.6.32.46/arch/x86/lib/csum-copy_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/csum-copy_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/csum-copy_64.S linux-2.6.32.48/arch/x86/lib/csum-copy_64.S +--- linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/csum-copy_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -8,6 +8,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -20104,9 +20104,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/csum-copy_64.S linux-2.6.32.46/arch/x86/ ret CFI_RESTORE_STATE -diff -urNp linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c ---- linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/csum-wrappers_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -20137,9 +20137,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.46/arch/ len, isum, NULL, errp); } EXPORT_SYMBOL(csum_partial_copy_to_user); -diff -urNp linux-2.6.32.46/arch/x86/lib/getuser.S linux-2.6.32.46/arch/x86/lib/getuser.S ---- linux-2.6.32.46/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/getuser.S 2011-10-08 08:14:37.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/getuser.S linux-2.6.32.48/arch/x86/lib/getuser.S +--- linux-2.6.32.48/arch/x86/lib/getuser.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/getuser.S 2011-11-12 12:46:42.000000000 -0500 @@ -33,15 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -20263,9 +20263,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/getuser.S linux-2.6.32.46/arch/x86/lib/g ret CFI_ENDPROC END(bad_get_user) -diff -urNp linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S ---- linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S +--- linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/iomap_copy_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -17,6 +17,7 @@ #include <linux/linkage.h> @@ -20282,9 +20282,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/iomap_copy_64.S linux-2.6.32.46/arch/x86 ret CFI_ENDPROC ENDPROC(__iowrite32_copy) -diff -urNp linux-2.6.32.46/arch/x86/lib/memcpy_64.S linux-2.6.32.46/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.46/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/memcpy_64.S 2011-10-06 10:13:49.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/memcpy_64.S linux-2.6.32.48/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/memcpy_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -4,6 +4,7 @@ #include <asm/cpufeature.h> @@ -20318,9 +20318,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/memcpy_64.S linux-2.6.32.46/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.46/arch/x86/lib/memset_64.S linux-2.6.32.46/arch/x86/lib/memset_64.S ---- linux-2.6.32.46/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/memset_64.S 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/memset_64.S linux-2.6.32.48/arch/x86/lib/memset_64.S +--- linux-2.6.32.48/arch/x86/lib/memset_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/memset_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -2,6 +2,7 @@ #include <linux/linkage.h> @@ -20354,9 +20354,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/memset_64.S linux-2.6.32.46/arch/x86/lib 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.46/arch/x86/lib/mmx_32.c linux-2.6.32.46/arch/x86/lib/mmx_32.c ---- linux-2.6.32.46/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/mmx_32.c linux-2.6.32.48/arch/x86/lib/mmx_32.c +--- linux-2.6.32.48/arch/x86/lib/mmx_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/mmx_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -20672,9 +20672,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/mmx_32.c linux-2.6.32.46/arch/x86/lib/mm from += 64; to += 64; -diff -urNp linux-2.6.32.46/arch/x86/lib/msr-reg.S linux-2.6.32.46/arch/x86/lib/msr-reg.S ---- linux-2.6.32.46/arch/x86/lib/msr-reg.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/msr-reg.S 2011-10-08 08:14:40.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/msr-reg.S linux-2.6.32.48/arch/x86/lib/msr-reg.S +--- linux-2.6.32.48/arch/x86/lib/msr-reg.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/msr-reg.S 2011-11-12 12:46:42.000000000 -0500 @@ -3,6 +3,7 @@ #include <asm/dwarf2.h> #include <asm/asm.h> @@ -20691,9 +20691,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/msr-reg.S linux-2.6.32.46/arch/x86/lib/m ret 3: CFI_RESTORE_STATE -diff -urNp linux-2.6.32.46/arch/x86/lib/putuser.S linux-2.6.32.46/arch/x86/lib/putuser.S ---- linux-2.6.32.46/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/putuser.S 2011-10-08 08:14:40.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/putuser.S linux-2.6.32.48/arch/x86/lib/putuser.S +--- linux-2.6.32.48/arch/x86/lib/putuser.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/putuser.S 2011-11-12 12:46:42.000000000 -0500 @@ -15,7 +15,9 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -20833,9 +20833,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/putuser.S linux-2.6.32.46/arch/x86/lib/p #endif xor %eax,%eax EXIT -diff -urNp linux-2.6.32.46/arch/x86/lib/rwlock_64.S linux-2.6.32.46/arch/x86/lib/rwlock_64.S ---- linux-2.6.32.46/arch/x86/lib/rwlock_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/rwlock_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/rwlock_64.S linux-2.6.32.48/arch/x86/lib/rwlock_64.S +--- linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/rwlock_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -17,6 +17,7 @@ ENTRY(__write_lock_failed) LOCK_PREFIX subl $RW_LOCK_BIAS,(%rdi) @@ -20852,9 +20852,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/rwlock_64.S linux-2.6.32.46/arch/x86/lib ret CFI_ENDPROC END(__read_lock_failed) -diff -urNp linux-2.6.32.46/arch/x86/lib/rwsem_64.S linux-2.6.32.46/arch/x86/lib/rwsem_64.S ---- linux-2.6.32.46/arch/x86/lib/rwsem_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/rwsem_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/rwsem_64.S linux-2.6.32.48/arch/x86/lib/rwsem_64.S +--- linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/rwsem_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -48,6 +48,7 @@ ENTRY(call_rwsem_down_read_failed) call rwsem_down_read_failed popq %rdx @@ -20888,9 +20888,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/rwsem_64.S linux-2.6.32.46/arch/x86/lib/ + pax_force_retaddr ret ENDPROC(call_rwsem_downgrade_wake) -diff -urNp linux-2.6.32.46/arch/x86/lib/thunk_64.S linux-2.6.32.46/arch/x86/lib/thunk_64.S ---- linux-2.6.32.46/arch/x86/lib/thunk_64.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/thunk_64.S 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/thunk_64.S linux-2.6.32.48/arch/x86/lib/thunk_64.S +--- linux-2.6.32.48/arch/x86/lib/thunk_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/thunk_64.S 2011-11-12 12:46:42.000000000 -0500 @@ -10,7 +10,8 @@ #include <asm/dwarf2.h> #include <asm/calling.h> @@ -20916,9 +20916,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/thunk_64.S linux-2.6.32.46/arch/x86/lib/ + pax_force_retaddr ret CFI_ENDPROC -diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_32.c linux-2.6.32.46/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.46/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/usercopy_32.c 2011-04-23 21:12:28.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_32.c linux-2.6.32.48/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/usercopy_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -21524,9 +21524,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_32.c linux-2.6.32.46/arch/x86/l -EXPORT_SYMBOL(copy_from_user); +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_64.c linux-2.6.32.46/arch/x86/lib/usercopy_64.c ---- linux-2.6.32.46/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/lib/usercopy_64.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/lib/usercopy_64.c linux-2.6.32.48/arch/x86/lib/usercopy_64.c +--- linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/lib/usercopy_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -21585,9 +21585,9 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_64.c linux-2.6.32.46/arch/x86/l { char c; unsigned zero_len; -diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile ---- linux-2.6.32.46/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/Makefile 2011-07-19 18:16:02.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/Makefile linux-2.6.32.48/arch/x86/Makefile +--- linux-2.6.32.48/arch/x86/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y) else BITS := 64 @@ -21609,9 +21609,9 @@ diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.46/arch/x86/mm/extable.c linux-2.6.32.46/arch/x86/mm/extable.c ---- linux-2.6.32.46/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/extable.c linux-2.6.32.48/arch/x86/mm/extable.c +--- linux-2.6.32.48/arch/x86/mm/extable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/extable.c 2011-11-12 12:46:42.000000000 -0500 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -21685,9 +21685,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/extable.c linux-2.6.32.46/arch/x86/mm/ext extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.32.46/arch/x86/mm/fault.c linux-2.6.32.46/arch/x86/mm/fault.c ---- linux-2.6.32.46/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/fault.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/fault.c linux-2.6.32.48/arch/x86/mm/fault.c +--- linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/fault.c 2011-11-12 12:46:42.000000000 -0500 @@ -11,10 +11,19 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -22374,9 +22374,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/fault.c linux-2.6.32.46/arch/x86/mm/fault + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.46/arch/x86/mm/gup.c linux-2.6.32.46/arch/x86/mm/gup.c ---- linux-2.6.32.46/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/gup.c linux-2.6.32.48/arch/x86/mm/gup.c +--- linux-2.6.32.48/arch/x86/mm/gup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/gup.c 2011-11-12 12:46:42.000000000 -0500 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -22386,9 +22386,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/gup.c linux-2.6.32.46/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.46/arch/x86/mm/highmem_32.c linux-2.6.32.46/arch/x86/mm/highmem_32.c ---- linux-2.6.32.46/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/highmem_32.c linux-2.6.32.48/arch/x86/mm/highmem_32.c +--- linux-2.6.32.48/arch/x86/mm/highmem_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/highmem_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -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); @@ -22400,9 +22400,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/highmem_32.c linux-2.6.32.46/arch/x86/mm/ return (void *)vaddr; } -diff -urNp linux-2.6.32.46/arch/x86/mm/hugetlbpage.c linux-2.6.32.46/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.46/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/hugetlbpage.c linux-2.6.32.48/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/hugetlbpage.c 2011-11-12 12:46:42.000000000 -0500 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -22610,9 +22610,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/hugetlbpage.c linux-2.6.32.46/arch/x86/mm return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-2.6.32.46/arch/x86/mm/init_32.c linux-2.6.32.46/arch/x86/mm/init_32.c ---- linux-2.6.32.46/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/init_32.c linux-2.6.32.48/arch/x86/mm/init_32.c +--- linux-2.6.32.48/arch/x86/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/init_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -22916,9 +22916,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/init_32.c linux-2.6.32.46/arch/x86/mm/ini set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-2.6.32.46/arch/x86/mm/init_64.c linux-2.6.32.46/arch/x86/mm/init_64.c ---- linux-2.6.32.46/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/init_64.c linux-2.6.32.48/arch/x86/mm/init_64.c +--- linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/init_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -22979,9 +22979,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/init_64.c linux-2.6.32.46/arch/x86/mm/ini return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c ---- linux-2.6.32.46/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/init.c 2011-06-07 19:06:09.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/init.c linux-2.6.32.48/arch/x86/mm/init.c +--- linux-2.6.32.48/arch/x86/mm/init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/init.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -23119,9 +23119,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.32.46/arch/x86/mm/iomap_32.c linux-2.6.32.46/arch/x86/mm/iomap_32.c ---- linux-2.6.32.46/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/iomap_32.c linux-2.6.32.48/arch/x86/mm/iomap_32.c +--- linux-2.6.32.48/arch/x86/mm/iomap_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/iomap_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -23134,9 +23134,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/iomap_32.c linux-2.6.32.46/arch/x86/mm/io arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.46/arch/x86/mm/ioremap.c linux-2.6.32.46/arch/x86/mm/ioremap.c ---- linux-2.6.32.46/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/ioremap.c linux-2.6.32.48/arch/x86/mm/ioremap.c +--- linux-2.6.32.48/arch/x86/mm/ioremap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/ioremap.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -23183,9 +23183,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/ioremap.c linux-2.6.32.46/arch/x86/mm/ior /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -23198,9 +23198,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.46/arc return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-2.6.32.46/arch/x86/mm/mmap.c linux-2.6.32.46/arch/x86/mm/mmap.c ---- linux-2.6.32.46/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/mmap.c linux-2.6.32.48/arch/x86/mm/mmap.c +--- linux-2.6.32.48/arch/x86/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/mmap.c 2011-11-12 12:46:42.000000000 -0500 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -23282,9 +23282,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/mmap.c linux-2.6.32.46/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.46/arch/x86/mm/mmio-mod.c linux-2.6.32.46/arch/x86/mm/mmio-mod.c ---- linux-2.6.32.46/arch/x86/mm/mmio-mod.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/mmio-mod.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/mmio-mod.c linux-2.6.32.48/arch/x86/mm/mmio-mod.c +--- linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/mmio-mod.c 2011-11-12 12:46:42.000000000 -0500 @@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, s break; default: @@ -23312,9 +23312,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/mmio-mod.c linux-2.6.32.46/arch/x86/mm/mm }; map.map_id = trace->id; -diff -urNp linux-2.6.32.46/arch/x86/mm/numa_32.c linux-2.6.32.46/arch/x86/mm/numa_32.c ---- linux-2.6.32.46/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/numa_32.c linux-2.6.32.48/arch/x86/mm/numa_32.c +--- linux-2.6.32.48/arch/x86/mm/numa_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/numa_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -23323,9 +23323,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/numa_32.c linux-2.6.32.46/arch/x86/mm/num extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pageattr.c ---- linux-2.6.32.46/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr.c linux-2.6.32.48/arch/x86/mm/pageattr.c +--- linux-2.6.32.48/arch/x86/mm/pageattr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pageattr.c 2011-11-12 12:46:42.000000000 -0500 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. */ @@ -23402,9 +23402,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pa } static int -diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.46/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pageattr-test.c linux-2.6.32.48/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pageattr-test.c 2011-11-12 12:46:42.000000000 -0500 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -23414,9 +23414,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/ } struct split_state { -diff -urNp linux-2.6.32.46/arch/x86/mm/pat.c linux-2.6.32.46/arch/x86/mm/pat.c ---- linux-2.6.32.46/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pat.c linux-2.6.32.48/arch/x86/mm/pat.c +--- linux-2.6.32.48/arch/x86/mm/pat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pat.c 2011-11-12 12:46:42.000000000 -0500 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -23464,9 +23464,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pat.c linux-2.6.32.46/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.46/arch/x86/mm/pf_in.c linux-2.6.32.46/arch/x86/mm/pf_in.c ---- linux-2.6.32.46/arch/x86/mm/pf_in.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pf_in.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pf_in.c linux-2.6.32.48/arch/x86/mm/pf_in.c +--- linux-2.6.32.48/arch/x86/mm/pf_in.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pf_in.c 2011-11-12 12:46:42.000000000 -0500 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l int i; enum reason_type rv = OTHERS; @@ -23512,9 +23512,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pf_in.c linux-2.6.32.46/arch/x86/mm/pf_in p += skip_prefix(p, &prf); p += get_opcode(p, &opcode); for (i = 0; i < ARRAY_SIZE(imm_wop); i++) -diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.46/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable_32.c linux-2.6.32.48/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pgtable_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -23529,9 +23529,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/ /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgtable.c ---- linux-2.6.32.46/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/pgtable.c 2011-05-11 18:25:15.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/pgtable.c linux-2.6.32.48/arch/x86/mm/pgtable.c +--- linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/pgtable.c 2011-11-12 12:46:42.000000000 -0500 @@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -23778,9 +23778,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgt pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-2.6.32.46/arch/x86/mm/setup_nx.c linux-2.6.32.46/arch/x86/mm/setup_nx.c ---- linux-2.6.32.46/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/setup_nx.c linux-2.6.32.48/arch/x86/mm/setup_nx.c +--- linux-2.6.32.48/arch/x86/mm/setup_nx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/setup_nx.c 2011-11-12 12:46:42.000000000 -0500 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -23846,9 +23846,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/setup_nx.c linux-2.6.32.46/arch/x86/mm/se __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.46/arch/x86/mm/tlb.c linux-2.6.32.46/arch/x86/mm/tlb.c ---- linux-2.6.32.46/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/mm/tlb.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/mm/tlb.c linux-2.6.32.48/arch/x86/mm/tlb.c +--- linux-2.6.32.48/arch/x86/mm/tlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/mm/tlb.c 2011-11-12 12:46:42.000000000 -0500 @@ -61,7 +61,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -23861,9 +23861,9 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/tlb.c linux-2.6.32.46/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-2.6.32.46/arch/x86/oprofile/backtrace.c linux-2.6.32.46/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.46/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/oprofile/backtrace.c linux-2.6.32.48/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/oprofile/backtrace.c 2011-11-12 12:46:42.000000000 -0500 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back struct frame_head bufhead[2]; @@ -23882,9 +23882,9 @@ diff -urNp linux-2.6.32.46/arch/x86/oprofile/backtrace.c linux-2.6.32.46/arch/x8 unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/oprofile/op_model_p4.c 2011-11-12 12:46:42.000000000 -0500 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -23894,9 +23894,9 @@ diff -urNp linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c linux-2.6.32.46/arch/ { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.46/arch/x86/pci/common.c linux-2.6.32.46/arch/x86/pci/common.c ---- linux-2.6.32.46/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/common.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/common.c linux-2.6.32.48/arch/x86/pci/common.c +--- linux-2.6.32.48/arch/x86/pci/common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/common.c 2011-11-12 12:46:42.000000000 -0500 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -23908,9 +23908,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/common.c linux-2.6.32.46/arch/x86/pci/co int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 *val) -diff -urNp linux-2.6.32.46/arch/x86/pci/direct.c linux-2.6.32.46/arch/x86/pci/direct.c ---- linux-2.6.32.46/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/direct.c linux-2.6.32.48/arch/x86/pci/direct.c +--- linux-2.6.32.48/arch/x86/pci/direct.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/direct.c 2011-11-12 12:46:42.000000000 -0500 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -23938,9 +23938,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/direct.c linux-2.6.32.46/arch/x86/pci/di { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_32.c linux-2.6.32.46/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.46/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_32.c linux-2.6.32.48/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/mmconfig_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -23950,9 +23950,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_32.c linux-2.6.32.46/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_64.c linux-2.6.32.46/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.46/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/mmconfig_64.c linux-2.6.32.48/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/mmconfig_64.c 2011-11-12 12:46:42.000000000 -0500 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -23962,9 +23962,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_64.c linux-2.6.32.46/arch/x86/p .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.46/arch/x86/pci/numaq_32.c linux-2.6.32.46/arch/x86/pci/numaq_32.c ---- linux-2.6.32.46/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/numaq_32.c linux-2.6.32.48/arch/x86/pci/numaq_32.c +--- linux-2.6.32.48/arch/x86/pci/numaq_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/numaq_32.c 2011-11-12 12:46:42.000000000 -0500 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -23974,9 +23974,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/numaq_32.c linux-2.6.32.46/arch/x86/pci/ .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.46/arch/x86/pci/olpc.c linux-2.6.32.46/arch/x86/pci/olpc.c ---- linux-2.6.32.46/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/olpc.c linux-2.6.32.48/arch/x86/pci/olpc.c +--- linux-2.6.32.48/arch/x86/pci/olpc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/olpc.c 2011-11-12 12:46:42.000000000 -0500 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -23986,9 +23986,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/olpc.c linux-2.6.32.46/arch/x86/pci/olpc .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.46/arch/x86/pci/pcbios.c linux-2.6.32.46/arch/x86/pci/pcbios.c ---- linux-2.6.32.46/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/pci/pcbios.c linux-2.6.32.48/arch/x86/pci/pcbios.c +--- linux-2.6.32.48/arch/x86/pci/pcbios.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/pci/pcbios.c 2011-11-12 12:46:42.000000000 -0500 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -24311,9 +24311,9 @@ diff -urNp linux-2.6.32.46/arch/x86/pci/pcbios.c linux-2.6.32.46/arch/x86/pci/pc return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.46/arch/x86/power/cpu.c linux-2.6.32.46/arch/x86/power/cpu.c ---- linux-2.6.32.46/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/power/cpu.c linux-2.6.32.48/arch/x86/power/cpu.c +--- linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/power/cpu.c 2011-11-12 12:46:42.000000000 -0500 @@ -129,7 +129,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -24333,9 +24333,9 @@ diff -urNp linux-2.6.32.46/arch/x86/power/cpu.c linux-2.6.32.46/arch/x86/power/c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.46/arch/x86/vdso/Makefile linux-2.6.32.46/arch/x86/vdso/Makefile ---- linux-2.6.32.46/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/Makefile linux-2.6.32.48/arch/x86/vdso/Makefile +--- linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/Makefile 2011-11-12 12:46:42.000000000 -0500 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -24345,9 +24345,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/Makefile linux-2.6.32.46/arch/x86/vdso/ GCOV_PROFILE := n # -diff -urNp linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/vclock_gettime.c 2011-11-12 12:46:42.000000000 -0500 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -24446,9 +24446,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c linux-2.6.32.46/arch/x } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/vdso32-setup.c 2011-11-12 12:46:42.000000000 -0500 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -24531,9 +24531,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86 return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.46/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/vdso.lds.S 2011-06-06 17:35:35.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/vdso.lds.S linux-2.6.32.48/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/vdso.lds.S 2011-11-12 12:46:42.000000000 -0500 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -24544,9 +24544,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vds +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.46/arch/x86/vdso/vextern.h linux-2.6.32.46/arch/x86/vdso/vextern.h ---- linux-2.6.32.46/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/vextern.h linux-2.6.32.48/arch/x86/vdso/vextern.h +--- linux-2.6.32.48/arch/x86/vdso/vextern.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/vextern.h 2011-11-12 12:46:42.000000000 -0500 @@ -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. */ @@ -24554,9 +24554,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vextern.h linux-2.6.32.46/arch/x86/vdso -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.46/arch/x86/vdso/vma.c linux-2.6.32.46/arch/x86/vdso/vma.c ---- linux-2.6.32.46/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/vdso/vma.c 2011-08-23 20:24:19.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/vdso/vma.c linux-2.6.32.48/arch/x86/vdso/vma.c +--- linux-2.6.32.48/arch/x86/vdso/vma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/vdso/vma.c 2011-11-12 12:46:42.000000000 -0500 @@ -17,8 +17,6 @@ #include "vextern.h" /* Just for VMAGIC. */ #undef VEXTERN @@ -24644,9 +24644,9 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vma.c linux-2.6.32.46/arch/x86/vdso/vma - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.46/arch/x86/xen/enlighten.c linux-2.6.32.46/arch/x86/xen/enlighten.c ---- linux-2.6.32.46/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/enlighten.c 2011-05-22 23:02:03.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/xen/enlighten.c linux-2.6.32.48/arch/x86/xen/enlighten.c +--- linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/enlighten.c 2011-11-12 12:46:42.000000000 -0500 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -24732,9 +24732,9 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/enlighten.c linux-2.6.32.46/arch/x86/xen xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.46/arch/x86/xen/mmu.c linux-2.6.32.46/arch/x86/xen/mmu.c ---- linux-2.6.32.46/arch/x86/xen/mmu.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/mmu.c 2011-08-24 18:35:52.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/xen/mmu.c linux-2.6.32.48/arch/x86/xen/mmu.c +--- linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/mmu.c 2011-11-12 12:46:42.000000000 -0500 @@ -1719,6 +1719,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -24771,10 +24771,10 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/mmu.c linux-2.6.32.46/arch/x86/xen/mmu.c .alloc_pud = xen_alloc_pmd_init, .release_pud = xen_release_pmd_init, -diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c ---- linux-2.6.32.46/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/smp.c 2011-05-11 18:25:15.000000000 -0400 -@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ +diff -urNp linux-2.6.32.48/arch/x86/xen/smp.c linux-2.6.32.48/arch/x86/xen/smp.c +--- linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/smp.c 2011-11-12 12:46:42.000000000 -0500 +@@ -168,11 +168,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); @@ -24786,7 +24786,7 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c xen_setup_vcpu_info_placement(); } -@@ -231,12 +226,12 @@ cpu_initialize_context(unsigned int cpu, +@@ -241,12 +236,12 @@ cpu_initialize_context(unsigned int cpu, gdt = get_cpu_gdt_table(cpu); ctxt->flags = VGCF_IN_KERNEL; @@ -24802,7 +24802,7 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c #else ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif -@@ -287,13 +282,12 @@ static int __cpuinit xen_cpu_up(unsigned +@@ -297,13 +292,12 @@ static int __cpuinit xen_cpu_up(unsigned int rc; per_cpu(current_task, cpu) = idle; @@ -24818,9 +24818,9 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-2.6.32.46/arch/x86/xen/xen-asm_32.S linux-2.6.32.46/arch/x86/xen/xen-asm_32.S ---- linux-2.6.32.46/arch/x86/xen/xen-asm_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/xen-asm_32.S 2011-04-22 19:13:13.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/xen/xen-asm_32.S linux-2.6.32.48/arch/x86/xen/xen-asm_32.S +--- linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/xen-asm_32.S 2011-11-12 12:46:42.000000000 -0500 @@ -83,14 +83,14 @@ ENTRY(xen_iret) ESP_OFFSET=4 # bytes pushed onto stack @@ -24842,9 +24842,9 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/xen-asm_32.S linux-2.6.32.46/arch/x86/xe #else movl per_cpu__xen_vcpu, %eax #endif -diff -urNp linux-2.6.32.46/arch/x86/xen/xen-head.S linux-2.6.32.46/arch/x86/xen/xen-head.S ---- linux-2.6.32.46/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/xen/xen-head.S linux-2.6.32.48/arch/x86/xen/xen-head.S +--- linux-2.6.32.48/arch/x86/xen/xen-head.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/xen-head.S 2011-11-12 12:46:42.000000000 -0500 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -24863,9 +24863,9 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/xen-head.S linux-2.6.32.46/arch/x86/xen/ #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-2.6.32.46/arch/x86/xen/xen-ops.h linux-2.6.32.46/arch/x86/xen/xen-ops.h ---- linux-2.6.32.46/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/arch/x86/xen/xen-ops.h linux-2.6.32.48/arch/x86/xen/xen-ops.h +--- linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/arch/x86/xen/xen-ops.h 2011-11-12 12:46:42.000000000 -0500 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -24875,9 +24875,9 @@ diff -urNp linux-2.6.32.46/arch/x86/xen/xen-ops.h linux-2.6.32.46/arch/x86/xen/x struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.46/block/blk-integrity.c linux-2.6.32.46/block/blk-integrity.c ---- linux-2.6.32.46/block/blk-integrity.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/blk-integrity.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/block/blk-integrity.c linux-2.6.32.48/block/blk-integrity.c +--- linux-2.6.32.48/block/blk-integrity.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/block/blk-integrity.c 2011-11-12 12:46:42.000000000 -0500 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -24887,9 +24887,9 @@ diff -urNp linux-2.6.32.46/block/blk-integrity.c linux-2.6.32.46/block/blk-integ .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.46/block/blk-iopoll.c linux-2.6.32.46/block/blk-iopoll.c ---- linux-2.6.32.46/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/block/blk-iopoll.c linux-2.6.32.48/block/blk-iopoll.c +--- linux-2.6.32.48/block/blk-iopoll.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/block/blk-iopoll.c 2011-11-12 12:46:42.000000000 -0500 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -24899,9 +24899,9 @@ diff -urNp linux-2.6.32.46/block/blk-iopoll.c linux-2.6.32.46/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-2.6.32.46/block/blk-map.c linux-2.6.32.46/block/blk-map.c ---- linux-2.6.32.46/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 +diff -urNp linux-2.6.32.48/block/blk-map.c linux-2.6.32.48/block/blk-map.c +--- linux-2.6.32.48/block/blk-map.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/block/blk-map.c 2011-11-12 12:46:42.000000000 -0500 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -24936,9 +24936,9 @@ diff -urNp linux-2.6.32.46/block/blk-map.c linux-2.6.32.46/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.46/block/blk-softirq.c linux-2.6.32.46/block/blk-softirq.c ---- linux-2.6.32.46/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/block/blk-softirq.c linux-2.6.32.48/block/blk-softirq.c +--- linux-2.6.32.48/block/blk-softirq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/block/blk-softirq.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -24948,9 +24948,9 @@ diff -urNp linux-2.6.32.46/block/blk-softirq.c linux-2.6.32.46/block/blk-softirq { struct list_head *cpu_list, local_list; -diff -urNp linux-2.6.32.46/block/blk-sysfs.c linux-2.6.32.46/block/blk-sysfs.c ---- linux-2.6.32.46/block/blk-sysfs.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/block/blk-sysfs.c 2011-05-10 22:12:26.000000000 -0400 +diff -urNp linux-2.6.32.48/block/blk-sysfs.c linux-2.6.32.48/block/blk-sysfs.c +--- linux-2.6.32.48/block/blk-sysfs.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/block/blk-sysfs.c 2011-11-12 12:46:42.000000000 -0500 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -24960,9 +24960,9 @@ diff -urNp linux-2.6.32.46/block/blk-sysfs.c linux-2.6.32.46/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.46/block/bsg.c linux-2.6.32.46/block/bsg.c ---- linux-2.6.32.46/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/bsg.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/block/bsg.c linux-2.6.32.48/block/bsg.c +--- linux-2.6.32.48/block/bsg.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/block/bsg.c 2011-11-12 12:46:42.000000000 -0500 @@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -25021,9 +25021,9 @@ diff -urNp linux-2.6.32.46/block/bsg.c linux-2.6.32.46/block/bsg.c rq->sense, len); if (!ret) hdr->response_len = len; -diff -urNp linux-2.6.32.46/block/compat_ioctl.c linux-2.6.32.46/block/compat_ioctl.c ---- linux-2.6.32.46/block/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/compat_ioctl.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/block/compat_ioctl.c linux-2.6.32.48/block/compat_ioctl.c +--- linux-2.6.32.48/block/compat_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/block/compat_ioctl.c 2011-11-12 12:46:42.000000000 -0500 @@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_ err |= __get_user(f->spec1, &uf->spec1); err |= __get_user(f->fmt_gap, &uf->fmt_gap); @@ -25033,9 +25033,9 @@ diff -urNp linux-2.6.32.46/block/compat_ioctl.c linux-2.6.32.46/block/compat_ioc if (err) { err = -EFAULT; goto out; -diff -urNp linux-2.6.32.46/block/elevator.c linux-2.6.32.46/block/elevator.c ---- linux-2.6.32.46/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/block/elevator.c linux-2.6.32.48/block/elevator.c +--- linux-2.6.32.48/block/elevator.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/block/elevator.c 2011-11-12 12:46:42.000000000 -0500 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -25045,9 +25045,9 @@ diff -urNp linux-2.6.32.46/block/elevator.c linux-2.6.32.46/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.46/block/scsi_ioctl.c linux-2.6.32.46/block/scsi_ioctl.c ---- linux-2.6.32.46/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/block/scsi_ioctl.c 2011-04-23 13:28:22.000000000 -0400 +diff -urNp linux-2.6.32.48/block/scsi_ioctl.c linux-2.6.32.48/block/scsi_ioctl.c +--- linux-2.6.32.48/block/scsi_ioctl.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/block/scsi_ioctl.c 2011-11-12 12:46:42.000000000 -0500 @@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) @@ -25099,9 +25099,9 @@ diff -urNp linux-2.6.32.46/block/scsi_ioctl.c linux-2.6.32.46/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; -diff -urNp linux-2.6.32.46/crypto/cryptd.c linux-2.6.32.46/crypto/cryptd.c ---- linux-2.6.32.46/crypto/cryptd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/crypto/cryptd.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/crypto/cryptd.c linux-2.6.32.48/crypto/cryptd.c +--- linux-2.6.32.48/crypto/cryptd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/crypto/cryptd.c 2011-11-12 12:46:42.000000000 -0500 @@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx { struct cryptd_blkcipher_request_ctx { @@ -25111,9 +25111,9 @@ diff -urNp linux-2.6.32.46/crypto/cryptd.c linux-2.6.32.46/crypto/cryptd.c struct cryptd_hash_ctx { struct crypto_shash *child; -diff -urNp linux-2.6.32.46/crypto/gf128mul.c linux-2.6.32.46/crypto/gf128mul.c ---- linux-2.6.32.46/crypto/gf128mul.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/crypto/gf128mul.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/crypto/gf128mul.c linux-2.6.32.48/crypto/gf128mul.c +--- linux-2.6.32.48/crypto/gf128mul.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/crypto/gf128mul.c 2011-11-12 12:46:42.000000000 -0500 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 for (i = 0; i < 7; ++i) gf128mul_x_lle(&p[i + 1], &p[i]); @@ -25132,9 +25132,9 @@ diff -urNp linux-2.6.32.46/crypto/gf128mul.c linux-2.6.32.46/crypto/gf128mul.c for (i = 0;;) { u8 ch = ((u8 *)b)[i]; -diff -urNp linux-2.6.32.46/crypto/serpent.c linux-2.6.32.46/crypto/serpent.c ---- linux-2.6.32.46/crypto/serpent.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/crypto/serpent.c 2011-08-18 23:59:56.000000000 -0400 +diff -urNp linux-2.6.32.48/crypto/serpent.c linux-2.6.32.48/crypto/serpent.c +--- linux-2.6.32.48/crypto/serpent.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/crypto/serpent.c 2011-11-12 12:46:42.000000000 -0500 @@ -21,6 +21,7 @@ #include <asm/byteorder.h> #include <linux/crypto.h> @@ -25152,9 +25152,9 @@ diff -urNp linux-2.6.32.46/crypto/serpent.c linux-2.6.32.46/crypto/serpent.c /* Copy key, add padding */ for (i = 0; i < keylen; ++i) -diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/dontdiff ---- linux-2.6.32.46/Documentation/dontdiff 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/Documentation/dontdiff 2011-08-21 18:59:02.000000000 -0400 +diff -urNp linux-2.6.32.48/Documentation/dontdiff linux-2.6.32.48/Documentation/dontdiff +--- linux-2.6.32.48/Documentation/dontdiff 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/Documentation/dontdiff 2011-11-12 12:46:42.000000000 -0500 @@ -1,13 +1,16 @@ *.a *.aux @@ -25290,9 +25290,9 @@ diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/ zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/Documentation/kernel-parameters.txt ---- linux-2.6.32.46/Documentation/kernel-parameters.txt 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/Documentation/kernel-parameters.txt 2011-04-17 15:56:45.000000000 -0400 +diff -urNp linux-2.6.32.48/Documentation/kernel-parameters.txt linux-2.6.32.48/Documentation/kernel-parameters.txt +--- linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/Documentation/kernel-parameters.txt 2011-11-12 12:46:42.000000000 -0500 @@ -1837,6 +1837,13 @@ 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. @@ -25307,9 +25307,9 @@ diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/D pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.46/drivers/acpi/acpi_pad.c linux-2.6.32.46/drivers/acpi/acpi_pad.c ---- linux-2.6.32.46/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/acpi_pad.c linux-2.6.32.48/drivers/acpi/acpi_pad.c +--- linux-2.6.32.48/drivers/acpi/acpi_pad.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/acpi_pad.c 2011-11-12 12:46:42.000000000 -0500 @@ -30,7 +30,7 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> @@ -25319,9 +25319,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/acpi_pad.c linux-2.6.32.46/drivers/acpi/ #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 static DEFINE_MUTEX(isolated_cpus_lock); -diff -urNp linux-2.6.32.46/drivers/acpi/battery.c linux-2.6.32.46/drivers/acpi/battery.c ---- linux-2.6.32.46/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/battery.c linux-2.6.32.48/drivers/acpi/battery.c +--- linux-2.6.32.48/drivers/acpi/battery.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/battery.c 2011-11-12 12:46:42.000000000 -0500 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -25331,9 +25331,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/battery.c linux-2.6.32.46/drivers/acpi/b mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.46/drivers/acpi/dock.c linux-2.6.32.46/drivers/acpi/dock.c ---- linux-2.6.32.46/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/dock.c linux-2.6.32.48/drivers/acpi/dock.c +--- linux-2.6.32.48/drivers/acpi/dock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/dock.c 2011-11-12 12:46:42.000000000 -0500 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -25352,9 +25352,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/dock.c linux-2.6.32.46/drivers/acpi/dock void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.46/drivers/acpi/osl.c linux-2.6.32.46/drivers/acpi/osl.c ---- linux-2.6.32.46/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/osl.c linux-2.6.32.48/drivers/acpi/osl.c +--- linux-2.6.32.48/drivers/acpi/osl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/osl.c 2011-11-12 12:46:42.000000000 -0500 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -25373,9 +25373,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/osl.c linux-2.6.32.46/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.46/drivers/acpi/power_meter.c linux-2.6.32.46/drivers/acpi/power_meter.c ---- linux-2.6.32.46/drivers/acpi/power_meter.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/power_meter.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/power_meter.c linux-2.6.32.48/drivers/acpi/power_meter.c +--- linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/power_meter.c 2011-11-12 12:46:42.000000000 -0500 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d return res; @@ -25385,9 +25385,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/power_meter.c linux-2.6.32.46/drivers/ac mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-2.6.32.46/drivers/acpi/proc.c linux-2.6.32.46/drivers/acpi/proc.c ---- linux-2.6.32.46/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/proc.c linux-2.6.32.48/drivers/acpi/proc.c +--- linux-2.6.32.48/drivers/acpi/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/proc.c 2011-11-12 12:46:42.000000000 -0500 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -25423,9 +25423,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/proc.c linux-2.6.32.46/drivers/acpi/proc dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1; found_dev = dev; -diff -urNp linux-2.6.32.46/drivers/acpi/processor_core.c linux-2.6.32.46/drivers/acpi/processor_core.c ---- linux-2.6.32.46/drivers/acpi/processor_core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/processor_core.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/processor_core.c linux-2.6.32.48/drivers/acpi/processor_core.c +--- linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/processor_core.c 2011-11-12 12:46:42.000000000 -0500 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -25435,9 +25435,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/processor_core.c linux-2.6.32.46/drivers /* * Buggy BIOS check -diff -urNp linux-2.6.32.46/drivers/acpi/sbshc.c linux-2.6.32.46/drivers/acpi/sbshc.c ---- linux-2.6.32.46/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/sbshc.c linux-2.6.32.48/drivers/acpi/sbshc.c +--- linux-2.6.32.48/drivers/acpi/sbshc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/sbshc.c 2011-11-12 12:46:42.000000000 -0500 @@ -17,7 +17,7 @@ #define PREFIX "ACPI: " @@ -25447,9 +25447,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/sbshc.c linux-2.6.32.46/drivers/acpi/sbs #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" struct acpi_smb_hc { -diff -urNp linux-2.6.32.46/drivers/acpi/sleep.c linux-2.6.32.46/drivers/acpi/sleep.c ---- linux-2.6.32.46/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/sleep.c linux-2.6.32.48/drivers/acpi/sleep.c +--- linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/sleep.c 2011-11-12 12:46:42.000000000 -0500 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp } } @@ -25486,9 +25486,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/sleep.c linux-2.6.32.46/drivers/acpi/sle .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.46/drivers/acpi/video.c linux-2.6.32.46/drivers/acpi/video.c ---- linux-2.6.32.46/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/acpi/video.c linux-2.6.32.48/drivers/acpi/video.c +--- linux-2.6.32.48/drivers/acpi/video.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/acpi/video.c 2011-11-12 12:46:42.000000000 -0500 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -25498,9 +25498,9 @@ diff -urNp linux-2.6.32.46/drivers/acpi/video.c linux-2.6.32.46/drivers/acpi/vid .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.46/drivers/ata/ahci.c linux-2.6.32.46/drivers/ata/ahci.c ---- linux-2.6.32.46/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/ahci.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/ahci.c linux-2.6.32.48/drivers/ata/ahci.c +--- linux-2.6.32.48/drivers/ata/ahci.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/ahci.c 2011-11-12 12:46:42.000000000 -0500 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -25531,9 +25531,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/ahci.c linux-2.6.32.46/drivers/ata/ahci.c .inherits = &ahci_ops, .softreset = ahci_sb600_softreset, .pmp_softreset = ahci_sb600_softreset, -diff -urNp linux-2.6.32.46/drivers/ata/ata_generic.c linux-2.6.32.46/drivers/ata/ata_generic.c ---- linux-2.6.32.46/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/ata_generic.c linux-2.6.32.48/drivers/ata/ata_generic.c +--- linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/ata_generic.c 2011-11-12 12:46:42.000000000 -0500 @@ -104,7 +104,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -25543,9 +25543,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/ata_generic.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.46/drivers/ata/ata_piix.c linux-2.6.32.46/drivers/ata/ata_piix.c ---- linux-2.6.32.46/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/ata_piix.c 2011-04-23 12:56:10.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/ata_piix.c linux-2.6.32.48/drivers/ata/ata_piix.c +--- linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/ata_piix.c 2011-11-12 12:46:42.000000000 -0500 @@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -25582,9 +25582,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/ata_piix.c linux-2.6.32.46/drivers/ata/at .inherits = &piix_sata_ops, .hardreset = sata_std_hardreset, .scr_read = piix_sidpr_scr_read, -diff -urNp linux-2.6.32.46/drivers/ata/libata-acpi.c linux-2.6.32.46/drivers/ata/libata-acpi.c ---- linux-2.6.32.46/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/libata-acpi.c linux-2.6.32.48/drivers/ata/libata-acpi.c +--- linux-2.6.32.48/drivers/ata/libata-acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/libata-acpi.c 2011-11-12 12:46:42.000000000 -0500 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -25600,9 +25600,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/libata-acpi.c linux-2.6.32.46/drivers/ata .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.46/drivers/ata/libata-core.c linux-2.6.32.46/drivers/ata/libata-core.c ---- linux-2.6.32.46/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/libata-core.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/libata-core.c linux-2.6.32.48/drivers/ata/libata-core.c +--- linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/libata-core.c 2011-11-12 12:46:42.000000000 -0500 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -25667,9 +25667,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/libata-core.c linux-2.6.32.46/drivers/ata .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.32.46/drivers/ata/libata-eh.c linux-2.6.32.46/drivers/ata/libata-eh.c ---- linux-2.6.32.46/drivers/ata/libata-eh.c 2011-08-09 18:35:28.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/libata-eh.c 2011-08-09 18:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/libata-eh.c linux-2.6.32.48/drivers/ata/libata-eh.c +--- linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/libata-eh.c 2011-11-12 12:46:42.000000000 -0500 @@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; @@ -25688,9 +25688,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/libata-eh.c linux-2.6.32.46/drivers/ata/l ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.46/drivers/ata/libata-pmp.c linux-2.6.32.46/drivers/ata/libata-pmp.c ---- linux-2.6.32.46/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/libata-pmp.c linux-2.6.32.48/drivers/ata/libata-pmp.c +--- linux-2.6.32.48/drivers/ata/libata-pmp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/libata-pmp.c 2011-11-12 12:46:42.000000000 -0500 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -25700,9 +25700,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/libata-pmp.c linux-2.6.32.46/drivers/ata/ int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.32.46/drivers/ata/pata_acpi.c linux-2.6.32.46/drivers/ata/pata_acpi.c ---- linux-2.6.32.46/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_acpi.c linux-2.6.32.48/drivers/ata/pata_acpi.c +--- linux-2.6.32.48/drivers/ata/pata_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_acpi.c 2011-11-12 12:46:42.000000000 -0500 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -25712,9 +25712,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_acpi.c linux-2.6.32.46/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.46/drivers/ata/pata_ali.c linux-2.6.32.46/drivers/ata/pata_ali.c ---- linux-2.6.32.46/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_ali.c linux-2.6.32.48/drivers/ata/pata_ali.c +--- linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_ali.c 2011-11-12 12:46:42.000000000 -0500 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -25760,9 +25760,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_ali.c linux-2.6.32.46/drivers/ata/pa .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/pata_amd.c linux-2.6.32.46/drivers/ata/pata_amd.c ---- linux-2.6.32.46/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_amd.c linux-2.6.32.48/drivers/ata/pata_amd.c +--- linux-2.6.32.48/drivers/ata/pata_amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_amd.c 2011-11-12 12:46:42.000000000 -0500 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -25812,9 +25812,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_amd.c linux-2.6.32.46/drivers/ata/pa .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_artop.c linux-2.6.32.46/drivers/ata/pata_artop.c ---- linux-2.6.32.46/drivers/ata/pata_artop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_artop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_artop.c linux-2.6.32.48/drivers/ata/pata_artop.c +--- linux-2.6.32.48/drivers/ata/pata_artop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_artop.c 2011-11-12 12:46:42.000000000 -0500 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -25833,9 +25833,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_artop.c linux-2.6.32.46/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_at32.c linux-2.6.32.46/drivers/ata/pata_at32.c ---- linux-2.6.32.46/drivers/ata/pata_at32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_at32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_at32.c linux-2.6.32.48/drivers/ata/pata_at32.c +--- linux-2.6.32.48/drivers/ata/pata_at32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_at32.c 2011-11-12 12:46:42.000000000 -0500 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -25845,9 +25845,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_at32.c linux-2.6.32.46/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_at91.c linux-2.6.32.46/drivers/ata/pata_at91.c ---- linux-2.6.32.46/drivers/ata/pata_at91.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_at91.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_at91.c linux-2.6.32.48/drivers/ata/pata_at91.c +--- linux-2.6.32.48/drivers/ata/pata_at91.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_at91.c 2011-11-12 12:46:42.000000000 -0500 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -25857,9 +25857,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_at91.c linux-2.6.32.46/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.46/drivers/ata/pata_atiixp.c linux-2.6.32.46/drivers/ata/pata_atiixp.c ---- linux-2.6.32.46/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_atiixp.c linux-2.6.32.48/drivers/ata/pata_atiixp.c +--- linux-2.6.32.48/drivers/ata/pata_atiixp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_atiixp.c 2011-11-12 12:46:42.000000000 -0500 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -25869,9 +25869,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_atiixp.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.46/drivers/ata/pata_atp867x.c linux-2.6.32.46/drivers/ata/pata_atp867x.c ---- linux-2.6.32.46/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_atp867x.c linux-2.6.32.48/drivers/ata/pata_atp867x.c +--- linux-2.6.32.48/drivers/ata/pata_atp867x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_atp867x.c 2011-11-12 12:46:42.000000000 -0500 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -25881,9 +25881,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_atp867x.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_bf54x.c linux-2.6.32.46/drivers/ata/pata_bf54x.c ---- linux-2.6.32.46/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_bf54x.c linux-2.6.32.48/drivers/ata/pata_bf54x.c +--- linux-2.6.32.48/drivers/ata/pata_bf54x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_bf54x.c 2011-11-12 12:46:42.000000000 -0500 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -25893,9 +25893,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_bf54x.c linux-2.6.32.46/drivers/ata/ .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd640.c linux-2.6.32.46/drivers/ata/pata_cmd640.c ---- linux-2.6.32.46/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cmd640.c linux-2.6.32.48/drivers/ata/pata_cmd640.c +--- linux-2.6.32.48/drivers/ata/pata_cmd640.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cmd640.c 2011-11-12 12:46:42.000000000 -0500 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25905,9 +25905,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd640.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd64x.c linux-2.6.32.46/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.46/drivers/ata/pata_cmd64x.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cmd64x.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cmd64x.c linux-2.6.32.48/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cmd64x.c 2011-11-12 12:46:42.000000000 -0500 @@ -271,18 +271,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -25930,9 +25930,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd64x.c linux-2.6.32.46/drivers/ata .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5520.c linux-2.6.32.46/drivers/ata/pata_cs5520.c ---- linux-2.6.32.46/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5520.c linux-2.6.32.48/drivers/ata/pata_cs5520.c +--- linux-2.6.32.48/drivers/ata/pata_cs5520.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cs5520.c 2011-11-12 12:46:42.000000000 -0500 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -25942,9 +25942,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5520.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5530.c linux-2.6.32.46/drivers/ata/pata_cs5530.c ---- linux-2.6.32.46/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5530.c linux-2.6.32.48/drivers/ata/pata_cs5530.c +--- linux-2.6.32.48/drivers/ata/pata_cs5530.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cs5530.c 2011-11-12 12:46:42.000000000 -0500 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -25954,9 +25954,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5530.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5535.c linux-2.6.32.46/drivers/ata/pata_cs5535.c ---- linux-2.6.32.46/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5535.c linux-2.6.32.48/drivers/ata/pata_cs5535.c +--- linux-2.6.32.48/drivers/ata/pata_cs5535.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cs5535.c 2011-11-12 12:46:42.000000000 -0500 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25966,9 +25966,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5535.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5536.c linux-2.6.32.46/drivers/ata/pata_cs5536.c ---- linux-2.6.32.46/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cs5536.c linux-2.6.32.48/drivers/ata/pata_cs5536.c +--- linux-2.6.32.48/drivers/ata/pata_cs5536.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cs5536.c 2011-11-12 12:46:42.000000000 -0500 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25978,9 +25978,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5536.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_cypress.c linux-2.6.32.46/drivers/ata/pata_cypress.c ---- linux-2.6.32.46/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_cypress.c linux-2.6.32.48/drivers/ata/pata_cypress.c +--- linux-2.6.32.48/drivers/ata/pata_cypress.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_cypress.c 2011-11-12 12:46:42.000000000 -0500 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -25990,9 +25990,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_cypress.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_efar.c linux-2.6.32.46/drivers/ata/pata_efar.c ---- linux-2.6.32.46/drivers/ata/pata_efar.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_efar.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_efar.c linux-2.6.32.48/drivers/ata/pata_efar.c +--- linux-2.6.32.48/drivers/ata/pata_efar.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_efar.c 2011-11-12 12:46:42.000000000 -0500 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -26002,9 +26002,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_efar.c linux-2.6.32.46/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt366.c linux-2.6.32.46/drivers/ata/pata_hpt366.c ---- linux-2.6.32.46/drivers/ata/pata_hpt366.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_hpt366.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt366.c linux-2.6.32.48/drivers/ata/pata_hpt366.c +--- linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_hpt366.c 2011-11-12 12:46:42.000000000 -0500 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -26014,9 +26014,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt366.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt37x.c linux-2.6.32.46/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.46/drivers/ata/pata_hpt37x.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_hpt37x.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt37x.c linux-2.6.32.48/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_hpt37x.c 2011-11-12 12:46:42.000000000 -0500 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -26053,9 +26053,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt37x.c linux-2.6.32.46/drivers/ata .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_hpt3x2n.c 2011-11-12 12:46:42.000000000 -0500 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -26065,9 +26065,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x3.c linux-2.6.32.46/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.46/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_hpt3x3.c linux-2.6.32.48/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_hpt3x3.c 2011-11-12 12:46:42.000000000 -0500 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -26077,9 +26077,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x3.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_icside.c linux-2.6.32.46/drivers/ata/pata_icside.c ---- linux-2.6.32.46/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_icside.c linux-2.6.32.48/drivers/ata/pata_icside.c +--- linux-2.6.32.48/drivers/ata/pata_icside.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_icside.c 2011-11-12 12:46:42.000000000 -0500 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -26089,9 +26089,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_icside.c linux-2.6.32.46/drivers/ata .inherits = &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.46/drivers/ata/pata_isapnp.c linux-2.6.32.46/drivers/ata/pata_isapnp.c ---- linux-2.6.32.46/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_isapnp.c linux-2.6.32.48/drivers/ata/pata_isapnp.c +--- linux-2.6.32.48/drivers/ata/pata_isapnp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_isapnp.c 2011-11-12 12:46:42.000000000 -0500 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -26107,9 +26107,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_isapnp.c linux-2.6.32.46/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.32.46/drivers/ata/pata_it8213.c linux-2.6.32.46/drivers/ata/pata_it8213.c ---- linux-2.6.32.46/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_it8213.c linux-2.6.32.48/drivers/ata/pata_it8213.c +--- linux-2.6.32.48/drivers/ata/pata_it8213.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_it8213.c 2011-11-12 12:46:42.000000000 -0500 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -26119,9 +26119,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_it8213.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_it821x.c linux-2.6.32.46/drivers/ata/pata_it821x.c ---- linux-2.6.32.46/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_it821x.c linux-2.6.32.48/drivers/ata/pata_it821x.c +--- linux-2.6.32.48/drivers/ata/pata_it821x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_it821x.c 2011-11-12 12:46:42.000000000 -0500 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -26149,9 +26149,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_it821x.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_ixp4xx_cf.c 2011-11-12 12:46:42.000000000 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -26161,9 +26161,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.46/drivers/ .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_jmicron.c linux-2.6.32.46/drivers/ata/pata_jmicron.c ---- linux-2.6.32.46/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_jmicron.c linux-2.6.32.48/drivers/ata/pata_jmicron.c +--- linux-2.6.32.48/drivers/ata/pata_jmicron.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_jmicron.c 2011-11-12 12:46:42.000000000 -0500 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -26173,9 +26173,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_jmicron.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_legacy.c linux-2.6.32.46/drivers/ata/pata_legacy.c ---- linux-2.6.32.46/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_legacy.c linux-2.6.32.48/drivers/ata/pata_legacy.c +--- linux-2.6.32.48/drivers/ata/pata_legacy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_legacy.c 2011-11-12 12:46:42.000000000 -0500 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -26287,9 +26287,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_legacy.c linux-2.6.32.46/drivers/ata struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.46/drivers/ata/pata_marvell.c linux-2.6.32.46/drivers/ata/pata_marvell.c ---- linux-2.6.32.46/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_marvell.c linux-2.6.32.48/drivers/ata/pata_marvell.c +--- linux-2.6.32.48/drivers/ata/pata_marvell.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_marvell.c 2011-11-12 12:46:42.000000000 -0500 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -26299,9 +26299,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_marvell.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.46/drivers/ata/pata_mpc52xx.c linux-2.6.32.46/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.46/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_mpc52xx.c linux-2.6.32.48/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_mpc52xx.c 2011-11-12 12:46:42.000000000 -0500 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -26311,9 +26311,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_mpc52xx.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_mpiix.c linux-2.6.32.46/drivers/ata/pata_mpiix.c ---- linux-2.6.32.46/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_mpiix.c linux-2.6.32.48/drivers/ata/pata_mpiix.c +--- linux-2.6.32.48/drivers/ata/pata_mpiix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_mpiix.c 2011-11-12 12:46:42.000000000 -0500 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -26323,9 +26323,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_mpiix.c linux-2.6.32.46/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_netcell.c linux-2.6.32.46/drivers/ata/pata_netcell.c ---- linux-2.6.32.46/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_netcell.c linux-2.6.32.48/drivers/ata/pata_netcell.c +--- linux-2.6.32.48/drivers/ata/pata_netcell.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_netcell.c 2011-11-12 12:46:42.000000000 -0500 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -26335,9 +26335,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_netcell.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.46/drivers/ata/pata_ninja32.c linux-2.6.32.46/drivers/ata/pata_ninja32.c ---- linux-2.6.32.46/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_ninja32.c linux-2.6.32.48/drivers/ata/pata_ninja32.c +--- linux-2.6.32.48/drivers/ata/pata_ninja32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_ninja32.c 2011-11-12 12:46:42.000000000 -0500 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -26347,9 +26347,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_ninja32.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87410.c linux-2.6.32.46/drivers/ata/pata_ns87410.c ---- linux-2.6.32.46/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87410.c linux-2.6.32.48/drivers/ata/pata_ns87410.c +--- linux-2.6.32.48/drivers/ata/pata_ns87410.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_ns87410.c 2011-11-12 12:46:42.000000000 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -26359,9 +26359,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87410.c linux-2.6.32.46/drivers/at .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87415.c linux-2.6.32.46/drivers/ata/pata_ns87415.c ---- linux-2.6.32.46/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_ns87415.c linux-2.6.32.48/drivers/ata/pata_ns87415.c +--- linux-2.6.32.48/drivers/ata/pata_ns87415.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_ns87415.c 2011-11-12 12:46:42.000000000 -0500 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -26380,9 +26380,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87415.c linux-2.6.32.46/drivers/at .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.46/drivers/ata/pata_octeon_cf.c linux-2.6.32.46/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.46/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_octeon_cf.c linux-2.6.32.48/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_octeon_cf.c 2011-11-12 12:46:42.000000000 -0500 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -26391,9 +26391,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_octeon_cf.c linux-2.6.32.46/drivers/ static struct ata_port_operations octeon_cf_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = octeon_cf_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/pata_oldpiix.c linux-2.6.32.46/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.46/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_oldpiix.c linux-2.6.32.48/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_oldpiix.c 2011-11-12 12:46:42.000000000 -0500 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -26403,9 +26403,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_oldpiix.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_opti.c linux-2.6.32.46/drivers/ata/pata_opti.c ---- linux-2.6.32.46/drivers/ata/pata_opti.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_opti.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_opti.c linux-2.6.32.48/drivers/ata/pata_opti.c +--- linux-2.6.32.48/drivers/ata/pata_opti.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_opti.c 2011-11-12 12:46:42.000000000 -0500 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -26415,9 +26415,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_opti.c linux-2.6.32.46/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_optidma.c linux-2.6.32.46/drivers/ata/pata_optidma.c ---- linux-2.6.32.46/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_optidma.c linux-2.6.32.48/drivers/ata/pata_optidma.c +--- linux-2.6.32.48/drivers/ata/pata_optidma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_optidma.c 2011-11-12 12:46:42.000000000 -0500 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -26436,9 +26436,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_optidma.c linux-2.6.32.46/drivers/at .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_palmld.c linux-2.6.32.46/drivers/ata/pata_palmld.c ---- linux-2.6.32.46/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_palmld.c linux-2.6.32.48/drivers/ata/pata_palmld.c +--- linux-2.6.32.48/drivers/ata/pata_palmld.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_palmld.c 2011-11-12 12:46:42.000000000 -0500 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -26448,9 +26448,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_palmld.c linux-2.6.32.46/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pata_pcmcia.c linux-2.6.32.46/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.46/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_pcmcia.c linux-2.6.32.48/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_pcmcia.c 2011-11-12 12:46:42.000000000 -0500 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -26477,9 +26477,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_pcmcia.c linux-2.6.32.46/drivers/ata info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc2027x.c linux-2.6.32.46/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.46/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc2027x.c linux-2.6.32.48/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_pdc2027x.c 2011-11-12 12:46:42.000000000 -0500 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -26497,9 +26497,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc2027x.c linux-2.6.32.46/drivers/a .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_pdc202xx_old.c 2011-11-12 12:46:42.000000000 -0500 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -26518,9 +26518,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.46/drive .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/pata_platform.c linux-2.6.32.46/drivers/ata/pata_platform.c ---- linux-2.6.32.46/drivers/ata/pata_platform.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_platform.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_platform.c linux-2.6.32.48/drivers/ata/pata_platform.c +--- linux-2.6.32.48/drivers/ata/pata_platform.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_platform.c 2011-11-12 12:46:42.000000000 -0500 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -26530,9 +26530,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_platform.c linux-2.6.32.46/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.46/drivers/ata/pata_qdi.c linux-2.6.32.46/drivers/ata/pata_qdi.c ---- linux-2.6.32.46/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_qdi.c linux-2.6.32.48/drivers/ata/pata_qdi.c +--- linux-2.6.32.48/drivers/ata/pata_qdi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_qdi.c 2011-11-12 12:46:42.000000000 -0500 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -26551,9 +26551,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_qdi.c linux-2.6.32.46/drivers/ata/pa .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_radisys.c linux-2.6.32.46/drivers/ata/pata_radisys.c ---- linux-2.6.32.46/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_radisys.c linux-2.6.32.48/drivers/ata/pata_radisys.c +--- linux-2.6.32.48/drivers/ata/pata_radisys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_radisys.c 2011-11-12 12:46:42.000000000 -0500 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -26563,9 +26563,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_radisys.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.46/drivers/ata/pata_rb532_cf.c linux-2.6.32.46/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.46/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_rb532_cf.c linux-2.6.32.48/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_rb532_cf.c 2011-11-12 12:46:42.000000000 -0500 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -26575,9 +26575,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_rb532_cf.c linux-2.6.32.46/drivers/a .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_rdc.c linux-2.6.32.46/drivers/ata/pata_rdc.c ---- linux-2.6.32.46/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_rdc.c linux-2.6.32.48/drivers/ata/pata_rdc.c +--- linux-2.6.32.48/drivers/ata/pata_rdc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_rdc.c 2011-11-12 12:46:42.000000000 -0500 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -26587,9 +26587,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_rdc.c linux-2.6.32.46/drivers/ata/pa .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_rz1000.c linux-2.6.32.46/drivers/ata/pata_rz1000.c ---- linux-2.6.32.46/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_rz1000.c linux-2.6.32.48/drivers/ata/pata_rz1000.c +--- linux-2.6.32.48/drivers/ata/pata_rz1000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_rz1000.c 2011-11-12 12:46:42.000000000 -0500 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -26599,9 +26599,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_rz1000.c linux-2.6.32.46/drivers/ata .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_sc1200.c linux-2.6.32.46/drivers/ata/pata_sc1200.c ---- linux-2.6.32.46/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_sc1200.c linux-2.6.32.48/drivers/ata/pata_sc1200.c +--- linux-2.6.32.48/drivers/ata/pata_sc1200.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_sc1200.c 2011-11-12 12:46:42.000000000 -0500 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -26611,9 +26611,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_sc1200.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.32.46/drivers/ata/pata_scc.c linux-2.6.32.46/drivers/ata/pata_scc.c ---- linux-2.6.32.46/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_scc.c linux-2.6.32.48/drivers/ata/pata_scc.c +--- linux-2.6.32.48/drivers/ata/pata_scc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_scc.c 2011-11-12 12:46:42.000000000 -0500 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26623,9 +26623,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_scc.c linux-2.6.32.46/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_sch.c linux-2.6.32.46/drivers/ata/pata_sch.c ---- linux-2.6.32.46/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_sch.c linux-2.6.32.48/drivers/ata/pata_sch.c +--- linux-2.6.32.48/drivers/ata/pata_sch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_sch.c 2011-11-12 12:46:42.000000000 -0500 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26635,9 +26635,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_sch.c linux-2.6.32.46/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_serverworks.c linux-2.6.32.46/drivers/ata/pata_serverworks.c ---- linux-2.6.32.46/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_serverworks.c linux-2.6.32.48/drivers/ata/pata_serverworks.c +--- linux-2.6.32.48/drivers/ata/pata_serverworks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_serverworks.c 2011-11-12 12:46:42.000000000 -0500 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -26656,9 +26656,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_serverworks.c linux-2.6.32.46/driver .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_sil680.c linux-2.6.32.46/drivers/ata/pata_sil680.c ---- linux-2.6.32.46/drivers/ata/pata_sil680.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_sil680.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_sil680.c linux-2.6.32.48/drivers/ata/pata_sil680.c +--- linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_sil680.c 2011-11-12 12:46:42.000000000 -0500 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -26668,9 +26668,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_sil680.c linux-2.6.32.46/drivers/ata .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_sis.c linux-2.6.32.46/drivers/ata/pata_sis.c ---- linux-2.6.32.46/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_sis.c linux-2.6.32.48/drivers/ata/pata_sis.c +--- linux-2.6.32.48/drivers/ata/pata_sis.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_sis.c 2011-11-12 12:46:42.000000000 -0500 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26726,9 +26726,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_sis.c linux-2.6.32.46/drivers/ata/pa .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.32.46/drivers/ata/pata_sl82c105.c linux-2.6.32.46/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.46/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_sl82c105.c linux-2.6.32.48/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_sl82c105.c 2011-11-12 12:46:42.000000000 -0500 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -26738,9 +26738,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_sl82c105.c linux-2.6.32.46/drivers/a .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.46/drivers/ata/pata_triflex.c linux-2.6.32.46/drivers/ata/pata_triflex.c ---- linux-2.6.32.46/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_triflex.c linux-2.6.32.48/drivers/ata/pata_triflex.c +--- linux-2.6.32.48/drivers/ata/pata_triflex.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_triflex.c 2011-11-12 12:46:42.000000000 -0500 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -26750,9 +26750,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_triflex.c linux-2.6.32.46/drivers/at .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.46/drivers/ata/pata_via.c linux-2.6.32.46/drivers/ata/pata_via.c ---- linux-2.6.32.46/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_via.c linux-2.6.32.48/drivers/ata/pata_via.c +--- linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_via.c 2011-11-12 12:46:42.000000000 -0500 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26771,9 +26771,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_via.c linux-2.6.32.46/drivers/ata/pa .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.46/drivers/ata/pata_winbond.c linux-2.6.32.46/drivers/ata/pata_winbond.c ---- linux-2.6.32.46/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pata_winbond.c linux-2.6.32.48/drivers/ata/pata_winbond.c +--- linux-2.6.32.48/drivers/ata/pata_winbond.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pata_winbond.c 2011-11-12 12:46:42.000000000 -0500 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -26783,9 +26783,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pata_winbond.c linux-2.6.32.46/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.46/drivers/ata/pdc_adma.c linux-2.6.32.46/drivers/ata/pdc_adma.c ---- linux-2.6.32.46/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/pdc_adma.c linux-2.6.32.48/drivers/ata/pdc_adma.c +--- linux-2.6.32.48/drivers/ata/pdc_adma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/pdc_adma.c 2011-11-12 12:46:42.000000000 -0500 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -26795,9 +26795,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/pdc_adma.c linux-2.6.32.46/drivers/ata/pd .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.46/drivers/ata/sata_fsl.c linux-2.6.32.46/drivers/ata/sata_fsl.c ---- linux-2.6.32.46/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_fsl.c linux-2.6.32.48/drivers/ata/sata_fsl.c +--- linux-2.6.32.48/drivers/ata/sata_fsl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_fsl.c 2011-11-12 12:46:42.000000000 -0500 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -26807,9 +26807,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_fsl.c linux-2.6.32.46/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.46/drivers/ata/sata_inic162x.c linux-2.6.32.46/drivers/ata/sata_inic162x.c ---- linux-2.6.32.46/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_inic162x.c linux-2.6.32.48/drivers/ata/sata_inic162x.c +--- linux-2.6.32.48/drivers/ata/sata_inic162x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_inic162x.c 2011-11-12 12:46:42.000000000 -0500 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -26819,9 +26819,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_inic162x.c linux-2.6.32.46/drivers/a .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/sata_mv.c linux-2.6.32.46/drivers/ata/sata_mv.c ---- linux-2.6.32.46/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_mv.c linux-2.6.32.48/drivers/ata/sata_mv.c +--- linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_mv.c 2011-11-12 12:46:42.000000000 -0500 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -26849,9 +26849,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_mv.c linux-2.6.32.46/drivers/ata/sat .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.46/drivers/ata/sata_nv.c linux-2.6.32.46/drivers/ata/sata_nv.c ---- linux-2.6.32.46/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_nv.c linux-2.6.32.48/drivers/ata/sata_nv.c +--- linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_nv.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -26894,9 +26894,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_nv.c linux-2.6.32.46/drivers/ata/sat .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.46/drivers/ata/sata_promise.c linux-2.6.32.46/drivers/ata/sata_promise.c ---- linux-2.6.32.46/drivers/ata/sata_promise.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_promise.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_promise.c linux-2.6.32.48/drivers/ata/sata_promise.c +--- linux-2.6.32.48/drivers/ata/sata_promise.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_promise.c 2011-11-12 12:46:42.000000000 -0500 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -26923,9 +26923,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_promise.c linux-2.6.32.46/drivers/at .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.46/drivers/ata/sata_qstor.c linux-2.6.32.46/drivers/ata/sata_qstor.c ---- linux-2.6.32.46/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_qstor.c linux-2.6.32.48/drivers/ata/sata_qstor.c +--- linux-2.6.32.48/drivers/ata/sata_qstor.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_qstor.c 2011-11-12 12:46:42.000000000 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -26935,9 +26935,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_qstor.c linux-2.6.32.46/drivers/ata/ .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/sata_sil24.c ---- linux-2.6.32.46/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_sil24.c linux-2.6.32.48/drivers/ata/sata_sil24.c +--- linux-2.6.32.48/drivers/ata/sata_sil24.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_sil24.c 2011-11-12 12:46:42.000000000 -0500 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -26947,9 +26947,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/ .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sata_sil.c ---- linux-2.6.32.46/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_sil.c linux-2.6.32.48/drivers/ata/sata_sil.c +--- linux-2.6.32.48/drivers/ata/sata_sil.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_sil.c 2011-11-12 12:46:42.000000000 -0500 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -26959,9 +26959,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.46/drivers/ata/sata_sis.c linux-2.6.32.46/drivers/ata/sata_sis.c ---- linux-2.6.32.46/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_sis.c linux-2.6.32.48/drivers/ata/sata_sis.c +--- linux-2.6.32.48/drivers/ata/sata_sis.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_sis.c 2011-11-12 12:46:42.000000000 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -26971,9 +26971,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_sis.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.46/drivers/ata/sata_svw.c linux-2.6.32.46/drivers/ata/sata_svw.c ---- linux-2.6.32.46/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_svw.c linux-2.6.32.48/drivers/ata/sata_svw.c +--- linux-2.6.32.48/drivers/ata/sata_svw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_svw.c 2011-11-12 12:46:42.000000000 -0500 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -26983,9 +26983,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_svw.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.32.46/drivers/ata/sata_sx4.c linux-2.6.32.46/drivers/ata/sata_sx4.c ---- linux-2.6.32.46/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_sx4.c linux-2.6.32.48/drivers/ata/sata_sx4.c +--- linux-2.6.32.48/drivers/ata/sata_sx4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_sx4.c 2011-11-12 12:46:42.000000000 -0500 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -26995,9 +26995,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_sx4.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.46/drivers/ata/sata_uli.c linux-2.6.32.46/drivers/ata/sata_uli.c ---- linux-2.6.32.46/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_uli.c linux-2.6.32.48/drivers/ata/sata_uli.c +--- linux-2.6.32.48/drivers/ata/sata_uli.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_uli.c 2011-11-12 12:46:42.000000000 -0500 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -27007,9 +27007,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_uli.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.46/drivers/ata/sata_via.c linux-2.6.32.46/drivers/ata/sata_via.c ---- linux-2.6.32.46/drivers/ata/sata_via.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_via.c 2011-05-10 22:15:08.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_via.c linux-2.6.32.48/drivers/ata/sata_via.c +--- linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_via.c 2011-11-12 12:46:42.000000000 -0500 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -27048,9 +27048,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_via.c linux-2.6.32.46/drivers/ata/sa .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.46/drivers/ata/sata_vsc.c linux-2.6.32.46/drivers/ata/sata_vsc.c ---- linux-2.6.32.46/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ata/sata_vsc.c linux-2.6.32.48/drivers/ata/sata_vsc.c +--- linux-2.6.32.48/drivers/ata/sata_vsc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ata/sata_vsc.c 2011-11-12 12:46:42.000000000 -0500 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -27060,9 +27060,9 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_vsc.c linux-2.6.32.46/drivers/ata/sa .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.32.46/drivers/atm/adummy.c linux-2.6.32.46/drivers/atm/adummy.c ---- linux-2.6.32.46/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/adummy.c linux-2.6.32.48/drivers/atm/adummy.c +--- linux-2.6.32.48/drivers/atm/adummy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/adummy.c 2011-11-12 12:46:42.000000000 -0500 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -27072,9 +27072,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/adummy.c linux-2.6.32.46/drivers/atm/adum return 0; } -diff -urNp linux-2.6.32.46/drivers/atm/ambassador.c linux-2.6.32.46/drivers/atm/ambassador.c ---- linux-2.6.32.46/drivers/atm/ambassador.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/ambassador.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/ambassador.c linux-2.6.32.48/drivers/atm/ambassador.c +--- linux-2.6.32.48/drivers/atm/ambassador.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/ambassador.c 2011-11-12 12:46:42.000000000 -0500 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -27111,9 +27111,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/ambassador.c linux-2.6.32.46/drivers/atm/ return -ENOMEM; // ? } -diff -urNp linux-2.6.32.46/drivers/atm/atmtcp.c linux-2.6.32.46/drivers/atm/atmtcp.c ---- linux-2.6.32.46/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/atmtcp.c linux-2.6.32.48/drivers/atm/atmtcp.c +--- linux-2.6.32.48/drivers/atm/atmtcp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/atmtcp.c 2011-11-12 12:46:42.000000000 -0500 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -27163,9 +27163,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/atmtcp.c linux-2.6.32.46/drivers/atm/atmt done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.46/drivers/atm/eni.c linux-2.6.32.46/drivers/atm/eni.c ---- linux-2.6.32.46/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/eni.c linux-2.6.32.48/drivers/atm/eni.c +--- linux-2.6.32.48/drivers/atm/eni.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/eni.c 2011-11-12 12:46:42.000000000 -0500 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -27211,9 +27211,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/eni.c linux-2.6.32.46/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.46/drivers/atm/firestream.c linux-2.6.32.46/drivers/atm/firestream.c ---- linux-2.6.32.46/drivers/atm/firestream.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/firestream.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/firestream.c linux-2.6.32.48/drivers/atm/firestream.c +--- linux-2.6.32.48/drivers/atm/firestream.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/firestream.c 2011-11-12 12:46:42.000000000 -0500 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -27247,9 +27247,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/firestream.c linux-2.6.32.46/drivers/atm/ break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.32.46/drivers/atm/fore200e.c linux-2.6.32.46/drivers/atm/fore200e.c ---- linux-2.6.32.46/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/fore200e.c linux-2.6.32.48/drivers/atm/fore200e.c +--- linux-2.6.32.48/drivers/atm/fore200e.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/fore200e.c 2011-11-12 12:46:42.000000000 -0500 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -27306,9 +27306,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/fore200e.c linux-2.6.32.46/drivers/atm/fo fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.32.46/drivers/atm/he.c linux-2.6.32.46/drivers/atm/he.c ---- linux-2.6.32.46/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/he.c linux-2.6.32.48/drivers/atm/he.c +--- linux-2.6.32.48/drivers/atm/he.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/he.c 2011-11-12 12:46:42.000000000 -0500 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -27390,9 +27390,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/he.c linux-2.6.32.46/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.32.46/drivers/atm/horizon.c linux-2.6.32.46/drivers/atm/horizon.c ---- linux-2.6.32.46/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/horizon.c linux-2.6.32.48/drivers/atm/horizon.c +--- linux-2.6.32.48/drivers/atm/horizon.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/horizon.c 2011-11-12 12:46:42.000000000 -0500 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -27411,9 +27411,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/horizon.c linux-2.6.32.46/drivers/atm/hor // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.46/drivers/atm/idt77252.c linux-2.6.32.46/drivers/atm/idt77252.c ---- linux-2.6.32.46/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/idt77252.c linux-2.6.32.48/drivers/atm/idt77252.c +--- linux-2.6.32.48/drivers/atm/idt77252.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/idt77252.c 2011-11-12 12:46:42.000000000 -0500 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -27568,9 +27568,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/idt77252.c linux-2.6.32.46/drivers/atm/id return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.46/drivers/atm/iphase.c linux-2.6.32.46/drivers/atm/iphase.c ---- linux-2.6.32.46/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/iphase.c linux-2.6.32.48/drivers/atm/iphase.c +--- linux-2.6.32.48/drivers/atm/iphase.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/iphase.c 2011-11-12 12:46:42.000000000 -0500 @@ -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)) @@ -27667,9 +27667,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/iphase.c linux-2.6.32.46/drivers/atm/ipha if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.32.46/drivers/atm/lanai.c linux-2.6.32.46/drivers/atm/lanai.c ---- linux-2.6.32.46/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/lanai.c linux-2.6.32.48/drivers/atm/lanai.c +--- linux-2.6.32.48/drivers/atm/lanai.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/lanai.c 2011-11-12 12:46:42.000000000 -0500 @@ -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); @@ -27724,9 +27724,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/lanai.c linux-2.6.32.46/drivers/atm/lanai lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.46/drivers/atm/nicstar.c linux-2.6.32.46/drivers/atm/nicstar.c ---- linux-2.6.32.46/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/nicstar.c linux-2.6.32.48/drivers/atm/nicstar.c +--- linux-2.6.32.48/drivers/atm/nicstar.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/nicstar.c 2011-11-12 12:46:42.000000000 -0500 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -27929,9 +27929,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/nicstar.c linux-2.6.32.46/drivers/atm/nic } } -diff -urNp linux-2.6.32.46/drivers/atm/solos-pci.c linux-2.6.32.46/drivers/atm/solos-pci.c ---- linux-2.6.32.46/drivers/atm/solos-pci.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/solos-pci.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/solos-pci.c linux-2.6.32.48/drivers/atm/solos-pci.c +--- linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/solos-pci.c 2011-11-12 12:46:42.000000000 -0500 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -27959,9 +27959,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/solos-pci.c linux-2.6.32.46/drivers/atm/s solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.46/drivers/atm/suni.c linux-2.6.32.46/drivers/atm/suni.c ---- linux-2.6.32.46/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/suni.c linux-2.6.32.48/drivers/atm/suni.c +--- linux-2.6.32.48/drivers/atm/suni.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/suni.c 2011-11-12 12:46:42.000000000 -0500 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -27973,9 +27973,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/suni.c linux-2.6.32.46/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.46/drivers/atm/uPD98402.c linux-2.6.32.46/drivers/atm/uPD98402.c ---- linux-2.6.32.46/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/uPD98402.c linux-2.6.32.48/drivers/atm/uPD98402.c +--- linux-2.6.32.48/drivers/atm/uPD98402.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/uPD98402.c 2011-11-12 12:46:42.000000000 -0500 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -28020,9 +28020,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/uPD98402.c linux-2.6.32.46/drivers/atm/uP return 0; } -diff -urNp linux-2.6.32.46/drivers/atm/zatm.c linux-2.6.32.46/drivers/atm/zatm.c ---- linux-2.6.32.46/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/atm/zatm.c linux-2.6.32.48/drivers/atm/zatm.c +--- linux-2.6.32.48/drivers/atm/zatm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/atm/zatm.c 2011-11-12 12:46:42.000000000 -0500 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -28050,9 +28050,9 @@ diff -urNp linux-2.6.32.46/drivers/atm/zatm.c linux-2.6.32.46/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.46/drivers/base/bus.c linux-2.6.32.46/drivers/base/bus.c ---- linux-2.6.32.46/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/base/bus.c linux-2.6.32.48/drivers/base/bus.c +--- linux-2.6.32.48/drivers/base/bus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/base/bus.c 2011-11-12 12:46:42.000000000 -0500 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -28080,9 +28080,9 @@ diff -urNp linux-2.6.32.46/drivers/base/bus.c linux-2.6.32.46/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.46/drivers/base/class.c linux-2.6.32.46/drivers/base/class.c ---- linux-2.6.32.46/drivers/base/class.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/base/class.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/base/class.c linux-2.6.32.48/drivers/base/class.c +--- linux-2.6.32.48/drivers/base/class.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/base/class.c 2011-11-12 12:46:42.000000000 -0500 @@ -63,7 +63,7 @@ static void class_release(struct kobject kfree(cp); } @@ -28092,9 +28092,9 @@ diff -urNp linux-2.6.32.46/drivers/base/class.c linux-2.6.32.46/drivers/base/cla .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.46/drivers/base/core.c linux-2.6.32.46/drivers/base/core.c ---- linux-2.6.32.46/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/base/core.c linux-2.6.32.48/drivers/base/core.c +--- linux-2.6.32.48/drivers/base/core.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/base/core.c 2011-11-12 12:46:42.000000000 -0500 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -28113,9 +28113,9 @@ diff -urNp linux-2.6.32.46/drivers/base/core.c linux-2.6.32.46/drivers/base/core .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.46/drivers/base/memory.c linux-2.6.32.46/drivers/base/memory.c ---- linux-2.6.32.46/drivers/base/memory.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/base/memory.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/base/memory.c linux-2.6.32.48/drivers/base/memory.c +--- linux-2.6.32.48/drivers/base/memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/base/memory.c 2011-11-12 12:46:42.000000000 -0500 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -28125,9 +28125,9 @@ diff -urNp linux-2.6.32.46/drivers/base/memory.c linux-2.6.32.46/drivers/base/me .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.46/drivers/base/sys.c linux-2.6.32.46/drivers/base/sys.c ---- linux-2.6.32.46/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/base/sys.c linux-2.6.32.48/drivers/base/sys.c +--- linux-2.6.32.48/drivers/base/sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/base/sys.c 2011-11-12 12:46:42.000000000 -0500 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -28146,9 +28146,9 @@ diff -urNp linux-2.6.32.46/drivers/base/sys.c linux-2.6.32.46/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.46/drivers/block/cciss.c linux-2.6.32.46/drivers/block/cciss.c ---- linux-2.6.32.46/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/cciss.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/cciss.c linux-2.6.32.48/drivers/block/cciss.c +--- linux-2.6.32.48/drivers/block/cciss.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/cciss.c 2011-11-12 12:46:42.000000000 -0500 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct int err; u32 cp; @@ -28258,9 +28258,9 @@ diff -urNp linux-2.6.32.46/drivers/block/cciss.c linux-2.6.32.46/drivers/block/c /* Get the firmware version */ inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL); -diff -urNp linux-2.6.32.46/drivers/block/cciss.h linux-2.6.32.46/drivers/block/cciss.h ---- linux-2.6.32.46/drivers/block/cciss.h 2011-08-09 18:35:28.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/cciss.h 2011-08-09 18:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/cciss.h linux-2.6.32.48/drivers/block/cciss.h +--- linux-2.6.32.48/drivers/block/cciss.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/cciss.h 2011-11-12 12:46:42.000000000 -0500 @@ -90,7 +90,7 @@ struct ctlr_info // information about each logical volume drive_info_struct *drv[CISS_MAX_LUN]; @@ -28270,9 +28270,9 @@ diff -urNp linux-2.6.32.46/drivers/block/cciss.h linux-2.6.32.46/drivers/block/c /* queue and queue Info */ struct hlist_head reqQ; -diff -urNp linux-2.6.32.46/drivers/block/cpqarray.c linux-2.6.32.46/drivers/block/cpqarray.c ---- linux-2.6.32.46/drivers/block/cpqarray.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/cpqarray.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/cpqarray.c linux-2.6.32.48/drivers/block/cpqarray.c +--- linux-2.6.32.48/drivers/block/cpqarray.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/cpqarray.c 2011-11-12 12:46:42.000000000 -0500 @@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) { goto Enomem4; @@ -28398,9 +28398,9 @@ diff -urNp linux-2.6.32.46/drivers/block/cpqarray.c linux-2.6.32.46/drivers/bloc if (done == 0) { udelay(10); /* a short fixed delay */ } else -diff -urNp linux-2.6.32.46/drivers/block/cpqarray.h linux-2.6.32.46/drivers/block/cpqarray.h ---- linux-2.6.32.46/drivers/block/cpqarray.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/cpqarray.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/cpqarray.h linux-2.6.32.48/drivers/block/cpqarray.h +--- linux-2.6.32.48/drivers/block/cpqarray.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/cpqarray.h 2011-11-12 12:46:42.000000000 -0500 @@ -99,7 +99,7 @@ struct ctlr_info { drv_info_t drv[NWD]; struct proc_dir_entry *proc; @@ -28410,9 +28410,9 @@ diff -urNp linux-2.6.32.46/drivers/block/cpqarray.h linux-2.6.32.46/drivers/bloc cmdlist_t *reqQ; cmdlist_t *cmpQ; -diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/DAC960.c ---- linux-2.6.32.46/drivers/block/DAC960.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/DAC960.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/DAC960.c linux-2.6.32.48/drivers/block/DAC960.c +--- linux-2.6.32.48/drivers/block/DAC960.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/DAC960.c 2011-11-12 12:46:42.000000000 -0500 @@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur unsigned long flags; int Channel, TargetID; @@ -28422,9 +28422,9 @@ diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/ if (!init_dma_loaf(Controller->PCIDevice, &local_dma, DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + sizeof(DAC960_SCSI_Inquiry_T) + -diff -urNp linux-2.6.32.46/drivers/block/loop.c linux-2.6.32.46/drivers/block/loop.c ---- linux-2.6.32.46/drivers/block/loop.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/loop.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/loop.c linux-2.6.32.48/drivers/block/loop.c +--- linux-2.6.32.48/drivers/block/loop.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/loop.c 2011-11-12 12:46:42.000000000 -0500 @@ -282,7 +282,7 @@ static int __do_lo_send_write(struct fil mm_segment_t old_fs = get_fs(); @@ -28434,9 +28434,9 @@ diff -urNp linux-2.6.32.46/drivers/block/loop.c linux-2.6.32.46/drivers/block/lo set_fs(old_fs); if (likely(bw == len)) return 0; -diff -urNp linux-2.6.32.46/drivers/block/nbd.c linux-2.6.32.46/drivers/block/nbd.c ---- linux-2.6.32.46/drivers/block/nbd.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/nbd.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/nbd.c linux-2.6.32.48/drivers/block/nbd.c +--- linux-2.6.32.48/drivers/block/nbd.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/nbd.c 2011-11-12 12:46:42.000000000 -0500 @@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device * struct kvec iov; sigset_t blocked, oldset; @@ -28455,9 +28455,9 @@ diff -urNp linux-2.6.32.46/drivers/block/nbd.c linux-2.6.32.46/drivers/block/nbd switch (cmd) { case NBD_DISCONNECT: { struct request sreq; -diff -urNp linux-2.6.32.46/drivers/block/pktcdvd.c linux-2.6.32.46/drivers/block/pktcdvd.c ---- linux-2.6.32.46/drivers/block/pktcdvd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/block/pktcdvd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/block/pktcdvd.c linux-2.6.32.48/drivers/block/pktcdvd.c +--- linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/block/pktcdvd.c 2011-11-12 12:46:42.000000000 -0500 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -28467,9 +28467,9 @@ diff -urNp linux-2.6.32.46/drivers/block/pktcdvd.c linux-2.6.32.46/drivers/block .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.46/drivers/char/agp/frontend.c linux-2.6.32.46/drivers/char/agp/frontend.c ---- linux-2.6.32.46/drivers/char/agp/frontend.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/agp/frontend.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/agp/frontend.c linux-2.6.32.48/drivers/char/agp/frontend.c +--- linux-2.6.32.48/drivers/char/agp/frontend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/agp/frontend.c 2011-11-12 12:46:42.000000000 -0500 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -28479,9 +28479,9 @@ diff -urNp linux-2.6.32.46/drivers/char/agp/frontend.c linux-2.6.32.46/drivers/c return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.46/drivers/char/briq_panel.c linux-2.6.32.46/drivers/char/briq_panel.c ---- linux-2.6.32.46/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/briq_panel.c linux-2.6.32.48/drivers/char/briq_panel.c +--- linux-2.6.32.48/drivers/char/briq_panel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/briq_panel.c 2011-11-12 12:46:42.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/types.h> #include <linux/errno.h> @@ -28523,9 +28523,9 @@ diff -urNp linux-2.6.32.46/drivers/char/briq_panel.c linux-2.6.32.46/drivers/cha return len; } -diff -urNp linux-2.6.32.46/drivers/char/genrtc.c linux-2.6.32.46/drivers/char/genrtc.c ---- linux-2.6.32.46/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/genrtc.c linux-2.6.32.48/drivers/char/genrtc.c +--- linux-2.6.32.48/drivers/char/genrtc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/genrtc.c 2011-11-12 12:46:42.000000000 -0500 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i switch (cmd) { @@ -28534,9 +28534,9 @@ diff -urNp linux-2.6.32.46/drivers/char/genrtc.c linux-2.6.32.46/drivers/char/ge if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-2.6.32.46/drivers/char/hpet.c linux-2.6.32.46/drivers/char/hpet.c ---- linux-2.6.32.46/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hpet.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hpet.c linux-2.6.32.48/drivers/char/hpet.c +--- linux-2.6.32.48/drivers/char/hpet.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hpet.c 2011-11-12 12:46:42.000000000 -0500 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in return 0; } @@ -28569,9 +28569,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hpet.c linux-2.6.32.46/drivers/char/hpet info.hi_flags = readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; info.hi_hpet = hpetp->hp_which; -diff -urNp linux-2.6.32.46/drivers/char/hvc_beat.c linux-2.6.32.46/drivers/char/hvc_beat.c ---- linux-2.6.32.46/drivers/char/hvc_beat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_beat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_beat.c linux-2.6.32.48/drivers/char/hvc_beat.c +--- linux-2.6.32.48/drivers/char/hvc_beat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_beat.c 2011-11-12 12:46:42.000000000 -0500 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -28581,9 +28581,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_beat.c linux-2.6.32.46/drivers/char/ .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/char/hvc_console.c ---- linux-2.6.32.46/drivers/char/hvc_console.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_console.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_console.c linux-2.6.32.48/drivers/char/hvc_console.c +--- linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_console.c 2011-11-12 12:46:42.000000000 -0500 @@ -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. @@ -28593,7 +28593,7 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/ch static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] = {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1}; -@@ -247,7 +247,7 @@ static void destroy_hvc_struct(struct kr +@@ -249,7 +249,7 @@ static void destroy_hvc_struct(struct kr * vty adapters do NOT get an hvc_instantiate() callback since they * appear after early console init. */ @@ -28602,7 +28602,7 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/ch { struct hvc_struct *hp; -@@ -756,7 +756,7 @@ static const struct tty_operations hvc_o +@@ -758,7 +758,7 @@ static const struct tty_operations hvc_o }; struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, @@ -28611,9 +28611,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/ch { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.46/drivers/char/hvc_console.h linux-2.6.32.46/drivers/char/hvc_console.h ---- linux-2.6.32.46/drivers/char/hvc_console.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_console.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_console.h linux-2.6.32.48/drivers/char/hvc_console.h +--- linux-2.6.32.48/drivers/char/hvc_console.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_console.h 2011-11-12 12:46:42.000000000 -0500 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -28637,9 +28637,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_console.h linux-2.6.32.46/drivers/ch /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.32.46/drivers/char/hvc_iseries.c linux-2.6.32.46/drivers/char/hvc_iseries.c ---- linux-2.6.32.46/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_iseries.c linux-2.6.32.48/drivers/char/hvc_iseries.c +--- linux-2.6.32.48/drivers/char/hvc_iseries.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_iseries.c 2011-11-12 12:46:42.000000000 -0500 @@ -197,7 +197,7 @@ done: return sent; } @@ -28649,9 +28649,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_iseries.c linux-2.6.32.46/drivers/ch .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.46/drivers/char/hvc_iucv.c linux-2.6.32.46/drivers/char/hvc_iucv.c ---- linux-2.6.32.46/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_iucv.c linux-2.6.32.48/drivers/char/hvc_iucv.c +--- linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_iucv.c 2011-11-12 12:46:42.000000000 -0500 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -28661,9 +28661,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_iucv.c linux-2.6.32.46/drivers/char/ .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.46/drivers/char/hvc_rtas.c linux-2.6.32.46/drivers/char/hvc_rtas.c ---- linux-2.6.32.46/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_rtas.c linux-2.6.32.48/drivers/char/hvc_rtas.c +--- linux-2.6.32.48/drivers/char/hvc_rtas.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_rtas.c 2011-11-12 12:46:42.000000000 -0500 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -28673,9 +28673,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_rtas.c linux-2.6.32.46/drivers/char/ .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs.c ---- linux-2.6.32.46/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvcs.c linux-2.6.32.48/drivers/char/hvcs.c +--- linux-2.6.32.48/drivers/char/hvcs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvcs.c 2011-11-12 12:46:42.000000000 -0500 @@ -82,6 +82,7 @@ #include <asm/hvcserver.h> #include <asm/uaccess.h> @@ -28778,9 +28778,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/hvc_udbg.c ---- linux-2.6.32.46/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_udbg.c linux-2.6.32.48/drivers/char/hvc_udbg.c +--- linux-2.6.32.48/drivers/char/hvc_udbg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_udbg.c 2011-11-12 12:46:42.000000000 -0500 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -28790,9 +28790,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/ .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/hvc_vio.c ---- linux-2.6.32.46/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_vio.c linux-2.6.32.48/drivers/char/hvc_vio.c +--- linux-2.6.32.48/drivers/char/hvc_vio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_vio.c 2011-11-12 12:46:42.000000000 -0500 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -28802,9 +28802,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/h .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/hvc_xen.c ---- linux-2.6.32.46/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/hvc_xen.c linux-2.6.32.48/drivers/char/hvc_xen.c +--- linux-2.6.32.48/drivers/char/hvc_xen.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/hvc_xen.c 2011-11-12 12:46:42.000000000 -0500 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -28814,9 +28814,9 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/h .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/ipmi/ipmi_msghandler.c 2011-11-12 12:46:42.000000000 -0500 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -28856,9 +28856,9 @@ diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.46/d si = (struct ipmi_system_interface_addr *) &addr; si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel = IPMI_BMC_CHANNEL; -diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:46:42.000000000 -0500 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -28889,9 +28889,9 @@ diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.46/driv new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.46/drivers/char/istallion.c linux-2.6.32.46/drivers/char/istallion.c ---- linux-2.6.32.46/drivers/char/istallion.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/istallion.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/istallion.c linux-2.6.32.48/drivers/char/istallion.c +--- linux-2.6.32.48/drivers/char/istallion.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/istallion.c 2011-11-12 12:46:42.000000000 -0500 @@ -187,7 +187,6 @@ static struct ktermios stli_deftermios * re-used for each stats call. */ @@ -28926,9 +28926,9 @@ diff -urNp linux-2.6.32.46/drivers/char/istallion.c linux-2.6.32.46/drivers/char if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd))) return -EFAULT; if (stli_dummybrd.brdnr >= STL_MAXBRDS) -diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kconfig ---- linux-2.6.32.46/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/Kconfig linux-2.6.32.48/drivers/char/Kconfig +--- linux-2.6.32.48/drivers/char/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/Kconfig 2011-11-12 12:46:42.000000000 -0500 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING config DEVKMEM @@ -28947,9 +28947,9 @@ diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kco default y source "drivers/s390/char/Kconfig" -diff -urNp linux-2.6.32.46/drivers/char/keyboard.c linux-2.6.32.46/drivers/char/keyboard.c ---- linux-2.6.32.46/drivers/char/keyboard.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/keyboard.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/keyboard.c linux-2.6.32.48/drivers/char/keyboard.c +--- linux-2.6.32.48/drivers/char/keyboard.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/keyboard.c 2011-11-12 12:46:42.000000000 -0500 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -28976,9 +28976,9 @@ diff -urNp linux-2.6.32.46/drivers/char/keyboard.c linux-2.6.32.46/drivers/char/ }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.46/drivers/char/mem.c linux-2.6.32.46/drivers/char/mem.c ---- linux-2.6.32.46/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/mem.c linux-2.6.32.48/drivers/char/mem.c +--- linux-2.6.32.48/drivers/char/mem.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/mem.c 2011-11-12 12:46:42.000000000 -0500 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -29120,9 +29120,9 @@ diff -urNp linux-2.6.32.46/drivers/char/mem.c linux-2.6.32.46/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/pcmcia/ipwireless/tty.c 2011-11-12 12:46:42.000000000 -0500 @@ -29,6 +29,7 @@ #include <linux/tty_driver.h> #include <linux/tty_flip.h> @@ -29245,9 +29245,9 @@ diff -urNp linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.46/ do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.46/drivers/char/pty.c linux-2.6.32.46/drivers/char/pty.c ---- linux-2.6.32.46/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/pty.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/pty.c linux-2.6.32.48/drivers/char/pty.c +--- linux-2.6.32.48/drivers/char/pty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/pty.c 2011-11-12 12:46:42.000000000 -0500 @@ -736,8 +736,10 @@ static void __init unix98_pty_init(void) register_sysctl_table(pty_root_table); @@ -29260,9 +29260,9 @@ diff -urNp linux-2.6.32.46/drivers/char/pty.c linux-2.6.32.46/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || -diff -urNp linux-2.6.32.46/drivers/char/random.c linux-2.6.32.46/drivers/char/random.c ---- linux-2.6.32.46/drivers/char/random.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/random.c 2011-08-16 20:43:23.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/random.c linux-2.6.32.48/drivers/char/random.c +--- linux-2.6.32.48/drivers/char/random.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/random.c 2011-11-12 12:46:42.000000000 -0500 @@ -254,8 +254,13 @@ /* * Configuration information @@ -29304,9 +29304,9 @@ diff -urNp linux-2.6.32.46/drivers/char/random.c linux-2.6.32.46/drivers/char/ra static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.46/drivers/char/rocket.c linux-2.6.32.46/drivers/char/rocket.c ---- linux-2.6.32.46/drivers/char/rocket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/rocket.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/rocket.c linux-2.6.32.48/drivers/char/rocket.c +--- linux-2.6.32.48/drivers/char/rocket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/rocket.c 2011-11-12 12:46:42.000000000 -0500 @@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info struct rocket_ports tmp; int board; @@ -29316,9 +29316,9 @@ diff -urNp linux-2.6.32.46/drivers/char/rocket.c linux-2.6.32.46/drivers/char/ro if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); -diff -urNp linux-2.6.32.46/drivers/char/sonypi.c linux-2.6.32.46/drivers/char/sonypi.c ---- linux-2.6.32.46/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/sonypi.c linux-2.6.32.48/drivers/char/sonypi.c +--- linux-2.6.32.48/drivers/char/sonypi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/sonypi.c 2011-11-12 12:46:42.000000000 -0500 @@ -55,6 +55,7 @@ #include <asm/uaccess.h> #include <asm/io.h> @@ -29357,9 +29357,9 @@ diff -urNp linux-2.6.32.46/drivers/char/sonypi.c linux-2.6.32.46/drivers/char/so mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.46/drivers/char/stallion.c linux-2.6.32.46/drivers/char/stallion.c ---- linux-2.6.32.46/drivers/char/stallion.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/stallion.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/stallion.c linux-2.6.32.48/drivers/char/stallion.c +--- linux-2.6.32.48/drivers/char/stallion.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/stallion.c 2011-11-12 12:46:42.000000000 -0500 @@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlp struct stlport stl_dummyport; struct stlport *portp; @@ -29369,9 +29369,9 @@ diff -urNp linux-2.6.32.46/drivers/char/stallion.c linux-2.6.32.46/drivers/char/ if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, -diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.46/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/tpm/tpm_bios.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm_bios.c linux-2.6.32.48/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/tpm/tpm_bios.c 2011-11-12 12:46:42.000000000 -0500 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -29415,20 +29415,10 @@ diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/c acpi_os_unmap_memory(virt, len); return 0; -diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/tpm/tpm.c ---- linux-2.6.32.46/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/tpm/tpm.c 2011-10-17 02:49:00.000000000 -0400 -@@ -374,6 +374,9 @@ static ssize_t tpm_transmit(struct tpm_c - u32 count, ordinal; - unsigned long stop; - -+ if (bufsiz > TPM_BUFSIZE) -+ bufsiz = TPM_BUFSIZE; -+ - count = be32_to_cpu(*((__be32 *) (buf + 2))); - ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); - if (count == 0) -@@ -402,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_c +diff -urNp linux-2.6.32.48/drivers/char/tpm/tpm.c linux-2.6.32.48/drivers/char/tpm/tpm.c +--- linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/tpm/tpm.c 2011-11-12 12:51:33.000000000 -0500 +@@ -405,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_c chip->vendor.req_complete_val) goto out_recv; @@ -29437,7 +29427,7 @@ diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/t dev_err(chip->dev, "Operation Canceled\n"); rc = -ECANCELED; goto out; -@@ -821,6 +824,8 @@ ssize_t tpm_show_pubek(struct device *de +@@ -824,6 +824,8 @@ ssize_t tpm_show_pubek(struct device *de struct tpm_chip *chip = dev_get_drvdata(dev); @@ -29446,31 +29436,18 @@ diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/t tpm_cmd.header.in = tpm_readpubek_header; err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, "attempting to read the PUBEK"); -@@ -1041,6 +1046,7 @@ ssize_t tpm_read(struct file *file, char - { - struct tpm_chip *chip = file->private_data; - ssize_t ret_size; -+ int rc; - - del_singleshot_timer_sync(&chip->user_read_timer); - flush_scheduled_work(); -@@ -1051,8 +1057,11 @@ ssize_t tpm_read(struct file *file, char - ret_size = size; - - mutex_lock(&chip->buffer_mutex); -- if (copy_to_user(buf, chip->data_buffer, ret_size)) -+ rc = copy_to_user(buf, chip->data_buffer, ret_size); -+ memset(chip->data_buffer, 0, ret_size); -+ if (rc) - ret_size = -EFAULT; -+ - mutex_unlock(&chip->buffer_mutex); +diff -urNp linux-2.6.32.48/drivers/char/tty_io.c linux-2.6.32.48/drivers/char/tty_io.c +--- linux-2.6.32.48/drivers/char/tty_io.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/tty_io.c 2011-11-12 12:50:08.000000000 -0500 +@@ -1773,6 +1773,7 @@ got_driver: + + if (IS_ERR(tty)) { + mutex_unlock(&tty_mutex); ++ tty_driver_kref_put(driver); + return PTR_ERR(tty); + } } - -diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tty_io.c ---- linux-2.6.32.46/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/tty_io.c 2011-08-05 20:33:55.000000000 -0400 -@@ -2582,8 +2582,10 @@ long tty_ioctl(struct file *file, unsign +@@ -2582,8 +2583,10 @@ long tty_ioctl(struct file *file, unsign return retval; } @@ -29482,7 +29459,7 @@ diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tt unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; -@@ -2607,6 +2609,8 @@ static long tty_compat_ioctl(struct file +@@ -2607,6 +2610,8 @@ static long tty_compat_ioctl(struct file return retval; } @@ -29491,7 +29468,7 @@ diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tt #endif /* -@@ -3052,7 +3056,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); +@@ -3052,7 +3057,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); void tty_default_fops(struct file_operations *fops) { @@ -29500,9 +29477,9 @@ diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tt } /* -diff -urNp linux-2.6.32.46/drivers/char/tty_ldisc.c linux-2.6.32.46/drivers/char/tty_ldisc.c ---- linux-2.6.32.46/drivers/char/tty_ldisc.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/tty_ldisc.c 2011-07-13 17:23:18.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/tty_ldisc.c linux-2.6.32.48/drivers/char/tty_ldisc.c +--- linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/tty_ldisc.c 2011-11-12 12:46:45.000000000 -0500 @@ -74,7 +74,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; @@ -29548,9 +29525,9 @@ diff -urNp linux-2.6.32.46/drivers/char/tty_ldisc.c linux-2.6.32.46/drivers/char module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.46/drivers/char/virtio_console.c linux-2.6.32.46/drivers/char/virtio_console.c ---- linux-2.6.32.46/drivers/char/virtio_console.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/virtio_console.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/virtio_console.c linux-2.6.32.48/drivers/char/virtio_console.c +--- linux-2.6.32.48/drivers/char/virtio_console.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/virtio_console.c 2011-11-12 12:46:45.000000000 -0500 @@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char * * virtqueue, so we let the drivers do some boutique early-output thing. */ int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int)) @@ -29581,9 +29558,9 @@ diff -urNp linux-2.6.32.46/drivers/char/virtio_console.c linux-2.6.32.46/drivers /* The first argument of hvc_alloc() is the virtual console number, so * we use zero. The second argument is the parameter for the -diff -urNp linux-2.6.32.46/drivers/char/vt.c linux-2.6.32.46/drivers/char/vt.c ---- linux-2.6.32.46/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/vt.c linux-2.6.32.48/drivers/char/vt.c +--- linux-2.6.32.48/drivers/char/vt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/vt.c 2011-11-12 12:46:45.000000000 -0500 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -29593,9 +29570,9 @@ diff -urNp linux-2.6.32.46/drivers/char/vt.c linux-2.6.32.46/drivers/char/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } -diff -urNp linux-2.6.32.46/drivers/char/vt_ioctl.c linux-2.6.32.46/drivers/char/vt_ioctl.c ---- linux-2.6.32.46/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/char/vt_ioctl.c linux-2.6.32.48/drivers/char/vt_ioctl.c +--- linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/char/vt_ioctl.c 2011-11-12 12:46:45.000000000 -0500 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -29639,9 +29616,9 @@ diff -urNp linux-2.6.32.46/drivers/char/vt_ioctl.c linux-2.6.32.46/drivers/char/ if (!perm) { ret = -EPERM; goto reterr; -diff -urNp linux-2.6.32.46/drivers/cpufreq/cpufreq.c linux-2.6.32.46/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.46/drivers/cpufreq/cpufreq.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/cpufreq/cpufreq.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/cpufreq/cpufreq.c linux-2.6.32.48/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/cpufreq/cpufreq.c 2011-11-12 12:46:45.000000000 -0500 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -29651,9 +29628,9 @@ diff -urNp linux-2.6.32.46/drivers/cpufreq/cpufreq.c linux-2.6.32.46/drivers/cpu .show = show, .store = store, }; -diff -urNp linux-2.6.32.46/drivers/cpuidle/sysfs.c linux-2.6.32.46/drivers/cpuidle/sysfs.c ---- linux-2.6.32.46/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/cpuidle/sysfs.c linux-2.6.32.48/drivers/cpuidle/sysfs.c +--- linux-2.6.32.48/drivers/cpuidle/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/cpuidle/sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -29681,9 +29658,9 @@ diff -urNp linux-2.6.32.46/drivers/cpuidle/sysfs.c linux-2.6.32.46/drivers/cpuid { kobject_put(&device->kobjs[i]->kobj); wait_for_completion(&device->kobjs[i]->kobj_unregister); -diff -urNp linux-2.6.32.46/drivers/crypto/hifn_795x.c linux-2.6.32.46/drivers/crypto/hifn_795x.c ---- linux-2.6.32.46/drivers/crypto/hifn_795x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/crypto/hifn_795x.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/crypto/hifn_795x.c linux-2.6.32.48/drivers/crypto/hifn_795x.c +--- linux-2.6.32.48/drivers/crypto/hifn_795x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/crypto/hifn_795x.c 2011-11-12 12:46:45.000000000 -0500 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; @@ -29693,9 +29670,9 @@ diff -urNp linux-2.6.32.46/drivers/crypto/hifn_795x.c linux-2.6.32.46/drivers/cr memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); -diff -urNp linux-2.6.32.46/drivers/crypto/padlock-aes.c linux-2.6.32.46/drivers/crypto/padlock-aes.c ---- linux-2.6.32.46/drivers/crypto/padlock-aes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/crypto/padlock-aes.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/crypto/padlock-aes.c linux-2.6.32.48/drivers/crypto/padlock-aes.c +--- linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/crypto/padlock-aes.c 2011-11-12 12:46:45.000000000 -0500 @@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm struct crypto_aes_ctx gen_aes; int cpu; @@ -29705,9 +29682,9 @@ diff -urNp linux-2.6.32.46/drivers/crypto/padlock-aes.c linux-2.6.32.46/drivers/ if (key_len % 8) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; -diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.c linux-2.6.32.46/drivers/dma/ioat/dma.c ---- linux-2.6.32.46/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.c linux-2.6.32.48/drivers/dma/ioat/dma.c +--- linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/dma/ioat/dma.c 2011-11-12 12:46:45.000000000 -0500 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -29717,9 +29694,9 @@ diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.c linux-2.6.32.46/drivers/dma/io .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.h linux-2.6.32.46/drivers/dma/ioat/dma.h ---- linux-2.6.32.46/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/dma/ioat/dma.h linux-2.6.32.48/drivers/dma/ioat/dma.h +--- linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/dma/ioat/dma.h 2011-11-12 12:46:45.000000000 -0500 @@ -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); @@ -29729,9 +29706,9 @@ diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.h linux-2.6.32.46/drivers/dma/io extern struct ioat_sysfs_entry ioat_version_attr; extern struct ioat_sysfs_entry ioat_cap_attr; #endif /* IOATDMA_H */ -diff -urNp linux-2.6.32.46/drivers/edac/edac_device_sysfs.c linux-2.6.32.46/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.46/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/edac/edac_device_sysfs.c linux-2.6.32.48/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/edac/edac_device_sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -29759,9 +29736,9 @@ diff -urNp linux-2.6.32.46/drivers/edac/edac_device_sysfs.c linux-2.6.32.46/driv .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/edac/edac_mc_sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -29780,9 +29757,9 @@ diff -urNp linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c linux-2.6.32.46/drivers/ .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/edac/edac_pci_sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1; /* log static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ @@ -29884,9 +29861,9 @@ diff -urNp linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c linux-2.6.32.46/drivers panic("EDAC: PCI Parity Error"); } } -diff -urNp linux-2.6.32.46/drivers/firewire/core-card.c linux-2.6.32.46/drivers/firewire/core-card.c ---- linux-2.6.32.46/drivers/firewire/core-card.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firewire/core-card.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firewire/core-card.c linux-2.6.32.48/drivers/firewire/core-card.c +--- linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/firewire/core-card.c 2011-11-12 12:46:45.000000000 -0500 @@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref) void fw_core_remove_card(struct fw_card *card) @@ -29896,9 +29873,9 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core-card.c linux-2.6.32.46/drivers/ card->driver->update_phy_reg(card, 4, PHY_LINK_ACTIVE | PHY_CONTENDER, 0); -diff -urNp linux-2.6.32.46/drivers/firewire/core-cdev.c linux-2.6.32.46/drivers/firewire/core-cdev.c ---- linux-2.6.32.46/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firewire/core-cdev.c linux-2.6.32.48/drivers/firewire/core-cdev.c +--- linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/firewire/core-cdev.c 2011-11-12 12:46:45.000000000 -0500 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie int ret; @@ -29909,9 +29886,9 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core-cdev.c linux-2.6.32.46/drivers/ return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firewire/core.h ---- linux-2.6.32.46/drivers/firewire/core.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firewire/core.h 2011-08-23 20:24:26.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firewire/core.h linux-2.6.32.48/drivers/firewire/core.h +--- linux-2.6.32.48/drivers/firewire/core.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firewire/core.h 2011-11-12 12:46:45.000000000 -0500 @@ -86,6 +86,7 @@ struct fw_card_driver { int (*stop_iso)(struct fw_iso_context *ctx); @@ -29920,9 +29897,9 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firew void fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver, struct device *device); -diff -urNp linux-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/drivers/firewire/core-transaction.c ---- linux-2.6.32.46/drivers/firewire/core-transaction.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firewire/core-transaction.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firewire/core-transaction.c linux-2.6.32.48/drivers/firewire/core-transaction.c +--- linux-2.6.32.48/drivers/firewire/core-transaction.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firewire/core-transaction.c 2011-11-12 12:46:45.000000000 -0500 @@ -36,6 +36,7 @@ #include <linux/string.h> #include <linux/timer.h> @@ -29940,9 +29917,9 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/d init_completion(&d.done); d.payload = payload; fw_send_request(card, &t, tcode, destination_id, generation, speed, -diff -urNp linux-2.6.32.46/drivers/firmware/dmi_scan.c linux-2.6.32.46/drivers/firmware/dmi_scan.c ---- linux-2.6.32.46/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firmware/dmi_scan.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firmware/dmi_scan.c linux-2.6.32.48/drivers/firmware/dmi_scan.c +--- linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/firmware/dmi_scan.c 2011-11-12 12:46:45.000000000 -0500 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -29964,9 +29941,9 @@ diff -urNp linux-2.6.32.46/drivers/firmware/dmi_scan.c linux-2.6.32.46/drivers/f iounmap(buf); return 0; -diff -urNp linux-2.6.32.46/drivers/firmware/edd.c linux-2.6.32.46/drivers/firmware/edd.c ---- linux-2.6.32.46/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firmware/edd.c linux-2.6.32.48/drivers/firmware/edd.c +--- linux-2.6.32.48/drivers/firmware/edd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firmware/edd.c 2011-11-12 12:46:45.000000000 -0500 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -29976,9 +29953,9 @@ diff -urNp linux-2.6.32.46/drivers/firmware/edd.c linux-2.6.32.46/drivers/firmwa .show = edd_attr_show, }; -diff -urNp linux-2.6.32.46/drivers/firmware/efivars.c linux-2.6.32.46/drivers/firmware/efivars.c ---- linux-2.6.32.46/drivers/firmware/efivars.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firmware/efivars.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firmware/efivars.c linux-2.6.32.48/drivers/firmware/efivars.c +--- linux-2.6.32.48/drivers/firmware/efivars.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firmware/efivars.c 2011-11-12 12:46:45.000000000 -0500 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -29988,9 +29965,9 @@ diff -urNp linux-2.6.32.46/drivers/firmware/efivars.c linux-2.6.32.46/drivers/fi .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.46/drivers/firmware/iscsi_ibft.c linux-2.6.32.46/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.46/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firmware/iscsi_ibft.c linux-2.6.32.48/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firmware/iscsi_ibft.c 2011-11-12 12:46:45.000000000 -0500 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -30000,9 +29977,9 @@ diff -urNp linux-2.6.32.46/drivers/firmware/iscsi_ibft.c linux-2.6.32.46/drivers .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.46/drivers/firmware/memmap.c linux-2.6.32.46/drivers/firmware/memmap.c ---- linux-2.6.32.46/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/firmware/memmap.c linux-2.6.32.48/drivers/firmware/memmap.c +--- linux-2.6.32.48/drivers/firmware/memmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/firmware/memmap.c 2011-11-12 12:46:45.000000000 -0500 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -30012,9 +29989,9 @@ diff -urNp linux-2.6.32.46/drivers/firmware/memmap.c linux-2.6.32.46/drivers/fir .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.46/drivers/gpio/vr41xx_giu.c linux-2.6.32.46/drivers/gpio/vr41xx_giu.c ---- linux-2.6.32.46/drivers/gpio/vr41xx_giu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpio/vr41xx_giu.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpio/vr41xx_giu.c linux-2.6.32.48/drivers/gpio/vr41xx_giu.c +--- linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpio/vr41xx_giu.c 2011-11-12 12:46:45.000000000 -0500 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); @@ -30024,9 +30001,9 @@ diff -urNp linux-2.6.32.46/drivers/gpio/vr41xx_giu.c linux-2.6.32.46/drivers/gpi return -EINVAL; } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:46:45.000000000 -0500 @@ -1323,7 +1323,7 @@ int drm_mode_getconnector(struct drm_dev */ if ((out_resp->count_modes >= mode_count) && mode_count) { @@ -30101,9 +30078,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc.c linux-2.6.32.46/drivers/gp if (copy_to_user(blob_ptr, blob->data, blob->length)){ ret = -EFAULT; goto done; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:46:45.000000000 -0500 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask = 1; @@ -30122,9 +30099,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.46/dri crtc->enabled = drm_helper_crtc_in_use(crtc); if (!crtc->enabled) -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_drv.c linux-2.6.32.46/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_drv.c linux-2.6.32.48/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_drv.c 2011-11-12 12:46:45.000000000 -0500 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -30134,9 +30111,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_drv.c linux-2.6.32.46/drivers/gpu ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_fops.c linux-2.6.32.46/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_fops.c linux-2.6.32.48/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_fops.c 2011-11-12 12:46:45.000000000 -0500 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -30188,9 +30165,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_fops.c linux-2.6.32.46/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.46/drivers/gpu/drm/drm_gem.c linux-2.6.32.46/drivers/gpu/drm/drm_gem.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_gem.c linux-2.6.32.48/drivers/gpu/drm/drm_gem.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_gem.c 2011-11-12 12:46:45.000000000 -0500 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev) spin_lock_init(&dev->object_name_lock); idr_init(&dev->object_name_idr); @@ -30224,9 +30201,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_gem.c linux-2.6.32.46/drivers/gpu kfree(obj); } EXPORT_SYMBOL(drm_gem_object_free); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_info.c linux-2.6.32.46/drivers/gpu/drm/drm_info.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_info.c linux-2.6.32.48/drivers/gpu/drm/drm_info.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_info.c 2011-11-12 12:46:45.000000000 -0500 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -30306,9 +30283,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_info.c linux-2.6.32.46/drivers/gp #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_ioc32.c 2011-11-12 12:46:45.000000000 -0500 @@ -463,7 +463,7 @@ static int compat_drm_infobufs(struct fi request = compat_alloc_user_space(nbytes); if (!access_ok(VERIFY_WRITE, request, nbytes)) @@ -30327,9 +30304,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioc32.c linux-2.6.32.46/drivers/g if (__put_user(count, &request->count) || __put_user(list, &request->list)) -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_ioctl.c 2011-11-12 12:46:45.000000000 -0500 @@ -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); @@ -30339,9 +30316,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.46/drivers/g stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_lock.c linux-2.6.32.46/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.46/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/drm_lock.c linux-2.6.32.48/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/drm_lock.c 2011-11-12 12:46:45.000000000 -0500 @@ -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; @@ -30360,9 +30337,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_lock.c linux-2.6.32.46/drivers/gp /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_dma.c 2011-11-12 12:46:45.000000000 -0500 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -30385,9 +30362,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.46/drive sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i810/i810_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; @@ -30399,9 +30376,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.46/drive int front_offset; } drm_i810_private_t; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -115,8 +115,8 @@ typedef struct drm_i830_private { int page_flipping; @@ -30413,9 +30390,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.46/drive int use_mi_batchbuffer_start; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i830/i830_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_ I830_WRITE16(I830REG_INT_IDENTITY_R, temp); @@ -30471,9 +30448,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.46/drive init_waitqueue_head(&dev_priv->irq_queue); } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7017.c 2011-11-12 12:46:45.000000000 -0500 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -30483,9 +30460,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/dri .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-11-12 12:46:45.000000000 -0500 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -30495,9 +30472,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/dri .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo.h 2011-11-12 12:46:45.000000000 -0500 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -30530,9 +30507,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gp +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_ivch.c 2011-11-12 12:46:45.000000000 -0500 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -30542,9 +30519,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.46/drive .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_sil164.c 2011-11-12 12:46:45.000000000 -0500 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -30554,9 +30531,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.46/dri .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/dvo_tfp410.c 2011-11-12 12:46:45.000000000 -0500 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -30566,9 +30543,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.46/dri .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se I915_READ(GTIMR)); } @@ -30578,9 +30555,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.46/d if (dev_priv->hw_status_page != NULL) { seq_printf(m, "Current sequence: %d\n", i915_get_gem_seqno(dev)); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.c 2011-11-12 12:46:45.000000000 -0500 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -30590,9 +30567,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.46/drive .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -168,7 +168,7 @@ struct drm_i915_display_funcs { /* display clock increase/decrease */ /* pll clock increase/decrease */ @@ -30611,9 +30588,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.46/drive /** Protects user_irq_refcount and irq_mask_reg */ spinlock_t user_irq_lock; /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */ -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_gem.c 2011-11-12 12:46:45.000000000 -0500 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d args->aper_size = dev->gtt_total; @@ -30696,9 +30673,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.46/drive } i915_verify_inactive(dev, __FILE__, __LINE__); } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_ int irq_received; int ret = IRQ_NONE; @@ -30717,9 +30694,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.46/drive INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c ---- linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c +--- linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/i915/intel_sdvo.c 2011-11-12 12:46:45.000000000 -0500 @@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device * sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device); @@ -30731,9 +30708,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.46/dri /* Read the regs to test if we can talk to the device */ for (i = 0; i < 0x40; i++) { -diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; @@ -30746,9 +30723,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.46/drivers u32 next_fence_to_post; unsigned int fb_cpp; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/mga/mga_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -30785,9 +30762,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.46/drivers - *sequence) <= (1 << 23))); *sequence = cur_fence; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c ---- linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c +--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_cce.c 2011-11-12 12:46:45.000000000 -0500 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d /* GH: Simple idle check. @@ -30797,9 +30774,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.46/drive /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring -diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; @@ -30817,9 +30794,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.46/drive u32 color_fmt; unsigned int front_offset; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d if (crtc != 0) return 0; @@ -30838,9 +30815,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.46/drive drm_handle_vblank(dev, 0); return IRQ_HANDLED; } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c ---- linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c +--- linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/r128/r128_state.c 2011-11-12 12:46:45.000000000 -0500 @@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv) @@ -30854,9 +30831,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.46/dri } } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:46:45.000000000 -0500 @@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct c char name[512]; int i; @@ -30866,9 +30843,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c linux-2.6.32.46/drivers ctx->card = card; ctx->bios = bios; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/mkregtable.c 2011-11-12 12:46:45.000000000 -0500 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -30886,9 +30863,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.46/d if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:46:45.000000000 -0500 @@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from bool linkb; struct radeon_i2c_bus_rec ddc_bus; @@ -30922,9 +30899,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:46:45.000000000 -0500 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { @@ -30934,9 +30911,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32. } else error = abs(current_freq - freq); vco_diff = abs(vco - best_vco); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -253,7 +253,7 @@ typedef struct drm_radeon_private { /* SW interrupt */ @@ -30946,9 +30923,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.46/d int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-12 12:46:45.000000000 -0500 @@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; @@ -30967,9 +30944,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.46 INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:46:45.000000000 -0500 @@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device */ struct radeon_fence_driver { @@ -30988,9 +30965,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drive /* * Asic structures -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-23 13:57:24.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-12 12:46:45.000000000 -0500 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str request = compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) @@ -31000,9 +30977,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.46 &request->value)) return -EFAULT; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de unsigned int ret; RING_LOCALS; @@ -31023,9 +31000,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.46/d DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); dev->max_vblank_count = 0x001fffff; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:46:45.000000000 -0500 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -31035,9 +31012,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.46 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-12 12:46:45.000000000 -0500 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -31089,9 +31066,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.46/d } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c ---- linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c +--- linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:46:45.000000000 -0500 @@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -31105,9 +31082,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.46/driver } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo.c 2011-11-12 12:46:45.000000000 -0500 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a NULL }; @@ -31117,9 +31094,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.46/drivers/ .show = &ttm_bo_global_show }; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-11-12 12:46:45.000000000 -0500 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -31140,9 +31117,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.46/drive /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_global.c 2011-11-12 12:46:45.000000000 -0500 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -31200,9 +31177,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.46/driv ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/ttm/ttm_memory.c 2011-11-12 12:46:45.000000000 -0500 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -31212,9 +31189,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.46/driv .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h ---- linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h +--- linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/via/via_drv.h 2011-11-12 12:46:45.000000000 -0500 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; @@ -31233,9 +31210,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h linux-2.6.32.46/drivers drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; -diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c ---- linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c +--- linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/gpu/drm/via/via_irq.c 2011-11-12 12:46:45.000000000 -0500 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -31306,9 +31283,9 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c linux-2.6.32.46/drivers irqwait->request.type &= ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; -diff -urNp linux-2.6.32.46/drivers/hid/hid-core.c linux-2.6.32.46/drivers/hid/hid-core.c ---- linux-2.6.32.46/drivers/hid/hid-core.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/hid/hid-core.c 2011-05-10 22:12:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hid/hid-core.c linux-2.6.32.48/drivers/hid/hid-core.c +--- linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/hid/hid-core.c 2011-11-12 12:46:45.000000000 -0500 @@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device int hid_add_device(struct hid_device *hdev) @@ -31327,9 +31304,9 @@ diff -urNp linux-2.6.32.46/drivers/hid/hid-core.c linux-2.6.32.46/drivers/hid/hi ret = device_add(&hdev->dev); if (!ret) -diff -urNp linux-2.6.32.46/drivers/hid/usbhid/hiddev.c linux-2.6.32.46/drivers/hid/usbhid/hiddev.c ---- linux-2.6.32.46/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hid/usbhid/hiddev.c linux-2.6.32.48/drivers/hid/usbhid/hiddev.c +--- linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/hid/usbhid/hiddev.c 2011-11-12 12:46:45.000000000 -0500 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi return put_user(HID_VERSION, (int __user *)arg); @@ -31339,9 +31316,9 @@ diff -urNp linux-2.6.32.46/drivers/hid/usbhid/hiddev.c linux-2.6.32.46/drivers/h return -EINVAL; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.c linux-2.6.32.46/drivers/hwmon/lis3lv02d.c ---- linux-2.6.32.46/drivers/hwmon/lis3lv02d.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.c linux-2.6.32.48/drivers/hwmon/lis3lv02d.c +--- linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.c 2011-11-12 12:46:45.000000000 -0500 @@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in * the lid is closed. This leads to interrupts as soon as a little move * is done. @@ -31378,9 +31355,9 @@ diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.c linux-2.6.32.46/drivers/hwm return POLLIN | POLLRDNORM; return 0; } -diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.h linux-2.6.32.46/drivers/hwmon/lis3lv02d.h ---- linux-2.6.32.46/drivers/hwmon/lis3lv02d.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hwmon/lis3lv02d.h linux-2.6.32.48/drivers/hwmon/lis3lv02d.h +--- linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/drivers/hwmon/lis3lv02d.h 2011-11-12 12:46:45.000000000 -0500 @@ -201,7 +201,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ @@ -31390,9 +31367,9 @@ diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.h linux-2.6.32.46/drivers/hwm int xcalib; /* calibrated null value for x */ int ycalib; /* calibrated null value for y */ int zcalib; /* calibrated null value for z */ -diff -urNp linux-2.6.32.46/drivers/hwmon/sht15.c linux-2.6.32.46/drivers/hwmon/sht15.c ---- linux-2.6.32.46/drivers/hwmon/sht15.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/hwmon/sht15.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hwmon/sht15.c linux-2.6.32.48/drivers/hwmon/sht15.c +--- linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/hwmon/sht15.c 2011-11-12 12:46:45.000000000 -0500 @@ -112,7 +112,7 @@ struct sht15_data { int supply_uV; int supply_uV_valid; @@ -31441,9 +31418,9 @@ diff -urNp linux-2.6.32.46/drivers/hwmon/sht15.c linux-2.6.32.46/drivers/hwmon/s return; } /* Read the data back from the device */ -diff -urNp linux-2.6.32.46/drivers/hwmon/w83791d.c linux-2.6.32.46/drivers/hwmon/w83791d.c ---- linux-2.6.32.46/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/hwmon/w83791d.c linux-2.6.32.48/drivers/hwmon/w83791d.c +--- linux-2.6.32.48/drivers/hwmon/w83791d.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/hwmon/w83791d.c 2011-11-12 12:46:45.000000000 -0500 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -31455,9 +31432,9 @@ diff -urNp linux-2.6.32.46/drivers/hwmon/w83791d.c linux-2.6.32.46/drivers/hwmon static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c ---- linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c +--- linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-12 12:46:45.000000000 -0500 @@ -43,7 +43,7 @@ extern struct i2c_adapter amd756_smbus; @@ -31467,9 +31444,9 @@ diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.46 /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(amd756_lock); -diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c ---- linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c +--- linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-12 12:46:45.000000000 -0500 @@ -41,7 +41,7 @@ extern struct i2c_adapter *nforce2_smbus; @@ -31479,9 +31456,9 @@ diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.4 /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(nforce2_lock); -diff -urNp linux-2.6.32.46/drivers/ide/ide-cd.c linux-2.6.32.46/drivers/ide/ide-cd.c ---- linux-2.6.32.46/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ide/ide-cd.c linux-2.6.32.48/drivers/ide/ide-cd.c +--- linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/ide/ide-cd.c 2011-11-12 12:46:45.000000000 -0500 @@ -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 @@ -31491,9 +31468,9 @@ diff -urNp linux-2.6.32.46/drivers/ide/ide-cd.c linux-2.6.32.46/drivers/ide/ide- drive->dma = 0; } } -diff -urNp linux-2.6.32.46/drivers/ide/ide-floppy.c linux-2.6.32.46/drivers/ide/ide-floppy.c ---- linux-2.6.32.46/drivers/ide/ide-floppy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ide/ide-floppy.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ide/ide-floppy.c linux-2.6.32.48/drivers/ide/ide-floppy.c +--- linux-2.6.32.48/drivers/ide/ide-floppy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ide/ide-floppy.c 2011-11-12 12:46:45.000000000 -0500 @@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_d u8 pc_buf[256], header_len, desc_cnt; int i, rc = 1, blocks, length; @@ -31503,9 +31480,9 @@ diff -urNp linux-2.6.32.46/drivers/ide/ide-floppy.c linux-2.6.32.46/drivers/ide/ ide_debug_log(IDE_DBG_FUNC, "enter"); drive->bios_cyl = 0; -diff -urNp linux-2.6.32.46/drivers/ide/setup-pci.c linux-2.6.32.46/drivers/ide/setup-pci.c ---- linux-2.6.32.46/drivers/ide/setup-pci.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ide/setup-pci.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ide/setup-pci.c linux-2.6.32.48/drivers/ide/setup-pci.c +--- linux-2.6.32.48/drivers/ide/setup-pci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ide/setup-pci.c 2011-11-12 12:46:45.000000000 -0500 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev int ret, i, n_ports = dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL }; @@ -31515,9 +31492,9 @@ diff -urNp linux-2.6.32.46/drivers/ide/setup-pci.c linux-2.6.32.46/drivers/ide/s for (i = 0; i < n_ports / 2; i++) { ret = ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) -diff -urNp linux-2.6.32.46/drivers/ieee1394/dv1394.c linux-2.6.32.46/drivers/ieee1394/dv1394.c ---- linux-2.6.32.46/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ieee1394/dv1394.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ieee1394/dv1394.c linux-2.6.32.48/drivers/ieee1394/dv1394.c +--- linux-2.6.32.48/drivers/ieee1394/dv1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ieee1394/dv1394.c 2011-11-12 12:46:45.000000000 -0500 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -31527,9 +31504,9 @@ diff -urNp linux-2.6.32.46/drivers/ieee1394/dv1394.c linux-2.6.32.46/drivers/iee frame_put_packet (struct frame *f, struct packet *p) { int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */ -diff -urNp linux-2.6.32.46/drivers/ieee1394/hosts.c linux-2.6.32.46/drivers/ieee1394/hosts.c ---- linux-2.6.32.46/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ieee1394/hosts.c linux-2.6.32.48/drivers/ieee1394/hosts.c +--- linux-2.6.32.48/drivers/ieee1394/hosts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ieee1394/hosts.c 2011-11-12 12:46:45.000000000 -0500 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -31538,9 +31515,9 @@ diff -urNp linux-2.6.32.46/drivers/ieee1394/hosts.c linux-2.6.32.46/drivers/ieee .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c ---- linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c +--- linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ieee1394/init_ohci1394_dma.c 2011-11-12 12:46:45.000000000 -0500 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con for (func = 0; func < 8; func++) { u32 class = read_pci_config(num,slot,func, @@ -31550,9 +31527,9 @@ diff -urNp linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.46/ continue; /* No device at this func */ if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI) -diff -urNp linux-2.6.32.46/drivers/ieee1394/ohci1394.c linux-2.6.32.46/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.46/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ieee1394/ohci1394.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ieee1394/ohci1394.c linux-2.6.32.48/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ieee1394/ohci1394.c 2011-11-12 12:46:45.000000000 -0500 @@ -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) @@ -31565,9 +31542,9 @@ diff -urNp linux-2.6.32.46/drivers/ieee1394/ohci1394.c linux-2.6.32.46/drivers/i static void dma_trm_tasklet(unsigned long data); static void dma_trm_reset(struct dma_trm_ctx *d); -diff -urNp linux-2.6.32.46/drivers/ieee1394/sbp2.c linux-2.6.32.46/drivers/ieee1394/sbp2.c ---- linux-2.6.32.46/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/ieee1394/sbp2.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/ieee1394/sbp2.c linux-2.6.32.48/drivers/ieee1394/sbp2.c +--- linux-2.6.32.48/drivers/ieee1394/sbp2.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/ieee1394/sbp2.c 2011-11-12 12:46:45.000000000 -0500 @@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); MODULE_LICENSE("GPL"); @@ -31577,9 +31554,9 @@ diff -urNp linux-2.6.32.46/drivers/ieee1394/sbp2.c linux-2.6.32.46/drivers/ieee1 { int ret; -diff -urNp linux-2.6.32.46/drivers/infiniband/core/cm.c linux-2.6.32.46/drivers/infiniband/core/cm.c ---- linux-2.6.32.46/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/core/cm.c linux-2.6.32.48/drivers/infiniband/core/cm.c +--- linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/core/cm.c 2011-11-12 12:46:45.000000000 -0500 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -31723,9 +31700,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/core/cm.c linux-2.6.32.46/drivers/ .show = cm_show_counter }; -diff -urNp linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c ---- linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c +--- linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/core/fmr_pool.c 2011-11-12 12:46:45.000000000 -0500 @@ -97,8 +97,8 @@ struct ib_fmr_pool { struct task_struct *thread; @@ -31793,9 +31770,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c linux-2.6.32.46/dr wake_up_process(pool->thread); } } -diff -urNp linux-2.6.32.46/drivers/infiniband/core/sysfs.c linux-2.6.32.46/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.46/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/core/sysfs.c linux-2.6.32.48/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/core/sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -31805,9 +31782,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/core/sysfs.c linux-2.6.32.46/drive .show = port_attr_show }; -diff -urNp linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c ---- linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c +--- linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/core/uverbs_marshall.c 2011-11-12 12:46:45.000000000 -0500 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u dst->grh.sgid_index = src->grh.sgid_index; dst->grh.hop_limit = src->grh.hop_limit; @@ -31838,9 +31815,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3 } EXPORT_SYMBOL(ib_copy_qp_attr_to_user); -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c ---- linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c +--- linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:46:45.000000000 -0500 @@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(stru struct infinipath_counters counters; struct ipath_devdata *dd; @@ -31850,9 +31827,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.4 dd = file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c ---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c +--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.c 2011-11-12 12:46:45.000000000 -0500 @@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); @@ -31871,9 +31848,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c linux-2.6.32.46/drive /* Free the control structures */ -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c ---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c +--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_cm.c 2011-11-12 12:46:45.000000000 -0500 @@ -69,11 +69,11 @@ u32 cm_packets_received; u32 cm_listens_created; u32 cm_listens_destroyed; @@ -32047,9 +32024,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/dr nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h ---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h +--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes.h 2011-11-12 12:46:45.000000000 -0500 @@ -174,17 +174,17 @@ extern unsigned int nes_debug_level; extern unsigned int wqm_quanta; extern struct list_head nes_adapter_list; @@ -32096,9 +32073,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drive extern u32 int_mod_timer_init; extern u32 int_mod_cq_depth_256; -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c ---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c +--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_nic.c 2011-11-12 12:46:45.000000000 -0500 @@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats target_stat_values[++index] = mh_detected; target_stat_values[++index] = mh_pauses_sent; @@ -32145,9 +32122,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.46/d target_stat_values[++index] = int_mod_timer_init; target_stat_values[++index] = int_mod_cq_depth_1; target_stat_values[++index] = int_mod_cq_depth_4; -diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c ---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c +--- linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-12 12:46:45.000000000 -0500 @@ -45,9 +45,9 @@ #include <rdma/ib_umem.h> @@ -32179,9 +32156,9 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.46 nesqp->destroyed = 1; /* Blow away the connection if it exists. */ -diff -urNp linux-2.6.32.46/drivers/input/gameport/gameport.c linux-2.6.32.46/drivers/input/gameport/gameport.c ---- linux-2.6.32.46/drivers/input/gameport/gameport.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/input/gameport/gameport.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/input/gameport/gameport.c linux-2.6.32.48/drivers/input/gameport/gameport.c +--- linux-2.6.32.48/drivers/input/gameport/gameport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/input/gameport/gameport.c 2011-11-12 12:46:45.000000000 -0500 @@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) @@ -32198,9 +32175,9 @@ diff -urNp linux-2.6.32.46/drivers/input/gameport/gameport.c linux-2.6.32.46/dri gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) -diff -urNp linux-2.6.32.46/drivers/input/input.c linux-2.6.32.46/drivers/input/input.c ---- linux-2.6.32.46/drivers/input/input.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/input/input.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/input/input.c linux-2.6.32.48/drivers/input/input.c +--- linux-2.6.32.48/drivers/input/input.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/input/input.c 2011-11-12 12:46:45.000000000 -0500 @@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability); */ int input_register_device(struct input_dev *dev) @@ -32219,9 +32196,9 @@ diff -urNp linux-2.6.32.46/drivers/input/input.c linux-2.6.32.46/drivers/input/i error = device_add(&dev->dev); if (error) -diff -urNp linux-2.6.32.46/drivers/input/joystick/sidewinder.c linux-2.6.32.46/drivers/input/joystick/sidewinder.c ---- linux-2.6.32.46/drivers/input/joystick/sidewinder.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/input/joystick/sidewinder.c 2011-05-18 20:09:36.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/input/joystick/sidewinder.c linux-2.6.32.48/drivers/input/joystick/sidewinder.c +--- linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/input/joystick/sidewinder.c 2011-11-12 12:46:45.000000000 -0500 @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/module.h> @@ -32239,9 +32216,9 @@ diff -urNp linux-2.6.32.46/drivers/input/joystick/sidewinder.c linux-2.6.32.46/d i = sw_read_packet(sw->gameport, buf, sw->length, 0); if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */ -diff -urNp linux-2.6.32.46/drivers/input/joystick/xpad.c linux-2.6.32.46/drivers/input/joystick/xpad.c ---- linux-2.6.32.46/drivers/input/joystick/xpad.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/input/joystick/xpad.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/input/joystick/xpad.c linux-2.6.32.48/drivers/input/joystick/xpad.c +--- linux-2.6.32.48/drivers/input/joystick/xpad.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/input/joystick/xpad.c 2011-11-12 12:46:45.000000000 -0500 @@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas static int xpad_led_probe(struct usb_xpad *xpad) @@ -32260,9 +32237,9 @@ diff -urNp linux-2.6.32.46/drivers/input/joystick/xpad.c linux-2.6.32.46/drivers snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad = xpad; -diff -urNp linux-2.6.32.46/drivers/input/serio/serio.c linux-2.6.32.46/drivers/input/serio/serio.c ---- linux-2.6.32.46/drivers/input/serio/serio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/input/serio/serio.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/input/serio/serio.c linux-2.6.32.48/drivers/input/serio/serio.c +--- linux-2.6.32.48/drivers/input/serio/serio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/input/serio/serio.c 2011-11-12 12:46:45.000000000 -0500 @@ -527,7 +527,7 @@ static void serio_release_port(struct de */ static void serio_init_port(struct serio *serio) @@ -32281,9 +32258,9 @@ diff -urNp linux-2.6.32.46/drivers/input/serio/serio.c linux-2.6.32.46/drivers/i serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; if (serio->parent) { -diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/common.c linux-2.6.32.46/drivers/isdn/gigaset/common.c ---- linux-2.6.32.46/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/common.c linux-2.6.32.48/drivers/isdn/gigaset/common.c +--- linux-2.6.32.48/drivers/isdn/gigaset/common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/gigaset/common.c 2011-11-12 12:46:45.000000000 -0500 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -32293,9 +32270,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/common.c linux-2.6.32.46/drivers cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/gigaset/gigaset.h 2011-11-12 12:46:45.000000000 -0500 @@ -34,6 +34,7 @@ #include <linux/tty_driver.h> #include <linux/list.h> @@ -32313,9 +32290,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h linux-2.6.32.46/driver struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/interface.c linux-2.6.32.46/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.46/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/gigaset/interface.c linux-2.6.32.48/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/gigaset/interface.c 2011-11-12 12:46:45.000000000 -0500 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -32403,9 +32380,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/interface.c linux-2.6.32.46/driv dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c ---- linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/avm/b1.c 2011-11-12 12:46:45.000000000 -0500 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -32424,9 +32401,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c linux-2.6.32.46/driver return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-12 12:46:45.000000000 -0500 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; @@ -32435,9 +32412,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.4 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/capifunc.c 2011-11-12 12:46:45.000000000 -0500 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -32447,9 +32424,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.4 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-12 12:46:45.000000000 -0500 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -32459,9 +32436,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.4 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-12 12:46:45.000000000 -0500 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -32471,9 +32448,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32. DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/divasync.h 2011-11-12 12:46:45.000000000 -0500 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter { } diva_didd_add_adapter_t; typedef struct _diva_didd_remove_adapter { @@ -32483,9 +32460,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.4 typedef struct _diva_didd_read_adapter_array { void * buffer; dword length; -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/idifunc.c 2011-11-12 12:46:45.000000000 -0500 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -32495,9 +32472,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.46 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/message.c 2011-11-12 12:46:45.000000000 -0500 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci) dword d; word w; @@ -32534,9 +32511,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c linux-2.6.32.46 set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */ if(!a->group_optimization_enabled) -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-12 12:46:45.000000000 -0500 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -32546,9 +32523,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.46 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h ---- linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h +--- linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-12 12:46:45.000000000 -0500 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t { typedef struct _diva_os_idi_adapter_interface { diva_init_card_proc_t cleanup_adapter_proc; @@ -32558,9 +32535,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.3 typedef struct _diva_os_xdi_adapter { struct list_head link; -diff -urNp linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c ---- linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c +--- linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/i4l/isdn_common.c 2011-11-12 12:46:45.000000000 -0500 @@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct f } iocpar; void __user *argp = (void __user *)arg; @@ -32570,9 +32547,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c linux-2.6.32.46/driver #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts -diff -urNp linux-2.6.32.46/drivers/isdn/icn/icn.c linux-2.6.32.46/drivers/isdn/icn/icn.c ---- linux-2.6.32.46/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/icn/icn.c linux-2.6.32.48/drivers/isdn/icn/icn.c +--- linux-2.6.32.48/drivers/isdn/icn/icn.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/icn/icn.c 2011-11-12 12:46:45.000000000 -0500 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -32582,9 +32559,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/icn/icn.c linux-2.6.32.46/drivers/isdn/i return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-2.6.32.46/drivers/isdn/mISDN/socket.c linux-2.6.32.46/drivers/isdn/mISDN/socket.c ---- linux-2.6.32.46/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/mISDN/socket.c linux-2.6.32.48/drivers/isdn/mISDN/socket.c +--- linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/mISDN/socket.c 2011-11-12 12:46:45.000000000 -0500 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns if (dev) { struct mISDN_devinfo di; @@ -32601,9 +32578,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/mISDN/socket.c linux-2.6.32.46/drivers/i di.id = dev->id; di.Dprotocols = dev->Dprotocols; di.Bprotocols = dev->Bprotocols | get_all_Bprotocols(); -diff -urNp linux-2.6.32.46/drivers/isdn/sc/interrupt.c linux-2.6.32.46/drivers/isdn/sc/interrupt.c ---- linux-2.6.32.46/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/isdn/sc/interrupt.c linux-2.6.32.48/drivers/isdn/sc/interrupt.c +--- linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/isdn/sc/interrupt.c 2011-11-12 12:46:45.000000000 -0500 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, } else if(callid>=0x0000 && callid<=0x7FFF) @@ -32638,9 +32615,9 @@ diff -urNp linux-2.6.32.46/drivers/isdn/sc/interrupt.c linux-2.6.32.46/drivers/i continue; } -diff -urNp linux-2.6.32.46/drivers/lguest/core.c linux-2.6.32.46/drivers/lguest/core.c ---- linux-2.6.32.46/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/lguest/core.c linux-2.6.32.48/drivers/lguest/core.c +--- linux-2.6.32.48/drivers/lguest/core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/lguest/core.c 2011-11-12 12:46:45.000000000 -0500 @@ -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. @@ -32668,9 +32645,9 @@ diff -urNp linux-2.6.32.46/drivers/lguest/core.c linux-2.6.32.46/drivers/lguest/ end_switcher_text - start_switcher_text); printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-2.6.32.46/drivers/lguest/x86/core.c linux-2.6.32.46/drivers/lguest/x86/core.c ---- linux-2.6.32.46/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/lguest/x86/core.c linux-2.6.32.48/drivers/lguest/x86/core.c +--- linux-2.6.32.48/drivers/lguest/x86/core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/lguest/x86/core.c 2011-11-12 12:46:45.000000000 -0500 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it */ static unsigned long switcher_offset(void) @@ -32712,9 +32689,9 @@ diff -urNp linux-2.6.32.46/drivers/lguest/x86/core.c linux-2.6.32.46/drivers/lgu lguest_entry.segment = LGUEST_CS; /* -diff -urNp linux-2.6.32.46/drivers/lguest/x86/switcher_32.S linux-2.6.32.46/drivers/lguest/x86/switcher_32.S ---- linux-2.6.32.46/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/lguest/x86/switcher_32.S linux-2.6.32.48/drivers/lguest/x86/switcher_32.S +--- linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/lguest/x86/switcher_32.S 2011-11-12 12:46:45.000000000 -0500 @@ -87,6 +87,7 @@ #include <asm/page.h> #include <asm/segment.h> @@ -32773,9 +32750,9 @@ diff -urNp linux-2.6.32.46/drivers/lguest/x86/switcher_32.S linux-2.6.32.46/driv // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/macintosh/via-pmu-backlight.c 2011-11-12 12:46:45.000000000 -0500 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -32794,9 +32771,9 @@ diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.46 .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu.c linux-2.6.32.46/drivers/macintosh/via-pmu.c ---- linux-2.6.32.46/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/macintosh/via-pmu.c linux-2.6.32.48/drivers/macintosh/via-pmu.c +--- linux-2.6.32.48/drivers/macintosh/via-pmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/macintosh/via-pmu.c 2011-11-12 12:46:45.000000000 -0500 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -32806,9 +32783,9 @@ diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu.c linux-2.6.32.46/drivers/m .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c ---- linux-2.6.32.46/drivers/md/dm.c 2011-08-09 18:35:29.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm.c 2011-08-09 18:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm.c linux-2.6.32.48/drivers/md/dm.c +--- linux-2.6.32.48/drivers/md/dm.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm.c 2011-11-12 12:46:45.000000000 -0500 @@ -165,9 +165,9 @@ struct mapped_device { /* * Event handling. @@ -32863,9 +32840,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c } void dm_uevent_add(struct mapped_device *md, struct list_head *elist) -diff -urNp linux-2.6.32.46/drivers/md/dm-ioctl.c linux-2.6.32.46/drivers/md/dm-ioctl.c ---- linux-2.6.32.46/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm-ioctl.c linux-2.6.32.48/drivers/md/dm-ioctl.c +--- linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm-ioctl.c 2011-11-12 12:46:45.000000000 -0500 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -32875,9 +32852,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-ioctl.c linux-2.6.32.46/drivers/md/dm-i if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-2.6.32.46/drivers/md/dm-raid1.c linux-2.6.32.46/drivers/md/dm-raid1.c ---- linux-2.6.32.46/drivers/md/dm-raid1.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm-raid1.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm-raid1.c linux-2.6.32.48/drivers/md/dm-raid1.c +--- linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm-raid1.c 2011-11-12 12:46:45.000000000 -0500 @@ -41,7 +41,7 @@ enum dm_raid1_error { struct mirror { @@ -32950,9 +32927,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-raid1.c linux-2.6.32.46/drivers/md/dm-r return 'A'; return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' : -diff -urNp linux-2.6.32.46/drivers/md/dm-stripe.c linux-2.6.32.46/drivers/md/dm-stripe.c ---- linux-2.6.32.46/drivers/md/dm-stripe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm-stripe.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm-stripe.c linux-2.6.32.48/drivers/md/dm-stripe.c +--- linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm-stripe.c 2011-11-12 12:46:45.000000000 -0500 @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -32991,9 +32968,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-stripe.c linux-2.6.32.46/drivers/md/dm- DM_IO_ERROR_THRESHOLD) queue_work(kstriped, &sc->kstriped_ws); } -diff -urNp linux-2.6.32.46/drivers/md/dm-sysfs.c linux-2.6.32.46/drivers/md/dm-sysfs.c ---- linux-2.6.32.46/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm-sysfs.c linux-2.6.32.48/drivers/md/dm-sysfs.c +--- linux-2.6.32.48/drivers/md/dm-sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm-sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -33003,9 +32980,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-sysfs.c linux-2.6.32.46/drivers/md/dm-s .show = dm_attr_show, }; -diff -urNp linux-2.6.32.46/drivers/md/dm-table.c linux-2.6.32.46/drivers/md/dm-table.c ---- linux-2.6.32.46/drivers/md/dm-table.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/dm-table.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/dm-table.c linux-2.6.32.48/drivers/md/dm-table.c +--- linux-2.6.32.48/drivers/md/dm-table.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/dm-table.c 2011-11-12 12:46:45.000000000 -0500 @@ -376,7 +376,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -33015,9 +32992,9 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-table.c linux-2.6.32.46/drivers/md/dm-t DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c ---- linux-2.6.32.46/drivers/md/md.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/md.c 2011-07-13 17:23:18.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/md.c linux-2.6.32.48/drivers/md/md.c +--- linux-2.6.32.48/drivers/md/md.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/md.c 2011-11-12 12:46:45.000000000 -0500 @@ -153,10 +153,10 @@ static int start_readonly; * start build, activate spare */ @@ -33040,7 +33017,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c wake_up(&md_event_waiters); } -@@ -1218,7 +1218,7 @@ static int super_1_load(mdk_rdev_t *rdev +@@ -1226,7 +1226,7 @@ static int super_1_load(mdk_rdev_t *rdev rdev->preferred_minor = 0xffff; rdev->data_offset = le64_to_cpu(sb->data_offset); @@ -33049,7 +33026,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256; bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; -@@ -1392,7 +1392,7 @@ static void super_1_sync(mddev_t *mddev, +@@ -1400,7 +1400,7 @@ static void super_1_sync(mddev_t *mddev, else sb->resync_offset = cpu_to_le64(0); @@ -33058,7 +33035,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c sb->raid_disks = cpu_to_le32(mddev->raid_disks); sb->size = cpu_to_le64(mddev->dev_sectors); -@@ -2214,7 +2214,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho +@@ -2222,7 +2222,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho static ssize_t errors_show(mdk_rdev_t *rdev, char *page) { @@ -33067,7 +33044,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c } static ssize_t -@@ -2223,7 +2223,7 @@ errors_store(mdk_rdev_t *rdev, const cha +@@ -2231,7 +2231,7 @@ errors_store(mdk_rdev_t *rdev, const cha char *e; unsigned long n = simple_strtoul(buf, &e, 10); if (*buf && (*e == 0 || *e == '\n')) { @@ -33076,7 +33053,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c return len; } return -EINVAL; -@@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko +@@ -2525,7 +2525,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); } @@ -33085,7 +33062,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c .show = rdev_attr_show, .store = rdev_attr_store, }; -@@ -2566,8 +2566,8 @@ static mdk_rdev_t *md_import_device(dev_ +@@ -2574,8 +2574,8 @@ static mdk_rdev_t *md_import_device(dev_ rdev->data_offset = 0; rdev->sb_events = 0; atomic_set(&rdev->nr_pending, 0); @@ -33096,7 +33073,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c size = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS; if (!size) { -@@ -3887,7 +3887,7 @@ static void md_free(struct kobject *ko) +@@ -3895,7 +3895,7 @@ static void md_free(struct kobject *ko) kfree(mddev); } @@ -33105,7 +33082,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c .show = md_attr_show, .store = md_attr_store, }; -@@ -4474,7 +4474,8 @@ out: +@@ -4482,7 +4482,8 @@ out: err = 0; blk_integrity_unregister(disk); md_new_event(mddev); @@ -33115,7 +33092,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c return err; } -@@ -5954,7 +5955,7 @@ static int md_seq_show(struct seq_file * +@@ -5962,7 +5963,7 @@ static int md_seq_show(struct seq_file * spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -33124,7 +33101,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c return 0; } if (v == (void*)2) { -@@ -6043,7 +6044,7 @@ static int md_seq_show(struct seq_file * +@@ -6051,7 +6052,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -33133,7 +33110,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c } seq_printf(seq, "\n"); -@@ -6077,7 +6078,7 @@ static int md_seq_open(struct inode *ino +@@ -6085,7 +6086,7 @@ static int md_seq_open(struct inode *ino else { struct seq_file *p = file->private_data; p->private = mi; @@ -33142,7 +33119,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c } return error; } -@@ -6093,7 +6094,7 @@ static unsigned int mdstat_poll(struct f +@@ -6101,7 +6102,7 @@ static unsigned int mdstat_poll(struct f /* always allow read */ mask = POLLIN | POLLRDNORM; @@ -33151,7 +33128,7 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c mask |= POLLERR | POLLPRI; return mask; } -@@ -6137,7 +6138,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6145,7 +6146,7 @@ static int is_mddev_idle(mddev_t *mddev, struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -33160,9 +33137,9 @@ diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.32.46/drivers/md/md.h linux-2.6.32.46/drivers/md/md.h ---- linux-2.6.32.46/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/md.h 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/md.h linux-2.6.32.48/drivers/md/md.h +--- linux-2.6.32.48/drivers/md/md.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/md.h 2011-11-12 12:46:45.000000000 -0500 @@ -94,10 +94,10 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal @@ -33185,9 +33162,9 @@ diff -urNp linux-2.6.32.46/drivers/md/md.h linux-2.6.32.46/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10.c ---- linux-2.6.32.46/drivers/md/raid10.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/raid10.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/raid10.c linux-2.6.32.48/drivers/md/raid10.c +--- linux-2.6.32.48/drivers/md/raid10.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/raid10.c 2011-11-12 12:46:45.000000000 -0500 @@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); @@ -33206,9 +33183,9 @@ diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10 if (sync_page_io(rdev->bdev, r10_bio->devs[sl].addr + sect + rdev->data_offset, -diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c ---- linux-2.6.32.46/drivers/md/raid1.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/raid1.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/raid1.c linux-2.6.32.48/drivers/md/raid1.c +--- linux-2.6.32.48/drivers/md/raid1.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/raid1.c 2011-11-12 12:46:45.000000000 -0500 @@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t * if (r1_bio->bios[d]->bi_end_io != end_sync_read) continue; @@ -33227,9 +33204,9 @@ diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c printk(KERN_INFO "raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", -diff -urNp linux-2.6.32.46/drivers/md/raid5.c linux-2.6.32.46/drivers/md/raid5.c ---- linux-2.6.32.46/drivers/md/raid5.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/md/raid5.c 2011-06-25 12:58:39.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/md/raid5.c linux-2.6.32.48/drivers/md/raid5.c +--- linux-2.6.32.48/drivers/md/raid5.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/md/raid5.c 2011-11-12 12:46:45.000000000 -0500 @@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea bi->bi_next = NULL; if ((rw & WRITE) && @@ -33275,9 +33252,9 @@ diff -urNp linux-2.6.32.46/drivers/md/raid5.c linux-2.6.32.46/drivers/md/raid5.c chunk_offset = sector_div(new_sector, sectors_per_chunk); stripe = new_sector; -diff -urNp linux-2.6.32.46/drivers/media/common/saa7146_hlp.c linux-2.6.32.46/drivers/media/common/saa7146_hlp.c ---- linux-2.6.32.46/drivers/media/common/saa7146_hlp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/common/saa7146_hlp.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/common/saa7146_hlp.c linux-2.6.32.48/drivers/media/common/saa7146_hlp.c +--- linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/common/saa7146_hlp.c 2011-11-12 12:46:45.000000000 -0500 @@ -353,6 +353,8 @@ static void calculate_clipping_registers int x[32], y[32], w[32], h[32]; @@ -33287,9 +33264,9 @@ diff -urNp linux-2.6.32.46/drivers/media/common/saa7146_hlp.c linux-2.6.32.46/dr /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-12 12:46:45.000000000 -0500 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru u8 buf[HOST_LINK_BUF_SIZE]; int i; @@ -33308,9 +33285,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6 dprintk("%s\n", __func__); /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */ -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h ---- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h +--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-12 12:46:45.000000000 -0500 @@ -71,7 +71,7 @@ struct dvb_demux_feed { union { dmx_ts_cb ts; @@ -33320,9 +33297,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.4 struct dvb_demux *demux; void *priv; -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-12 12:46:45.000000000 -0500 @@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -33332,9 +33309,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.46/d struct device *clsdev; int minor; int id; -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c ---- linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c +--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-12 12:46:45.000000000 -0500 @@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di struct dib0700_adapter_state { int (*set_param_save) (struct dvb_frontend *, @@ -33344,9 +33321,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.46/dri static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c +--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-12 12:46:45.000000000 -0500 @@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb u8 buf[260]; @@ -33356,9 +33333,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32 while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk); -diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c ---- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c +--- linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-11-12 12:46:45.000000000 -0500 @@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, " struct dib0700_adapter_state { @@ -33368,9 +33345,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6 /* Hauppauge Nova-T 500 (aka Bristol) * has a LNA on GPIO0 which is enabled by setting 1 */ -diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h ---- linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h +--- linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/frontends/dib3000.h 2011-11-12 12:46:45.000000000 -0500 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff); int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff); @@ -33380,9 +33357,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.46 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE)) extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, -diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c ---- linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c +--- linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/dvb/frontends/or51211.c 2011-11-12 12:46:45.000000000 -0500 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct u8 tudata[585]; int i; @@ -33392,9 +33369,9 @@ diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c linux-2.6.32.46 dprintk("Firmware is %zd bytes\n",fw->size); /* Get eprom data */ -diff -urNp linux-2.6.32.46/drivers/media/radio/radio-cadet.c linux-2.6.32.46/drivers/media/radio/radio-cadet.c ---- linux-2.6.32.46/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/radio/radio-cadet.c linux-2.6.32.48/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/radio/radio-cadet.c 2011-11-12 12:46:45.000000000 -0500 @@ -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++]; @@ -33404,9 +33381,9 @@ diff -urNp linux-2.6.32.46/drivers/media/radio/radio-cadet.c linux-2.6.32.46/dri return -EFAULT; return i; } -diff -urNp linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c ---- linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c +--- linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/cx18/cx18-driver.c 2011-11-12 12:46:45.000000000 -0500 @@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl MODULE_DEVICE_TABLE(pci, cx18_pci_tbl); @@ -33434,9 +33411,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.4 if (i >= CX18_MAX_CARDS) { printk(KERN_ERR "cx18: cannot manage card %d, driver has a " "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1); -diff -urNp linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c ---- linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c +--- linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/ivtv/ivtv-driver.c 2011-11-12 12:46:45.000000000 -0500 @@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); @@ -33446,9 +33423,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.4 /* Parameter declarations */ static int cardtype[IVTV_MAX_CARDS]; -diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.c linux-2.6.32.46/drivers/media/video/omap24xxcam.c ---- linux-2.6.32.46/drivers/media/video/omap24xxcam.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/omap24xxcam.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.c linux-2.6.32.48/drivers/media/video/omap24xxcam.c +--- linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/omap24xxcam.c 2011-11-12 12:46:45.000000000 -0500 @@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags); @@ -33458,9 +33435,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.c linux-2.6.32.46/dri if (csr & csr_error) { vb->state = VIDEOBUF_ERROR; if (!atomic_read(&fh->cam->in_reset)) { -diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.h linux-2.6.32.46/drivers/media/video/omap24xxcam.h ---- linux-2.6.32.46/drivers/media/video/omap24xxcam.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/omap24xxcam.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/omap24xxcam.h linux-2.6.32.48/drivers/media/video/omap24xxcam.h +--- linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/omap24xxcam.h 2011-11-12 12:46:45.000000000 -0500 @@ -533,7 +533,7 @@ struct omap24xxcam_fh { spinlock_t vbq_lock; /* spinlock for the videobuf queue */ struct videobuf_queue vbq; @@ -33470,9 +33447,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.h linux-2.6.32.46/dri /* accessing cam here doesn't need serialisation: it's constant */ struct omap24xxcam_device *cam; }; -diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ---- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +--- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-12 12:46:45.000000000 -0500 @@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw u8 *eeprom; struct tveeprom tvdata; @@ -33482,9 +33459,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2. memset(&tvdata,0,sizeof(tvdata)); eeprom = pvr2_eeprom_fetch(hdw); -diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h ---- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +--- linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2011-11-12 12:46:45.000000000 -0500 @@ -195,7 +195,7 @@ struct pvr2_hdw { /* I2C stuff */ @@ -33494,9 +33471,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h li pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT]; int i2c_cx25840_hack_state; int i2c_linked; -diff -urNp linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c ---- linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c +--- linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/saa7134/saa6752hs.c 2011-11-12 12:46:45.000000000 -0500 @@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_su unsigned char localPAT[256]; unsigned char localPMT[256]; @@ -33506,9 +33483,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32. /* Set video format - must be done first as it resets other settings */ set_reg8(client, 0x41, h->video_format); -diff -urNp linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c +--- linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-12 12:46:45.000000000 -0500 @@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_d wait_queue_head_t *q = 0; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -33527,9 +33504,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.3 while (loop) { tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 }; -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c ---- linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c +--- linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/ibmcam.c 2011-11-12 12:46:45.000000000 -0500 @@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] = static int __init ibmcam_init(void) { @@ -33555,9 +33532,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.46 return usbvideo_register( &cams, MAX_IBMCAM, -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/konicawc.c 2011-11-12 12:46:45.000000000 -0500 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -33594,9 +33571,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c linux-2.6.32. return usbvideo_register( &cams, MAX_CAMERAS, -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/quickcam_messenger.c 2011-11-12 12:46:45.000000000 -0500 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -33606,9 +33583,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c lin cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c ---- linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c +--- linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/ultracam.c 2011-11-12 12:46:45.000000000 -0500 @@ -655,14 +655,14 @@ static int __init ultracam_init(void) { struct usbvideo_cb cbTbl; @@ -33632,9 +33609,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c linux-2.6.32. return usbvideo_register( &cams, MAX_CAMERAS, -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c ---- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c +--- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.c 2011-11-12 12:46:45.000000000 -0500 @@ -697,15 +697,15 @@ int usbvideo_register( __func__, cams, base_size, num_cams); @@ -33656,9 +33633,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32. cams->num_cameras = num_cams; cams->cam = (struct uvd *) &cams[1]; -diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h ---- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h 2011-08-30 18:20:06.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h +--- linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvideo/usbvideo.h 2011-11-12 12:46:45.000000000 -0500 @@ -268,7 +268,7 @@ struct usbvideo_cb { int (*startDataPump)(struct uvd *uvd); void (*stopDataPump)(struct uvd *uvd); @@ -33668,9 +33645,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32. struct usbvideo { int num_cameras; /* As allocated */ -diff -urNp linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c ---- linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c +--- linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/usbvision/usbvision-core.c 2011-11-12 12:46:45.000000000 -0500 @@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_c unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; @@ -33680,9 +33657,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c linux- frame = usbvision->curFrame; imageSize = frame->frmwidth * frame->frmheight; if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) || -diff -urNp linux-2.6.32.46/drivers/media/video/v4l2-device.c linux-2.6.32.46/drivers/media/video/v4l2-device.c ---- linux-2.6.32.46/drivers/media/video/v4l2-device.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/v4l2-device.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/v4l2-device.c linux-2.6.32.48/drivers/media/video/v4l2-device.c +--- linux-2.6.32.48/drivers/media/video/v4l2-device.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/v4l2-device.c 2011-11-12 12:46:45.000000000 -0500 @@ -50,9 +50,9 @@ int v4l2_device_register(struct device * EXPORT_SYMBOL_GPL(v4l2_device_register); @@ -33695,9 +33672,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/v4l2-device.c linux-2.6.32.46/dri int len = strlen(basename); if (basename[len - 1] >= '0' && basename[len - 1] <= '9') -diff -urNp linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c ---- linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c +--- linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/media/video/videobuf-dma-sg.c 2011-11-12 12:46:45.000000000 -0500 @@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; @@ -33707,9 +33684,9 @@ diff -urNp linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.46 /* Required to make generic handler to call __videobuf_alloc */ q.int_ops = &sg_ops; -diff -urNp linux-2.6.32.46/drivers/message/fusion/mptbase.c linux-2.6.32.46/drivers/message/fusion/mptbase.c ---- linux-2.6.32.46/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/fusion/mptbase.c linux-2.6.32.48/drivers/message/fusion/mptbase.c +--- linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/fusion/mptbase.c 2011-11-12 12:46:45.000000000 -0500 @@ -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); @@ -33725,9 +33702,9 @@ diff -urNp linux-2.6.32.46/drivers/message/fusion/mptbase.c linux-2.6.32.46/driv /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-2.6.32.46/drivers/message/fusion/mptsas.c linux-2.6.32.46/drivers/message/fusion/mptsas.c ---- linux-2.6.32.46/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/fusion/mptsas.c linux-2.6.32.48/drivers/message/fusion/mptsas.c +--- linux-2.6.32.48/drivers/message/fusion/mptsas.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/fusion/mptsas.c 2011-11-12 12:46:45.000000000 -0500 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -33776,9 +33753,9 @@ diff -urNp linux-2.6.32.46/drivers/message/fusion/mptsas.c linux-2.6.32.46/drive static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-2.6.32.46/drivers/message/fusion/mptscsih.c linux-2.6.32.46/drivers/message/fusion/mptscsih.c ---- linux-2.6.32.46/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/fusion/mptscsih.c linux-2.6.32.48/drivers/message/fusion/mptscsih.c +--- linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/fusion/mptscsih.c 2011-11-12 12:46:45.000000000 -0500 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost) h = shost_priv(SChost); @@ -33804,9 +33781,9 @@ diff -urNp linux-2.6.32.46/drivers/message/fusion/mptscsih.c linux-2.6.32.46/dri return h->info_kbuf; } -diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_config.c linux-2.6.32.46/drivers/message/i2o/i2o_config.c ---- linux-2.6.32.46/drivers/message/i2o/i2o_config.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/i2o/i2o_config.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_config.c linux-2.6.32.48/drivers/message/i2o/i2o_config.c +--- linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/i2o/i2o_config.c 2011-11-12 12:46:45.000000000 -0500 @@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned lon struct i2o_message *msg; unsigned int iop; @@ -33816,9 +33793,9 @@ diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_config.c linux-2.6.32.46/driv if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; -diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_proc.c linux-2.6.32.46/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.46/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/i2o/i2o_proc.c linux-2.6.32.48/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/i2o/i2o_proc.c 2011-11-12 12:46:45.000000000 -0500 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -33905,9 +33882,9 @@ diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_proc.c linux-2.6.32.46/driver return 0; } -diff -urNp linux-2.6.32.46/drivers/message/i2o/iop.c linux-2.6.32.46/drivers/message/i2o/iop.c ---- linux-2.6.32.46/drivers/message/i2o/iop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/message/i2o/iop.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/message/i2o/iop.c linux-2.6.32.48/drivers/message/i2o/iop.c +--- linux-2.6.32.48/drivers/message/i2o/iop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/message/i2o/iop.c 2011-11-12 12:46:45.000000000 -0500 @@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro spin_lock_irqsave(&c->context_list_lock, flags); @@ -33931,9 +33908,9 @@ diff -urNp linux-2.6.32.46/drivers/message/i2o/iop.c linux-2.6.32.46/drivers/mes INIT_LIST_HEAD(&c->context_list); #endif -diff -urNp linux-2.6.32.46/drivers/mfd/wm8350-i2c.c linux-2.6.32.46/drivers/mfd/wm8350-i2c.c ---- linux-2.6.32.46/drivers/mfd/wm8350-i2c.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mfd/wm8350-i2c.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mfd/wm8350-i2c.c linux-2.6.32.48/drivers/mfd/wm8350-i2c.c +--- linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mfd/wm8350-i2c.c 2011-11-12 12:46:45.000000000 -0500 @@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struc u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; @@ -33943,9 +33920,9 @@ diff -urNp linux-2.6.32.46/drivers/mfd/wm8350-i2c.c linux-2.6.32.46/drivers/mfd/ if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; -diff -urNp linux-2.6.32.46/drivers/misc/kgdbts.c linux-2.6.32.46/drivers/misc/kgdbts.c ---- linux-2.6.32.46/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/kgdbts.c linux-2.6.32.48/drivers/misc/kgdbts.c +--- linux-2.6.32.48/drivers/misc/kgdbts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/kgdbts.c 2011-11-12 12:46:45.000000000 -0500 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -33964,9 +33941,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/kgdbts.c linux-2.6.32.46/drivers/misc/kg .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-gru/gruhandles.c 2011-11-12 12:46:45.000000000 -0500 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -33978,9 +33955,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.46/dri if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-gru/gruprocfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -34004,9 +33981,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.46/driv max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-gru/grutables.h 2011-11-12 12:46:45.000000000 -0500 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -34190,9 +34167,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h linux-2.6.32.46/driv } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h ---- linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h +--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc.h 2011-11-12 12:46:45.000000000 -0500 @@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis /* found in xpc_main.c */ extern struct device *xpc_part; @@ -34202,9 +34179,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h linux-2.6.32.46/drivers/mis extern int xpc_disengage_timelimit; extern int xpc_disengage_timedout; extern int xpc_activate_IRQ_rcvd; -diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c ---- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c +--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_main.c 2011-11-12 12:46:45.000000000 -0500 @@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not .notifier_call = xpc_system_die, }; @@ -34214,9 +34191,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.46/driver /* * Timer function to enforce the timelimit on the partition disengage. -diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c ---- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c +--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_sn2.c 2011-11-12 12:46:45.000000000 -0500 @@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan xpc_acknowledge_msgs_sn2(ch, get, msg->flags); } @@ -34237,9 +34214,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.46/drivers if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) { dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is " -diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c ---- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c +--- linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-xp/xpc_uv.c 2011-11-12 12:46:45.000000000 -0500 @@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret); } @@ -34260,9 +34237,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.46/drivers/ if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) { dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n", -diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc/sgi-xp/xp.h ---- linux-2.6.32.46/drivers/misc/sgi-xp/xp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/misc/sgi-xp/xp.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/misc/sgi-xp/xp.h linux-2.6.32.48/drivers/misc/sgi-xp/xp.h +--- linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/misc/sgi-xp/xp.h 2011-11-12 12:46:45.000000000 -0500 @@ -289,7 +289,7 @@ struct xpc_interface { xpc_notify_func, void *); void (*received) (short, int, void *); @@ -34272,9 +34249,9 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc extern struct xpc_interface xpc_interface; -diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-12 12:46:45.000000000 -0500 @@ -743,6 +743,8 @@ static int chip_ready (struct map_info * struct cfi_pri_intelext *cfip = cfi->cmdset_priv; unsigned long timeo = jiffies + HZ; @@ -34302,9 +34279,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.46/d adr += chip->start; retry: -diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c ---- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c +--- linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-12 12:46:45.000000000 -0500 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct unsigned long cmd_addr; struct cfi_private *cfi = map->fldrv_priv; @@ -34350,9 +34327,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.46/d adr += chip->start; /* Let's determine this according to the interleave only once */ -diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2000.c linux-2.6.32.46/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.46/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2000.c linux-2.6.32.48/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/devices/doc2000.c 2011-11-12 12:46:45.000000000 -0500 @@ -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 */ @@ -34362,9 +34339,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2000.c linux-2.6.32.46/drivers printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2001.c linux-2.6.32.46/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.46/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/devices/doc2001.c linux-2.6.32.48/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/devices/doc2001.c 2011-11-12 12:46:45.000000000 -0500 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -34374,9 +34351,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2001.c linux-2.6.32.46/drivers return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-2.6.32.46/drivers/mtd/ftl.c linux-2.6.32.46/drivers/mtd/ftl.c ---- linux-2.6.32.46/drivers/mtd/ftl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/ftl.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/ftl.c linux-2.6.32.48/drivers/mtd/ftl.c +--- linux-2.6.32.48/drivers/mtd/ftl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/ftl.c 2011-11-12 12:46:45.000000000 -0500 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * loff_t offset; uint16_t srcunitswap = cpu_to_le16(srcunit); @@ -34386,9 +34363,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/ftl.c linux-2.6.32.46/drivers/mtd/ftl.c eun = &part->EUNInfo[srcunit]; xfer = &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", -diff -urNp linux-2.6.32.46/drivers/mtd/inftlcore.c linux-2.6.32.46/drivers/mtd/inftlcore.c ---- linux-2.6.32.46/drivers/mtd/inftlcore.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/inftlcore.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/inftlcore.c linux-2.6.32.48/drivers/mtd/inftlcore.c +--- linux-2.6.32.48/drivers/mtd/inftlcore.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/inftlcore.c 2011-11-12 12:46:45.000000000 -0500 @@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLr struct inftl_oob oob; size_t retlen; @@ -34398,9 +34375,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/inftlcore.c linux-2.6.32.46/drivers/mtd/i DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d," "pending=%d)\n", inftl, thisVUC, pendingblock); -diff -urNp linux-2.6.32.46/drivers/mtd/inftlmount.c linux-2.6.32.46/drivers/mtd/inftlmount.c ---- linux-2.6.32.46/drivers/mtd/inftlmount.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/inftlmount.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/inftlmount.c linux-2.6.32.48/drivers/mtd/inftlmount.c +--- linux-2.6.32.48/drivers/mtd/inftlmount.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/inftlmount.c 2011-11-12 12:46:45.000000000 -0500 @@ -54,6 +54,8 @@ static int find_boot_record(struct INFTL struct INFTLPartition *ip; size_t retlen; @@ -34410,9 +34387,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/inftlmount.c linux-2.6.32.46/drivers/mtd/ DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl); /* -diff -urNp linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c ---- linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c +--- linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/lpddr/qinfo_probe.c 2011-11-12 12:46:45.000000000 -0500 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map { map_word pfow_val[4]; @@ -34422,9 +34399,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.46/drive /* Check identification string */ pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); -diff -urNp linux-2.6.32.46/drivers/mtd/mtdchar.c linux-2.6.32.46/drivers/mtd/mtdchar.c ---- linux-2.6.32.46/drivers/mtd/mtdchar.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/mtdchar.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/mtdchar.c linux-2.6.32.48/drivers/mtd/mtdchar.c +--- linux-2.6.32.48/drivers/mtd/mtdchar.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/mtdchar.c 2011-11-12 12:46:45.000000000 -0500 @@ -460,6 +460,8 @@ static int mtd_ioctl(struct inode *inode u_long size; struct mtd_info_user info; @@ -34434,9 +34411,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/mtdchar.c linux-2.6.32.46/drivers/mtd/mtd DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; -diff -urNp linux-2.6.32.46/drivers/mtd/nftlcore.c linux-2.6.32.46/drivers/mtd/nftlcore.c ---- linux-2.6.32.46/drivers/mtd/nftlcore.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/nftlcore.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/nftlcore.c linux-2.6.32.48/drivers/mtd/nftlcore.c +--- linux-2.6.32.48/drivers/mtd/nftlcore.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/nftlcore.c 2011-11-12 12:46:45.000000000 -0500 @@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLre int inplace = 1; size_t retlen; @@ -34446,9 +34423,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/nftlcore.c linux-2.6.32.46/drivers/mtd/nf memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); -diff -urNp linux-2.6.32.46/drivers/mtd/nftlmount.c linux-2.6.32.46/drivers/mtd/nftlmount.c ---- linux-2.6.32.46/drivers/mtd/nftlmount.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/nftlmount.c 2011-05-18 20:09:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/nftlmount.c linux-2.6.32.48/drivers/mtd/nftlmount.c +--- linux-2.6.32.48/drivers/mtd/nftlmount.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/nftlmount.c 2011-11-12 12:46:45.000000000 -0500 @@ -23,6 +23,7 @@ #include <asm/errno.h> #include <linux/delay.h> @@ -34466,9 +34443,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/nftlmount.c linux-2.6.32.46/drivers/mtd/n /* Assume logical EraseSize == physical erasesize for starting the scan. We'll sort it out later if we find a MediaHeader which says otherwise */ /* Actually, we won't. The new DiskOnChip driver has already scanned -diff -urNp linux-2.6.32.46/drivers/mtd/ubi/build.c linux-2.6.32.46/drivers/mtd/ubi/build.c ---- linux-2.6.32.46/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/mtd/ubi/build.c linux-2.6.32.48/drivers/mtd/ubi/build.c +--- linux-2.6.32.48/drivers/mtd/ubi/build.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/mtd/ubi/build.c 2011-11-12 12:46:45.000000000 -0500 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -34508,9 +34485,9 @@ diff -urNp linux-2.6.32.46/drivers/mtd/ubi/build.c linux-2.6.32.46/drivers/mtd/u } /** -diff -urNp linux-2.6.32.46/drivers/net/bnx2.c linux-2.6.32.46/drivers/net/bnx2.c ---- linux-2.6.32.46/drivers/net/bnx2.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/bnx2.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/bnx2.c linux-2.6.32.48/drivers/net/bnx2.c +--- linux-2.6.32.48/drivers/net/bnx2.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/bnx2.c 2011-11-12 12:46:45.000000000 -0500 @@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc = 0; u32 magic, csum; @@ -34520,9 +34497,9 @@ diff -urNp linux-2.6.32.46/drivers/net/bnx2.c linux-2.6.32.46/drivers/net/bnx2.c if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0) goto test_nvram_done; -diff -urNp linux-2.6.32.46/drivers/net/cxgb3/l2t.h linux-2.6.32.46/drivers/net/cxgb3/l2t.h ---- linux-2.6.32.46/drivers/net/cxgb3/l2t.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/cxgb3/l2t.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/cxgb3/l2t.h linux-2.6.32.48/drivers/net/cxgb3/l2t.h +--- linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/cxgb3/l2t.h 2011-11-12 12:46:45.000000000 -0500 @@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func) */ struct l2t_skb_cb { @@ -34532,9 +34509,9 @@ diff -urNp linux-2.6.32.46/drivers/net/cxgb3/l2t.h linux-2.6.32.46/drivers/net/c #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) -diff -urNp linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c ---- linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c +--- linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/cxgb3/t3_hw.c 2011-11-12 12:46:45.000000000 -0500 @@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter int i, addr, ret; struct t3_vpd vpd; @@ -34544,9 +34521,9 @@ diff -urNp linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c linux-2.6.32.46/drivers/net /* * Card information is normally at VPD_BASE but some early cards had * it at 0. -diff -urNp linux-2.6.32.46/drivers/net/e1000e/82571.c linux-2.6.32.46/drivers/net/e1000e/82571.c ---- linux-2.6.32.46/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/e1000e/82571.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/e1000e/82571.c linux-2.6.32.48/drivers/net/e1000e/82571.c +--- linux-2.6.32.48/drivers/net/e1000e/82571.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/e1000e/82571.c 2011-11-12 12:46:45.000000000 -0500 @@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -34601,9 +34578,9 @@ diff -urNp linux-2.6.32.46/drivers/net/e1000e/82571.c linux-2.6.32.46/drivers/ne .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.32.46/drivers/net/e1000e/e1000.h linux-2.6.32.46/drivers/net/e1000e/e1000.h ---- linux-2.6.32.46/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/e1000e/e1000.h linux-2.6.32.48/drivers/net/e1000e/e1000.h +--- linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/e1000e/e1000.h 2011-11-12 12:46:45.000000000 -0500 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -34617,9 +34594,9 @@ diff -urNp linux-2.6.32.46/drivers/net/e1000e/e1000.h linux-2.6.32.46/drivers/ne }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.46/drivers/net/e1000e/es2lan.c linux-2.6.32.46/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.46/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/e1000e/es2lan.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/e1000e/es2lan.c linux-2.6.32.48/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/e1000e/es2lan.c 2011-11-12 12:46:45.000000000 -0500 @@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -34656,9 +34633,9 @@ diff -urNp linux-2.6.32.46/drivers/net/e1000e/es2lan.c linux-2.6.32.46/drivers/n .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.46/drivers/net/e1000e/hw.h linux-2.6.32.46/drivers/net/e1000e/hw.h ---- linux-2.6.32.46/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/e1000e/hw.h 2011-08-23 21:27:38.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/e1000e/hw.h linux-2.6.32.48/drivers/net/e1000e/hw.h +--- linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/e1000e/hw.h 2011-11-12 12:46:45.000000000 -0500 @@ -753,6 +753,7 @@ struct e1000_mac_operations { s32 (*setup_physical_interface)(struct e1000_hw *); s32 (*setup_led)(struct e1000_hw *); @@ -34705,9 +34682,9 @@ diff -urNp linux-2.6.32.46/drivers/net/e1000e/hw.h linux-2.6.32.46/drivers/net/e enum e1000_nvm_type type; enum e1000_nvm_override override; -diff -urNp linux-2.6.32.46/drivers/net/e1000e/ich8lan.c linux-2.6.32.46/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.46/drivers/net/e1000e/ich8lan.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/e1000e/ich8lan.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/e1000e/ich8lan.c linux-2.6.32.48/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/e1000e/ich8lan.c 2011-11-12 12:46:45.000000000 -0500 @@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -34735,9 +34712,9 @@ diff -urNp linux-2.6.32.46/drivers/net/e1000e/ich8lan.c linux-2.6.32.46/drivers/ .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, .release_nvm = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.46/drivers/net/hamradio/6pack.c linux-2.6.32.46/drivers/net/hamradio/6pack.c ---- linux-2.6.32.46/drivers/net/hamradio/6pack.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/hamradio/6pack.c 2011-07-13 17:23:18.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/hamradio/6pack.c linux-2.6.32.48/drivers/net/hamradio/6pack.c +--- linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/hamradio/6pack.c 2011-11-12 12:46:45.000000000 -0500 @@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct t unsigned char buf[512]; int count1; @@ -34747,9 +34724,9 @@ diff -urNp linux-2.6.32.46/drivers/net/hamradio/6pack.c linux-2.6.32.46/drivers/ if (!count) return; -diff -urNp linux-2.6.32.46/drivers/net/ibmveth.c linux-2.6.32.46/drivers/net/ibmveth.c ---- linux-2.6.32.46/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/ibmveth.c linux-2.6.32.48/drivers/net/ibmveth.c +--- linux-2.6.32.48/drivers/net/ibmveth.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/ibmveth.c 2011-11-12 12:46:45.000000000 -0500 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -34759,9 +34736,9 @@ diff -urNp linux-2.6.32.46/drivers/net/ibmveth.c linux-2.6.32.46/drivers/net/ibm .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_82575.c linux-2.6.32.46/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.46/drivers/net/igb/e1000_82575.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/igb/e1000_82575.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_82575.c linux-2.6.32.48/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/igb/e1000_82575.c 2011-11-12 12:46:45.000000000 -0500 @@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -34787,9 +34764,9 @@ diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_82575.c linux-2.6.32.46/drivers .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_hw.h linux-2.6.32.46/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.46/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/igb/e1000_hw.h 2011-08-23 21:28:01.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/igb/e1000_hw.h linux-2.6.32.48/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/igb/e1000_hw.h 2011-11-12 12:46:45.000000000 -0500 @@ -288,6 +288,7 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); @@ -34858,9 +34835,9 @@ diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_hw.h linux-2.6.32.46/drivers/ne struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-2.6.32.46/drivers/net/igbvf/vf.h linux-2.6.32.46/drivers/net/igbvf/vf.h ---- linux-2.6.32.46/drivers/net/igbvf/vf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/igbvf/vf.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/igbvf/vf.h linux-2.6.32.48/drivers/net/igbvf/vf.h +--- linux-2.6.32.48/drivers/net/igbvf/vf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/igbvf/vf.h 2011-11-12 12:46:45.000000000 -0500 @@ -187,9 +187,10 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*set_vfta)(struct e1000_hw *, u16, bool); @@ -34890,9 +34867,9 @@ diff -urNp linux-2.6.32.46/drivers/net/igbvf/vf.h linux-2.6.32.46/drivers/net/ig struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-2.6.32.46/drivers/net/iseries_veth.c linux-2.6.32.46/drivers/net/iseries_veth.c ---- linux-2.6.32.46/drivers/net/iseries_veth.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/iseries_veth.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/iseries_veth.c linux-2.6.32.48/drivers/net/iseries_veth.c +--- linux-2.6.32.48/drivers/net/iseries_veth.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/iseries_veth.c 2011-11-12 12:46:45.000000000 -0500 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -34911,9 +34888,9 @@ diff -urNp linux-2.6.32.46/drivers/net/iseries_veth.c linux-2.6.32.46/drivers/ne .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c ---- linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c +--- linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/ixgb/ixgb_main.c 2011-11-12 12:46:45.000000000 -0500 @@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev u32 rctl; int i; @@ -34923,9 +34900,9 @@ diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c linux-2.6.32.46/drivers/ /* Check for Promiscuous and All Multicast modes */ rctl = IXGB_READ_REG(hw, RCTL); -diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c ---- linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c +--- linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/ixgb/ixgb_param.c 2011-11-12 12:46:45.000000000 -0500 @@ -260,6 +260,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { @@ -34936,9 +34913,9 @@ diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c linux-2.6.32.46/drivers if (bd >= IXGB_MAX_NIC) { printk(KERN_NOTICE "Warning: no configuration for board #%i\n", bd); -diff -urNp linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h ---- linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h +--- linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:46:45.000000000 -0500 @@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations { s32 (*validate_checksum)(struct ixgbe_hw *, u16 *); s32 (*update_checksum)(struct ixgbe_hw *); @@ -34985,9 +34962,9 @@ diff -urNp linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.46/driver struct mdio_if_info mdio; enum ixgbe_phy_type type; u32 id; -diff -urNp linux-2.6.32.46/drivers/net/mlx4/main.c linux-2.6.32.46/drivers/net/mlx4/main.c ---- linux-2.6.32.46/drivers/net/mlx4/main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/mlx4/main.c 2011-05-18 20:09:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/mlx4/main.c linux-2.6.32.48/drivers/net/mlx4/main.c +--- linux-2.6.32.48/drivers/net/mlx4/main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/mlx4/main.c 2011-11-12 12:46:45.000000000 -0500 @@ -38,6 +38,7 @@ #include <linux/errno.h> #include <linux/pci.h> @@ -35005,9 +34982,9 @@ diff -urNp linux-2.6.32.46/drivers/net/mlx4/main.c linux-2.6.32.46/drivers/net/m err = mlx4_QUERY_FW(dev); if (err) { if (err == -EACCES) -diff -urNp linux-2.6.32.46/drivers/net/niu.c linux-2.6.32.46/drivers/net/niu.c ---- linux-2.6.32.46/drivers/net/niu.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/niu.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/niu.c linux-2.6.32.48/drivers/net/niu.c +--- linux-2.6.32.48/drivers/net/niu.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/niu.c 2011-11-12 12:46:45.000000000 -0500 @@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struc int i, num_irqs, err; u8 first_ldg; @@ -35017,9 +34994,9 @@ diff -urNp linux-2.6.32.46/drivers/net/niu.c linux-2.6.32.46/drivers/net/niu.c first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port; for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] = first_ldg + i; -diff -urNp linux-2.6.32.46/drivers/net/pcnet32.c linux-2.6.32.46/drivers/net/pcnet32.c ---- linux-2.6.32.46/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/pcnet32.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/pcnet32.c linux-2.6.32.48/drivers/net/pcnet32.c +--- linux-2.6.32.48/drivers/net/pcnet32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/pcnet32.c 2011-11-12 12:46:45.000000000 -0500 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -35656,9 +35633,9 @@ diff -urNp linux-2.6.32.46/drivers/net/pcnet32.c linux-2.6.32.46/drivers/net/pcn } } else { if (netif_msg_link(lp)) -diff -urNp linux-2.6.32.46/drivers/net/tg3.h linux-2.6.32.46/drivers/net/tg3.h ---- linux-2.6.32.46/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tg3.h linux-2.6.32.48/drivers/net/tg3.h +--- linux-2.6.32.48/drivers/net/tg3.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tg3.h 2011-11-12 12:46:45.000000000 -0500 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -35667,9 +35644,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tg3.h linux-2.6.32.46/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.32.46/drivers/net/tokenring/abyss.c linux-2.6.32.46/drivers/net/tokenring/abyss.c ---- linux-2.6.32.46/drivers/net/tokenring/abyss.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tokenring/abyss.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tokenring/abyss.c linux-2.6.32.48/drivers/net/tokenring/abyss.c +--- linux-2.6.32.48/drivers/net/tokenring/abyss.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tokenring/abyss.c 2011-11-12 12:46:45.000000000 -0500 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = static int __init abyss_init (void) @@ -35686,9 +35663,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tokenring/abyss.c linux-2.6.32.46/drivers return pci_register_driver(&abyss_driver); } -diff -urNp linux-2.6.32.46/drivers/net/tokenring/madgemc.c linux-2.6.32.46/drivers/net/tokenring/madgemc.c ---- linux-2.6.32.46/drivers/net/tokenring/madgemc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tokenring/madgemc.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tokenring/madgemc.c linux-2.6.32.48/drivers/net/tokenring/madgemc.c +--- linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tokenring/madgemc.c 2011-11-12 12:46:45.000000000 -0500 @@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver static int __init madgemc_init (void) @@ -35704,9 +35681,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tokenring/madgemc.c linux-2.6.32.46/drive return mca_register_driver (&madgemc_driver); } -diff -urNp linux-2.6.32.46/drivers/net/tokenring/proteon.c linux-2.6.32.46/drivers/net/tokenring/proteon.c ---- linux-2.6.32.46/drivers/net/tokenring/proteon.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tokenring/proteon.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tokenring/proteon.c linux-2.6.32.48/drivers/net/tokenring/proteon.c +--- linux-2.6.32.48/drivers/net/tokenring/proteon.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tokenring/proteon.c 2011-11-12 12:46:45.000000000 -0500 @@ -353,9 +353,11 @@ static int __init proteon_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -35722,9 +35699,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tokenring/proteon.c linux-2.6.32.46/drive err = platform_driver_register(&proteon_driver); if (err) -diff -urNp linux-2.6.32.46/drivers/net/tokenring/skisa.c linux-2.6.32.46/drivers/net/tokenring/skisa.c ---- linux-2.6.32.46/drivers/net/tokenring/skisa.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tokenring/skisa.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tokenring/skisa.c linux-2.6.32.48/drivers/net/tokenring/skisa.c +--- linux-2.6.32.48/drivers/net/tokenring/skisa.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tokenring/skisa.c 2011-11-12 12:46:45.000000000 -0500 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -35740,9 +35717,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tokenring/skisa.c linux-2.6.32.46/drivers err = platform_driver_register(&sk_isa_driver); if (err) -diff -urNp linux-2.6.32.46/drivers/net/tulip/de2104x.c linux-2.6.32.46/drivers/net/tulip/de2104x.c ---- linux-2.6.32.46/drivers/net/tulip/de2104x.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tulip/de2104x.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tulip/de2104x.c linux-2.6.32.48/drivers/net/tulip/de2104x.c +--- linux-2.6.32.48/drivers/net/tulip/de2104x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tulip/de2104x.c 2011-11-12 12:46:45.000000000 -0500 @@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_i struct de_srom_info_leaf *il; void *bufp; @@ -35752,9 +35729,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tulip/de2104x.c linux-2.6.32.46/drivers/n /* download entire eeprom */ for (i = 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] = -diff -urNp linux-2.6.32.46/drivers/net/tulip/de4x5.c linux-2.6.32.46/drivers/net/tulip/de4x5.c ---- linux-2.6.32.46/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/tulip/de4x5.c linux-2.6.32.48/drivers/net/tulip/de4x5.c +--- linux-2.6.32.48/drivers/net/tulip/de4x5.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/tulip/de4x5.c 2011-11-12 12:46:45.000000000 -0500 @@ -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]; @@ -35773,9 +35750,9 @@ diff -urNp linux-2.6.32.46/drivers/net/tulip/de4x5.c linux-2.6.32.46/drivers/net return -EFAULT; break; } -diff -urNp linux-2.6.32.46/drivers/net/usb/hso.c linux-2.6.32.46/drivers/net/usb/hso.c ---- linux-2.6.32.46/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/usb/hso.c linux-2.6.32.48/drivers/net/usb/hso.c +--- linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/usb/hso.c 2011-11-12 12:46:45.000000000 -0500 @@ -71,7 +71,7 @@ #include <asm/byteorder.h> #include <linux/serial_core.h> @@ -35863,9 +35840,9 @@ diff -urNp linux-2.6.32.46/drivers/net/usb/hso.c linux-2.6.32.46/drivers/net/usb result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-config.h linux-2.6.32.46/drivers/net/vxge/vxge-config.h ---- linux-2.6.32.46/drivers/net/vxge/vxge-config.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/vxge/vxge-config.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-config.h linux-2.6.32.48/drivers/net/vxge/vxge-config.h +--- linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/vxge/vxge-config.h 2011-11-12 12:46:45.000000000 -0500 @@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs { void (*link_down)(struct __vxge_hw_device *devh); void (*crit_err)(struct __vxge_hw_device *devh, @@ -35875,9 +35852,9 @@ diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-config.h linux-2.6.32.46/driver /* * struct __vxge_hw_blockpool_entry - Block private data structure -diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-main.c linux-2.6.32.46/drivers/net/vxge/vxge-main.c ---- linux-2.6.32.46/drivers/net/vxge/vxge-main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/vxge/vxge-main.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-main.c linux-2.6.32.48/drivers/net/vxge/vxge-main.c +--- linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/vxge/vxge-main.c 2011-11-12 12:46:45.000000000 -0500 @@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_T struct sk_buff *completed[NR_SKB_COMPLETED]; int more; @@ -35896,9 +35873,9 @@ diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-main.c linux-2.6.32.46/drivers/ /* * Filling * - itable with bucket numbers -diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h ---- linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h +--- linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/vxge/vxge-traffic.h 2011-11-12 12:46:45.000000000 -0500 @@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs { struct vxge_hw_mempool_dma *dma_object, u32 index, @@ -35908,9 +35885,9 @@ diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h linux-2.6.32.46/drive void __vxge_hw_mempool_destroy( -diff -urNp linux-2.6.32.46/drivers/net/wan/cycx_x25.c linux-2.6.32.46/drivers/net/wan/cycx_x25.c ---- linux-2.6.32.46/drivers/net/wan/cycx_x25.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wan/cycx_x25.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wan/cycx_x25.c linux-2.6.32.48/drivers/net/wan/cycx_x25.c +--- linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wan/cycx_x25.c 2011-11-12 12:46:45.000000000 -0500 @@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned unsigned char hex[1024], * phex = hex; @@ -35920,9 +35897,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wan/cycx_x25.c linux-2.6.32.46/drivers/ne if (len >= (sizeof(hex) / 2)) len = (sizeof(hex) / 2) - 1; -diff -urNp linux-2.6.32.46/drivers/net/wan/hdlc_x25.c linux-2.6.32.46/drivers/net/wan/hdlc_x25.c ---- linux-2.6.32.46/drivers/net/wan/hdlc_x25.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wan/hdlc_x25.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wan/hdlc_x25.c linux-2.6.32.48/drivers/net/wan/hdlc_x25.c +--- linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wan/hdlc_x25.c 2011-11-12 12:46:45.000000000 -0500 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu static int x25_open(struct net_device *dev) @@ -35948,9 +35925,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wan/hdlc_x25.c linux-2.6.32.46/drivers/ne result = lapb_register(dev, &cb); if (result != LAPB_OK) return result; -diff -urNp linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c ---- linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c +--- linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wimax/i2400m/usb-fw.c 2011-11-12 12:46:45.000000000 -0500 @@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru int do_autopm = 1; DECLARE_COMPLETION_ONSTACK(notif_completion); @@ -35960,9 +35937,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.46/dri d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack == i2400m->bm_ack_buf); -diff -urNp linux-2.6.32.46/drivers/net/wireless/airo.c linux-2.6.32.46/drivers/net/wireless/airo.c ---- linux-2.6.32.46/drivers/net/wireless/airo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/airo.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/airo.c linux-2.6.32.48/drivers/net/wireless/airo.c +--- linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/airo.c 2011-11-12 12:46:45.000000000 -0500 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s BSSListElement * loop_net; BSSListElement * tmp_net; @@ -36017,9 +35994,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/airo.c linux-2.6.32.46/drivers/n /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { -diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c ---- linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c +--- linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/ath/ath5k/debug.c 2011-11-12 12:46:45.000000000 -0500 @@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct f unsigned int v; u64 tsf; @@ -36038,9 +36015,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.4 len += snprintf(buf+len, sizeof(buf)-len, "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level); -diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c ---- linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c +--- linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/ath/ath9k/debug.c 2011-11-12 12:46:45.000000000 -0500 @@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struc char buf[512]; unsigned int len = 0; @@ -36059,9 +36036,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.4 len += snprintf(buf + len, sizeof(buf) - len, "primary: %s (%s chan=%d ht=%d)\n", wiphy_name(sc->pri_wiphy->hw->wiphy), -diff -urNp linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/b43/debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -43,7 +43,7 @@ static struct dentry *rootdir; struct b43_debugfs_fops { ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); @@ -36071,9 +36048,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c linux-2.6.32.46/dr /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/b43legacy/debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -44,7 +44,7 @@ static struct dentry *rootdir; struct b43legacy_debugfs_fops { ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); @@ -36083,9 +36060,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ size_t file_struct_offset; /* Take wl->irq_lock before calling read/write? */ -diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c ---- linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c +--- linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:46:45.000000000 -0500 @@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2 int err; DECLARE_SSID_BUF(ssid); @@ -36104,9 +36081,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.4 IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n", idx, keylen, len); -diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c ---- linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c +--- linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-12 12:46:45.000000000 -0500 @@ -1566,6 +1566,8 @@ static void libipw_process_probe_respons unsigned long flags; DECLARE_SSID_BUF(ssid); @@ -36116,9 +36093,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32 LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-11-12 12:46:45.000000000 -0500 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -36128,9 +36105,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl1000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-11-12 12:46:45.000000000 -0500 @@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_ */ if (iwl3945_mod_params.disable_hw_scan) { @@ -36142,9 +36119,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6 } -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-11-12 12:46:45.000000000 -0500 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -36154,9 +36131,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32. .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-11-12 12:46:45.000000000 -0500 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -36166,9 +36143,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32. .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-11-12 12:46:45.000000000 -0500 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -36186,9 +36163,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-11-12 12:46:45.000000000 -0500 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -36198,9 +36175,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32. .ucode = &iwl5000_ucode, .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-11-12 12:46:45.000000000 -0500 @@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev if (iwl_debug_level & IWL_DL_INFO) dev_printk(KERN_DEBUG, &(pdev->dev), @@ -36212,9 +36189,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.4 } hw = iwl_alloc_all(cfg, &iwl_hw_ops); -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:46:45.000000000 -0500 @@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, s u8 active_index = 0; s32 tpt = 0; @@ -36233,9 +36210,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.3 /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(str int pos = 0; const size_t bufsz = sizeof(buf); @@ -36254,9 +36231,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6. for (i = 0; i < AC_NUM; i++) { pos += scnprintf(buf + pos, bufsz - pos, "\tcw_min\tcw_max\taifsn\ttxop\n"); -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-12 12:46:45.000000000 -0500 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri #endif @@ -36268,9 +36245,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, void *p, u32 len) {} -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-11-12 12:46:45.000000000 -0500 @@ -68,7 +68,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -36280,9 +36257,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.4 extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c ---- linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c +--- linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(s int buf_len = 512; size_t len = 0; @@ -36292,9 +36269,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6 if (*ppos != 0) return 0; if (count < sizeof(buf)) -diff -urNp linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/libertas/debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -36304,9 +36281,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c linux-2.6.32. }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c ---- linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:46:45.000000000 -0500 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn devdbg(usbdev, "set_rts_threshold %i", rts_threshold); @@ -36316,9 +36293,9 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c linux-2.6.32.46/dri rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-2.6.32.46/drivers/oprofile/buffer_sync.c linux-2.6.32.46/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.46/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/buffer_sync.c linux-2.6.32.48/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/buffer_sync.c 2011-11-12 12:46:45.000000000 -0500 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -36354,9 +36331,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/buffer_sync.c linux-2.6.32.46/driver } } release_mm(mm); -diff -urNp linux-2.6.32.46/drivers/oprofile/event_buffer.c linux-2.6.32.46/drivers/oprofile/event_buffer.c ---- linux-2.6.32.46/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/event_buffer.c linux-2.6.32.48/drivers/oprofile/event_buffer.c +--- linux-2.6.32.48/drivers/oprofile/event_buffer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/event_buffer.c 2011-11-12 12:46:45.000000000 -0500 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -36366,9 +36343,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/event_buffer.c linux-2.6.32.46/drive return; } -diff -urNp linux-2.6.32.46/drivers/oprofile/oprof.c linux-2.6.32.46/drivers/oprofile/oprof.c ---- linux-2.6.32.46/drivers/oprofile/oprof.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/oprof.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/oprof.c linux-2.6.32.48/drivers/oprofile/oprof.c +--- linux-2.6.32.48/drivers/oprofile/oprof.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/oprof.c 2011-11-12 12:46:45.000000000 -0500 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -36378,9 +36355,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprof.c linux-2.6.32.46/drivers/opro start_switch_worker(); } -diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.46/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/oprofilefs.c linux-2.6.32.48/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/oprofilefs.c 2011-11-12 12:46:45.000000000 -0500 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -36390,9 +36367,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.c linux-2.6.32.46/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.46/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.c linux-2.6.32.48/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.c 2011-11-12 12:46:45.000000000 -0500 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -36410,9 +36387,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.c linux-2.6.32.46/dri } -diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.h linux-2.6.32.46/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.46/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/oprofile/oprofile_stats.h linux-2.6.32.48/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/oprofile/oprofile_stats.h 2011-11-12 12:46:45.000000000 -0500 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -36430,9 +36407,9 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.h linux-2.6.32.46/dri }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.46/drivers/parisc/pdc_stable.c linux-2.6.32.46/drivers/parisc/pdc_stable.c ---- linux-2.6.32.46/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/parisc/pdc_stable.c linux-2.6.32.48/drivers/parisc/pdc_stable.c +--- linux-2.6.32.48/drivers/parisc/pdc_stable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/parisc/pdc_stable.c 2011-11-12 12:46:45.000000000 -0500 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -36442,9 +36419,9 @@ diff -urNp linux-2.6.32.46/drivers/parisc/pdc_stable.c linux-2.6.32.46/drivers/p .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.46/drivers/parport/procfs.c linux-2.6.32.46/drivers/parport/procfs.c ---- linux-2.6.32.46/drivers/parport/procfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/parport/procfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/parport/procfs.c linux-2.6.32.48/drivers/parport/procfs.c +--- linux-2.6.32.48/drivers/parport/procfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/parport/procfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -36463,9 +36440,9 @@ diff -urNp linux-2.6.32.46/drivers/parport/procfs.c linux-2.6.32.46/drivers/parp } #endif /* IEEE1284.3 support. */ -diff -urNp linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/hotplug/acpiphp_glue.c 2011-11-12 12:46:45.000000000 -0500 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -36475,9 +36452,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.46/dr .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h ---- linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h +--- linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/hotplug/cpci_hotplug.h 2011-11-12 12:46:45.000000000 -0500 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops { int (*hardware_test) (struct slot* slot, u32 value); u8 (*get_power) (struct slot* slot); @@ -36487,9 +36464,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.46/dr struct cpci_hp_controller { unsigned int irq; -diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-12 12:46:45.000000000 -0500 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -36504,9 +36481,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.46/dr dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.46/drivers/pci/hotplug/fakephp.c linux-2.6.32.46/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.46/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/hotplug/fakephp.c linux-2.6.32.48/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/hotplug/fakephp.c 2011-11-12 12:46:45.000000000 -0500 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -36516,9 +36493,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/hotplug/fakephp.c linux-2.6.32.46/drivers .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.46/drivers/pci/intel-iommu.c linux-2.6.32.46/drivers/pci/intel-iommu.c ---- linux-2.6.32.46/drivers/pci/intel-iommu.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/intel-iommu.c 2011-05-10 22:12:33.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/intel-iommu.c linux-2.6.32.48/drivers/pci/intel-iommu.c +--- linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/intel-iommu.c 2011-11-12 12:46:45.000000000 -0500 @@ -2643,7 +2643,7 @@ error: return 0; } @@ -36588,9 +36565,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/intel-iommu.c linux-2.6.32.46/drivers/pci .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.46/drivers/pci/pcie/aspm.c linux-2.6.32.46/drivers/pci/pcie/aspm.c ---- linux-2.6.32.46/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/pcie/aspm.c linux-2.6.32.48/drivers/pci/pcie/aspm.c +--- linux-2.6.32.48/drivers/pci/pcie/aspm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/pcie/aspm.c 2011-11-12 12:46:45.000000000 -0500 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." @@ -36604,9 +36581,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/pcie/aspm.c linux-2.6.32.46/drivers/pci/p #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) -diff -urNp linux-2.6.32.46/drivers/pci/probe.c linux-2.6.32.46/drivers/pci/probe.c ---- linux-2.6.32.46/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/probe.c linux-2.6.32.48/drivers/pci/probe.c +--- linux-2.6.32.48/drivers/pci/probe.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/probe.c 2011-11-12 12:46:45.000000000 -0500 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( return ret; } @@ -36624,9 +36601,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/probe.c linux-2.6.32.46/drivers/pci/probe struct device_attribute *attr, char *buf) { -diff -urNp linux-2.6.32.46/drivers/pci/proc.c linux-2.6.32.46/drivers/pci/proc.c ---- linux-2.6.32.46/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/proc.c linux-2.6.32.48/drivers/pci/proc.c +--- linux-2.6.32.48/drivers/pci/proc.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/proc.c 2011-11-12 12:46:45.000000000 -0500 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -36644,9 +36621,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/proc.c linux-2.6.32.46/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.32.46/drivers/pci/slot.c linux-2.6.32.46/drivers/pci/slot.c ---- linux-2.6.32.46/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pci/slot.c linux-2.6.32.48/drivers/pci/slot.c +--- linux-2.6.32.48/drivers/pci/slot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pci/slot.c 2011-11-12 12:46:45.000000000 -0500 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -36656,9 +36633,9 @@ diff -urNp linux-2.6.32.46/drivers/pci/slot.c linux-2.6.32.46/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c ---- linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c +--- linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pcmcia/pcmcia_ioctl.c 2011-11-12 12:46:45.000000000 -0500 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode return -EFAULT; } @@ -36668,9 +36645,9 @@ diff -urNp linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.46/drivers if (!buf) return -ENOMEM; -diff -urNp linux-2.6.32.46/drivers/platform/x86/acer-wmi.c linux-2.6.32.46/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.46/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/acer-wmi.c linux-2.6.32.48/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/acer-wmi.c 2011-11-12 12:46:45.000000000 -0500 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -36680,9 +36657,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/acer-wmi.c linux-2.6.32.46/drive .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.46/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/asus_acpi.c linux-2.6.32.48/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/asus_acpi.c 2011-11-12 12:46:45.000000000 -0500 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -36692,9 +36669,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/driv .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/asus-laptop.c linux-2.6.32.48/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/asus-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -36704,9 +36681,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/dr .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/compal-laptop.c linux-2.6.32.46/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/compal-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/compal-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/compal-laptop.c linux-2.6.32.48/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/compal-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -36716,9 +36693,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/compal-laptop.c linux-2.6.32.46/ .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/dell-laptop.c linux-2.6.32.46/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:33.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/dell-laptop.c linux-2.6.32.48/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/dell-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -36728,9 +36705,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/dell-laptop.c linux-2.6.32.46/dr .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/eeepc-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -36740,9 +36717,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.46/d .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/fujitsu-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -36752,9 +36729,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.46 .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/msi-laptop.c linux-2.6.32.46/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/msi-laptop.c linux-2.6.32.48/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/msi-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -36764,9 +36741,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/msi-laptop.c linux-2.6.32.46/dri .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/panasonic-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -36776,9 +36753,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c linux-2.6.32. .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/sony-laptop.c linux-2.6.32.46/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.46/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/sony-laptop.c linux-2.6.32.48/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/sony-laptop.c 2011-11-12 12:46:45.000000000 -0500 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -36788,10 +36765,10 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/sony-laptop.c linux-2.6.32.46/dr .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c 2011-08-05 20:33:55.000000000 -0400 -@@ -2137,7 +2137,7 @@ static int hotkey_mask_get(void) +diff -urNp linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:46:45.000000000 -0500 +@@ -2139,7 +2139,7 @@ static int hotkey_mask_get(void) return 0; } @@ -36800,7 +36777,7 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.46/ { /* log only what the user can fix... */ const u32 wantedmask = hotkey_driver_mask & -@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha +@@ -6125,7 +6125,7 @@ static void tpacpi_brightness_notify_cha BACKLIGHT_UPDATE_HOTKEY); } @@ -36809,9 +36786,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.46/ .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/platform/x86/toshiba_acpi.c 2011-11-12 12:46:45.000000000 -0500 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -36821,9 +36798,9 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.46/d .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pnp/pnpbios/bioscalls.c 2011-11-12 12:46:45.000000000 -0500 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -36880,9 +36857,9 @@ diff -urNp linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.46/drive + + pax_close_kernel(); } -diff -urNp linux-2.6.32.46/drivers/pnp/resource.c linux-2.6.32.46/drivers/pnp/resource.c ---- linux-2.6.32.46/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/pnp/resource.c linux-2.6.32.48/drivers/pnp/resource.c +--- linux-2.6.32.48/drivers/pnp/resource.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/pnp/resource.c 2011-11-12 12:46:45.000000000 -0500 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -36901,9 +36878,9 @@ diff -urNp linux-2.6.32.46/drivers/pnp/resource.c linux-2.6.32.46/drivers/pnp/re return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.46/drivers/power/bq27x00_battery.c linux-2.6.32.46/drivers/power/bq27x00_battery.c ---- linux-2.6.32.46/drivers/power/bq27x00_battery.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/power/bq27x00_battery.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/power/bq27x00_battery.c linux-2.6.32.48/drivers/power/bq27x00_battery.c +--- linux-2.6.32.48/drivers/power/bq27x00_battery.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/power/bq27x00_battery.c 2011-11-12 12:46:45.000000000 -0500 @@ -44,7 +44,7 @@ struct bq27x00_device_info; struct bq27x00_access_methods { int (*read)(u8 reg, int *rt_value, int b_single, @@ -36913,9 +36890,9 @@ diff -urNp linux-2.6.32.46/drivers/power/bq27x00_battery.c linux-2.6.32.46/drive struct bq27x00_device_info { struct device *dev; -diff -urNp linux-2.6.32.46/drivers/rtc/rtc-dev.c linux-2.6.32.46/drivers/rtc/rtc-dev.c ---- linux-2.6.32.46/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/rtc/rtc-dev.c linux-2.6.32.48/drivers/rtc/rtc-dev.c +--- linux-2.6.32.48/drivers/rtc/rtc-dev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/rtc/rtc-dev.c 2011-11-12 12:46:45.000000000 -0500 @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/rtc.h> @@ -36933,9 +36910,9 @@ diff -urNp linux-2.6.32.46/drivers/rtc/rtc-dev.c linux-2.6.32.46/drivers/rtc/rtc return rtc_set_time(rtc, &tm); case RTC_PIE_ON: -diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.c linux-2.6.32.46/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.46/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.c linux-2.6.32.48/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.c 2011-11-12 12:46:45.000000000 -0500 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -37011,9 +36988,9 @@ diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.c linux-2.6.32.46/drivers/ seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.h linux-2.6.32.46/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.46/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/s390/cio/qdio_perf.h linux-2.6.32.48/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/s390/cio/qdio_perf.h 2011-11-12 12:46:45.000000000 -0500 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -37086,9 +37063,9 @@ diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.h linux-2.6.32.46/drivers/ } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h ---- linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h +--- linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/aacraid/aacraid.h 2011-11-12 12:46:45.000000000 -0500 @@ -471,7 +471,7 @@ struct adapter_ops int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd); /* Administrative operations */ @@ -37098,9 +37075,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h linux-2.6.32.46/driver /* * Define which interrupt handler needs to be installed -diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c ---- linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c +--- linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:46:45.000000000 -0500 @@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d u32 actual_fibsize64, actual_fibsize = 0; int i; @@ -37109,9 +37086,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c linux-2.6.32.46/drive if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); -diff -urNp linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-12 12:46:45.000000000 -0500 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru flash_error_table[i].reason); } @@ -37121,9 +37098,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.46/d asd_show_update_bios, asd_store_update_bios); static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) -diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h ---- linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h +--- linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/bfa/bfa_iocfc.h 2011-11-12 12:46:45.000000000 -0500 @@ -61,7 +61,7 @@ struct bfa_hwif_s { void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix); void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap, @@ -37133,9 +37110,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/ typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status); struct bfa_iocfc_s { -diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h ---- linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h +--- linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/bfa/bfa_ioc.h 2011-11-12 12:46:45.000000000 -0500 @@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s { bfa_ioc_disable_cbfn_t disable_cbfn; bfa_ioc_hbfail_cbfn_t hbfail_cbfn; @@ -37145,9 +37122,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/sc /** * Heartbeat failure notification queue element. -diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/BusLogic.c ---- linux-2.6.32.46/drivers/scsi/BusLogic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/BusLogic.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/BusLogic.c linux-2.6.32.48/drivers/scsi/BusLogic.c +--- linux-2.6.32.48/drivers/scsi/BusLogic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/BusLogic.c 2011-11-12 12:46:45.000000000 -0500 @@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter *PrototypeHostAdapter) @@ -37157,9 +37134,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/ /* If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint Host Adapters; otherwise, default to the standard ISA MultiMaster probe. -diff -urNp linux-2.6.32.46/drivers/scsi/dpt_i2o.c linux-2.6.32.46/drivers/scsi/dpt_i2o.c ---- linux-2.6.32.46/drivers/scsi/dpt_i2o.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/dpt_i2o.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/dpt_i2o.c linux-2.6.32.48/drivers/scsi/dpt_i2o.c +--- linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/dpt_i2o.c 2011-11-12 12:46:45.000000000 -0500 @@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* p dma_addr_t addr; ulong flags = 0; @@ -37178,9 +37155,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/dpt_i2o.c linux-2.6.32.46/drivers/scsi/d memset(msg, 0 , sizeof(msg)); len = scsi_bufflen(cmd); direction = 0x00000000; -diff -urNp linux-2.6.32.46/drivers/scsi/eata.c linux-2.6.32.46/drivers/scsi/eata.c ---- linux-2.6.32.46/drivers/scsi/eata.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/eata.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/eata.c linux-2.6.32.48/drivers/scsi/eata.c +--- linux-2.6.32.48/drivers/scsi/eata.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/eata.c 2011-11-12 12:46:45.000000000 -0500 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por struct hostdata *ha; char name[16]; @@ -37190,9 +37167,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/eata.c linux-2.6.32.46/drivers/scsi/eata sprintf(name, "%s%d", driver_name, j); if (!request_region(port_base, REGION_SIZE, driver_name)) { -diff -urNp linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c ---- linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c +--- linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/fcoe/libfcoe.c 2011-11-12 12:46:45.000000000 -0500 @@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fc size_t rlen; size_t dlen; @@ -37202,9 +37179,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.46/drivers/s fiph = (struct fip_header *)skb->data; sub = fiph->fip_subcode; if (sub != FIP_SC_REQ && sub != FIP_SC_REP) -diff -urNp linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c ---- linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c +--- linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/fnic/fnic_main.c 2011-11-12 12:46:45.000000000 -0500 @@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p /* Start local port initiatialization */ @@ -37214,9 +37191,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c linux-2.6.32.46/drivers lp->max_retry_count = fnic->config.flogi_retries; lp->max_rport_retry_count = fnic->config.plogi_retries; -diff -urNp linux-2.6.32.46/drivers/scsi/gdth.c linux-2.6.32.46/drivers/scsi/gdth.c ---- linux-2.6.32.46/drivers/scsi/gdth.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/gdth.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/gdth.c linux-2.6.32.48/drivers/scsi/gdth.c +--- linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/gdth.c 2011-11-12 12:46:45.000000000 -0500 @@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg) ulong flags; gdth_ha_str *ha; @@ -37254,9 +37231,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/gdth.c linux-2.6.32.46/drivers/scsi/gdth memset(cmnd, 0xff, MAX_COMMAND_SIZE); TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); -diff -urNp linux-2.6.32.46/drivers/scsi/gdth_proc.c linux-2.6.32.46/drivers/scsi/gdth_proc.c ---- linux-2.6.32.46/drivers/scsi/gdth_proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/gdth_proc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/gdth_proc.c linux-2.6.32.48/drivers/scsi/gdth_proc.c +--- linux-2.6.32.48/drivers/scsi/gdth_proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/gdth_proc.c 2011-11-12 12:46:45.000000000 -0500 @@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi ulong64 paddr; @@ -37276,9 +37253,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/gdth_proc.c linux-2.6.32.46/drivers/scsi gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr = kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) -diff -urNp linux-2.6.32.46/drivers/scsi/hosts.c linux-2.6.32.46/drivers/scsi/hosts.c ---- linux-2.6.32.46/drivers/scsi/hosts.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/hosts.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/hosts.c linux-2.6.32.48/drivers/scsi/hosts.c +--- linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/hosts.c 2011-11-12 12:46:45.000000000 -0500 @@ -40,7 +40,7 @@ #include "scsi_logging.h" @@ -37297,9 +37274,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/hosts.c linux-2.6.32.46/drivers/scsi/hos shost->dma_channel = 0xff; /* These three are default values which can be overridden */ -diff -urNp linux-2.6.32.46/drivers/scsi/ipr.c linux-2.6.32.46/drivers/scsi/ipr.c ---- linux-2.6.32.46/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/ipr.c linux-2.6.32.48/drivers/scsi/ipr.c +--- linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/ipr.c 2011-11-12 12:46:45.000000000 -0500 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -37309,9 +37286,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/ipr.c linux-2.6.32.46/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.32.46/drivers/scsi/ips.h linux-2.6.32.46/drivers/scsi/ips.h ---- linux-2.6.32.46/drivers/scsi/ips.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/ips.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/ips.h linux-2.6.32.48/drivers/scsi/ips.h +--- linux-2.6.32.48/drivers/scsi/ips.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/ips.h 2011-11-12 12:46:45.000000000 -0500 @@ -1027,7 +1027,7 @@ typedef struct { int (*intr)(struct ips_ha *); void (*enableint)(struct ips_ha *); @@ -37321,9 +37298,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/ips.h linux-2.6.32.46/drivers/scsi/ips.h typedef struct ips_ha { uint8_t ha_id[IPS_MAX_CHANNELS+1]; -diff -urNp linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/libfc/fc_exch.c 2011-11-12 12:46:45.000000000 -0500 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -37445,9 +37422,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c linux-2.6.32.46/drivers/ fc_frame_free(fp); } -diff -urNp linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:46:45.000000000 -0500 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -37457,9 +37434,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c linux-2.6.32.46/drivers .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c ---- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c +--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -124,7 +124,7 @@ struct lpfc_debug { int len; }; @@ -37548,9 +37525,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/driv snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = -diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h ---- linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h +--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc.h 2011-11-12 12:46:45.000000000 -0500 @@ -400,7 +400,7 @@ struct lpfc_vport { struct dentry *debug_nodelist; struct dentry *vport_debugfs_root; @@ -37580,9 +37557,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi #endif /* Used for deferred freeing of ELS data buffers */ -diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c ---- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c +--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:46:45.000000000 -0500 @@ -8021,8 +8021,10 @@ lpfc_init(void) printk(LPFC_COPYRIGHT "\n"); @@ -37596,9 +37573,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.46/drivers } lpfc_transport_template = fc_attach_transport(&lpfc_transport_functions); -diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c ---- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c +--- linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-12 12:46:45.000000000 -0500 @@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb uint32_t evt_posted; @@ -37650,9 +37627,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.46/drivers } /** -diff -urNp linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c ---- linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c +--- linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-12 12:46:45.000000000 -0500 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter int rval; int i; @@ -37662,9 +37639,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.46 // Allocate memory for the base list of scb for management module. adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL); -diff -urNp linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c ---- linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c +--- linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/osd/osd_initiator.c 2011-11-12 12:46:45.000000000 -0500 @@ -94,6 +94,8 @@ static int _osd_print_system_info(struct int nelem = ARRAY_SIZE(get_attrs), a = 0; int ret; @@ -37674,9 +37651,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c linux-2.6.32.46/driv or = osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; -diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.c linux-2.6.32.46/drivers/scsi/pmcraid.c ---- linux-2.6.32.46/drivers/scsi/pmcraid.c 2011-08-09 18:35:29.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/pmcraid.c 2011-08-09 18:33:59.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.c linux-2.6.32.48/drivers/scsi/pmcraid.c +--- linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/pmcraid.c 2011-11-12 12:46:45.000000000 -0500 @@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc res->scsi_dev = scsi_dev; scsi_dev->hostdata = res; @@ -37727,9 +37704,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.c linux-2.6.32.46/drivers/scsi/p schedule_work(&pinstance->worker_q); return rc; -diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.h linux-2.6.32.46/drivers/scsi/pmcraid.h ---- linux-2.6.32.46/drivers/scsi/pmcraid.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/pmcraid.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/pmcraid.h linux-2.6.32.48/drivers/scsi/pmcraid.h +--- linux-2.6.32.48/drivers/scsi/pmcraid.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/pmcraid.h 2011-11-12 12:46:45.000000000 -0500 @@ -690,7 +690,7 @@ struct pmcraid_instance { atomic_t outstanding_cmds; @@ -37750,9 +37727,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.h linux-2.6.32.46/drivers/scsi/p /* To indicate add/delete/modify during CCN */ u8 change_detected; -diff -urNp linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h ---- linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h +--- linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/qla2xxx/qla_def.h 2011-11-12 12:46:45.000000000 -0500 @@ -2089,7 +2089,7 @@ struct isp_operations { int (*get_flash_version) (struct scsi_qla_host *, void *); @@ -37762,9 +37739,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.46/driver /* MSI-X Support *************************************************************/ -diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h ---- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h +--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_def.h 2011-11-12 12:46:45.000000000 -0500 @@ -240,7 +240,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ @@ -37774,9 +37751,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.46/driver * retried */ uint16_t port; -diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c ---- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c +--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_init.c 2011-11-12 12:46:45.000000000 -0500 @@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_ atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count); atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); @@ -37795,9 +37772,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.46/drive atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); clear_bit(DF_NO_RELOGIN, &ddb_entry->flags); -diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c ---- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c +--- linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/qla4xxx/ql4_os.c 2011-11-12 12:46:45.000000000 -0500 @@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED) { @@ -37814,9 +37791,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.46/drivers relogin_retry_count)) ); start_dpc++; -diff -urNp linux-2.6.32.46/drivers/scsi/scsi.c linux-2.6.32.46/drivers/scsi/scsi.c ---- linux-2.6.32.46/drivers/scsi/scsi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi.c linux-2.6.32.48/drivers/scsi/scsi.c +--- linux-2.6.32.48/drivers/scsi/scsi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi.c 2011-11-12 12:46:45.000000000 -0500 @@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * unsigned long timeout; int rtn = 0; @@ -37826,9 +37803,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi.c linux-2.6.32.46/drivers/scsi/scsi /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_debug.c linux-2.6.32.46/drivers/scsi/scsi_debug.c ---- linux-2.6.32.46/drivers/scsi/scsi_debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_debug.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_debug.c linux-2.6.32.48/drivers/scsi/scsi_debug.c +--- linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_debug.c 2011-11-12 12:46:45.000000000 -0500 @@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_ unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; @@ -37847,9 +37824,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_debug.c linux-2.6.32.46/drivers/scs if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_lib.c linux-2.6.32.46/drivers/scsi/scsi_lib.c ---- linux-2.6.32.46/drivers/scsi/scsi_lib.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_lib.c 2011-05-10 22:12:33.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_lib.c linux-2.6.32.48/drivers/scsi/scsi_lib.c +--- linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_lib.c 2011-11-12 12:46:45.000000000 -0500 @@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req scsi_init_cmd_errh(cmd); @@ -37871,9 +37848,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_lib.c linux-2.6.32.46/drivers/scsi/ disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_sysfs.c linux-2.6.32.46/drivers/scsi/scsi_sysfs.c ---- linux-2.6.32.46/drivers/scsi/scsi_sysfs.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_sysfs.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_sysfs.c linux-2.6.32.48/drivers/scsi/scsi_sysfs.c +--- linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev, char *buf) \ { \ @@ -37883,9 +37860,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_sysfs.c linux-2.6.32.46/drivers/scs return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c ---- linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c +--- linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_tgt_lib.c 2011-11-12 12:46:45.000000000 -0500 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc int err; @@ -37895,9 +37872,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_tgt_lib.c linux-2.6.32.46/drivers/s if (err) { /* * TODO: need to fixup sg_tablesize, max_segment_size, -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c ---- linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c +--- linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:46:45.000000000 -0500 @@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo, * Netlink Infrastructure */ @@ -37925,9 +37902,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c linux-2.6.32.46/driv error = transport_class_register(&fc_host_class); if (error) -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c ---- linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c +--- linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:46:45.000000000 -0500 @@ -81,7 +81,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; @@ -37955,9 +37932,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.46/d err = class_register(&iscsi_transport_class); if (err) -diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c ---- linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c +--- linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/scsi_transport_srp.c 2011-11-12 12:46:45.000000000 -0500 @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" @@ -37985,9 +37962,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c linux-2.6.32.46/dri dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); transport_setup_device(&rport->dev); -diff -urNp linux-2.6.32.46/drivers/scsi/sg.c linux-2.6.32.46/drivers/scsi/sg.c ---- linux-2.6.32.46/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/sg.c 2011-10-06 09:37:08.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/sg.c linux-2.6.32.48/drivers/scsi/sg.c +--- linux-2.6.32.48/drivers/scsi/sg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/sg.c 2011-11-12 12:46:45.000000000 -0500 @@ -1064,7 +1064,7 @@ sg_ioctl(struct inode *inode, struct fil sdp->disk->disk_name, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), @@ -38015,9 +37992,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/sg.c linux-2.6.32.46/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c ---- linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c +--- linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-12 12:46:45.000000000 -0500 @@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct p int do_iounmap = 0; int do_disable_device = 1; @@ -38027,9 +38004,9 @@ diff -urNp linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.46/d memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev = pdev; -diff -urNp linux-2.6.32.46/drivers/serial/kgdboc.c linux-2.6.32.46/drivers/serial/kgdboc.c ---- linux-2.6.32.46/drivers/serial/kgdboc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/serial/kgdboc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/serial/kgdboc.c linux-2.6.32.48/drivers/serial/kgdboc.c +--- linux-2.6.32.48/drivers/serial/kgdboc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/serial/kgdboc.c 2011-11-12 12:46:45.000000000 -0500 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -38048,9 +38025,9 @@ diff -urNp linux-2.6.32.46/drivers/serial/kgdboc.c linux-2.6.32.46/drivers/seria .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.46/drivers/spi/spi.c linux-2.6.32.46/drivers/spi/spi.c ---- linux-2.6.32.46/drivers/spi/spi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/spi/spi.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/spi/spi.c linux-2.6.32.48/drivers/spi/spi.c +--- linux-2.6.32.48/drivers/spi/spi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/spi/spi.c 2011-11-12 12:46:45.000000000 -0500 @@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str EXPORT_SYMBOL_GPL(spi_sync); @@ -38060,9 +38037,9 @@ diff -urNp linux-2.6.32.46/drivers/spi/spi.c linux-2.6.32.46/drivers/spi/spi.c static u8 *buf; -diff -urNp linux-2.6.32.46/drivers/staging/android/binder.c linux-2.6.32.46/drivers/staging/android/binder.c ---- linux-2.6.32.46/drivers/staging/android/binder.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/android/binder.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/android/binder.c linux-2.6.32.48/drivers/staging/android/binder.c +--- linux-2.6.32.48/drivers/staging/android/binder.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/android/binder.c 2011-11-12 12:46:45.000000000 -0500 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -38072,9 +38049,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/android/binder.c linux-2.6.32.46/driv .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/b3dfg/b3dfg.c 2011-11-12 12:46:45.000000000 -0500 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -38093,9 +38070,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.46/drivers .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:35:29.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:34:00.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/comedi/comedi_fops.c 2011-11-12 12:46:45.000000000 -0500 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -38105,9 +38082,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c linux-2.6.32.46/ .close = comedi_unmap, }; -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/adsp_driver.c 2011-11-12 12:46:45.000000000 -0500 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -38117,9 +38094,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3 .owner = THIS_MODULE, .open = adsp_open, .unlocked_ioctl = adsp_ioctl, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_aac.c 2011-11-12 12:46:45.000000000 -0500 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -38129,9 +38106,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-11-12 12:46:45.000000000 -0500 @@ -833,7 +833,7 @@ done: return rc; } @@ -38141,9 +38118,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3 .owner = THIS_MODULE, .open = audamrnb_open, .release = audamrnb_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_evrc.c 2011-11-12 12:46:45.000000000 -0500 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -38153,9 +38130,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32 .owner = THIS_MODULE, .open = audevrc_open, .release = audevrc_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_in.c 2011-11-12 12:46:45.000000000 -0500 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -38174,9 +38151,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.4 .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_mp3.c 2011-11-12 12:46:45.000000000 -0500 @@ -941,7 +941,7 @@ done: return rc; } @@ -38186,9 +38163,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32. .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_out.c 2011-11-12 12:46:45.000000000 -0500 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -38207,9 +38184,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32. .owner = THIS_MODULE, .open = audpp_open, .unlocked_ioctl = audpp_ioctl, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-11-12 12:46:45.000000000 -0500 @@ -816,7 +816,7 @@ err: return rc; } @@ -38219,9 +38196,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3 .owner = THIS_MODULE, .open = audqcelp_open, .release = audqcelp_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/qdsp5/snd.c 2011-11-12 12:46:45.000000000 -0500 @@ -242,7 +242,7 @@ err: return rc; } @@ -38231,9 +38208,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.46/dri .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/smd/smd_qmi.c 2011-11-12 12:46:45.000000000 -0500 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -38243,9 +38220,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.46/d .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dream/smd/smd_rpcrouter_device.c 2011-11-12 12:46:45.000000000 -0500 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -38264,9 +38241,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c linu .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.46/drivers/staging/dst/dcore.c linux-2.6.32.46/drivers/staging/dst/dcore.c ---- linux-2.6.32.46/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dst/dcore.c linux-2.6.32.48/drivers/staging/dst/dcore.c +--- linux-2.6.32.48/drivers/staging/dst/dcore.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dst/dcore.c 2011-11-12 12:46:45.000000000 -0500 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -38285,9 +38262,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dst/dcore.c linux-2.6.32.46/drivers/s snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.46/drivers/staging/dst/trans.c linux-2.6.32.46/drivers/staging/dst/trans.c ---- linux-2.6.32.46/drivers/staging/dst/trans.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/dst/trans.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/dst/trans.c linux-2.6.32.48/drivers/staging/dst/trans.c +--- linux-2.6.32.48/drivers/staging/dst/trans.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/dst/trans.c 2011-11-12 12:46:45.000000000 -0500 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -38297,9 +38274,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/dst/trans.c linux-2.6.32.46/drivers/s t->enc = bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c ---- linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c +--- linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/et131x/et1310_tx.c 2011-11-12 12:46:45.000000000 -0500 @@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru struct net_device_stats *stats = &etdev->net_stats; @@ -38315,9 +38292,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c linux-2.6.32.46/dr if (pMpTcb->Packet) { stats->tx_bytes += pMpTcb->Packet->len; -diff -urNp linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h ---- linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h +--- linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/et131x/et131x_adapter.h 2011-11-12 12:46:45.000000000 -0500 @@ -145,11 +145,11 @@ typedef struct _ce_stats_t { * operations */ @@ -38333,9 +38310,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h linux-2.6.32. u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ -diff -urNp linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/go7007/go7007-v4l2.c 2011-11-12 12:46:45.000000000 -0500 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -38345,9 +38322,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.46/ .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/blkvsc_drv.c 2011-11-12 12:46:45.000000000 -0500 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -38357,9 +38334,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drive .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.46/drivers/staging/hv/Channel.c linux-2.6.32.46/drivers/staging/hv/Channel.c ---- linux-2.6.32.46/drivers/staging/hv/Channel.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/Channel.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/Channel.c linux-2.6.32.48/drivers/staging/hv/Channel.c +--- linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/Channel.c 2011-11-12 12:46:45.000000000 -0500 @@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm DPRINT_ENTER(VMBUS); @@ -38371,9 +38348,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/Channel.c linux-2.6.32.46/drivers/ VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount); ASSERT(msgInfo != NULL); -diff -urNp linux-2.6.32.46/drivers/staging/hv/Hv.c linux-2.6.32.46/drivers/staging/hv/Hv.c ---- linux-2.6.32.46/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/Hv.c linux-2.6.32.48/drivers/staging/hv/Hv.c +--- linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/Hv.c 2011-11-12 12:46:45.000000000 -0500 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; u32 outputAddressHi = outputAddress >> 32; @@ -38383,9 +38360,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/Hv.c linux-2.6.32.46/drivers/stagi DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", Control, Input, Output); -diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusApi.h linux-2.6.32.46/drivers/staging/hv/VmbusApi.h ---- linux-2.6.32.46/drivers/staging/hv/VmbusApi.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/VmbusApi.h 2011-08-29 22:32:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusApi.h linux-2.6.32.48/drivers/staging/hv/VmbusApi.h +--- linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/VmbusApi.h 2011-11-12 12:46:45.000000000 -0500 @@ -109,7 +109,7 @@ struct vmbus_channel_interface { u32 *GpadlHandle); int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle); @@ -38395,9 +38372,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusApi.h linux-2.6.32.46/drivers /* Base driver object */ struct hv_driver { -diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c ---- linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c +--- linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:46:45.000000000 -0500 @@ -532,7 +532,7 @@ static int vmbus_child_device_register(s to_device_context(root_device_obj); struct device_context *child_device_ctx = @@ -38416,9 +38393,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/driver /* The new device belongs to this bus */ child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */ -diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h ---- linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h +--- linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/hv/VmbusPrivate.h 2011-11-12 12:46:45.000000000 -0500 @@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE { struct VMBUS_CONNECTION { enum VMBUS_CONNECT_STATE ConnectState; @@ -38428,9 +38405,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/dri /* * Represents channel interrupts. Each bit position represents a -diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/drivers/staging/iio/ring_generic.h ---- linux-2.6.32.46/drivers/staging/iio/ring_generic.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/iio/ring_generic.h 2011-08-23 20:24:26.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/iio/ring_generic.h linux-2.6.32.48/drivers/staging/iio/ring_generic.h +--- linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/iio/ring_generic.h 2011-11-12 12:46:45.000000000 -0500 @@ -87,7 +87,7 @@ struct iio_ring_access_funcs { int (*is_enabled)(struct iio_ring_buffer *ring); @@ -38440,9 +38417,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/dr /** * struct iio_ring_buffer - general ring buffer structure -diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/drivers/staging/octeon/ethernet.c ---- linux-2.6.32.46/drivers/staging/octeon/ethernet.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/octeon/ethernet.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet.c linux-2.6.32.48/drivers/staging/octeon/ethernet.c +--- linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/octeon/ethernet.c 2011-11-12 12:46:45.000000000 -0500 @@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_ * since the RX tasklet also increments it. */ @@ -38459,9 +38436,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/dri #endif } -diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c ---- linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c +--- linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/octeon/ethernet-rx.c 2011-11-12 12:46:45.000000000 -0500 @@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { @@ -38490,9 +38467,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/ #endif dev_kfree_skb_irq(skb); } -diff -urNp linux-2.6.32.46/drivers/staging/panel/panel.c linux-2.6.32.46/drivers/staging/panel/panel.c ---- linux-2.6.32.46/drivers/staging/panel/panel.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/panel/panel.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/panel/panel.c linux-2.6.32.48/drivers/staging/panel/panel.c +--- linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/panel/panel.c 2011-11-12 12:46:45.000000000 -0500 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -38511,9 +38488,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/panel/panel.c linux-2.6.32.46/drivers .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.46/drivers/staging/phison/phison.c linux-2.6.32.46/drivers/staging/phison/phison.c ---- linux-2.6.32.46/drivers/staging/phison/phison.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/phison/phison.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/phison/phison.c linux-2.6.32.48/drivers/staging/phison/phison.c +--- linux-2.6.32.48/drivers/staging/phison/phison.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/phison/phison.c 2011-11-12 12:46:45.000000000 -0500 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -38523,9 +38500,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/phison/phison.c linux-2.6.32.46/drive .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.46/drivers/staging/poch/poch.c linux-2.6.32.46/drivers/staging/poch/poch.c ---- linux-2.6.32.46/drivers/staging/poch/poch.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/poch/poch.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/poch/poch.c linux-2.6.32.48/drivers/staging/poch/poch.c +--- linux-2.6.32.48/drivers/staging/poch/poch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/poch/poch.c 2011-11-12 12:46:45.000000000 -0500 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -38535,9 +38512,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/poch/poch.c linux-2.6.32.46/drivers/s .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/inode.c linux-2.6.32.46/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.46/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/pohmelfs/inode.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/inode.c linux-2.6.32.48/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/pohmelfs/inode.c 2011-11-12 12:46:45.000000000 -0500 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -38556,9 +38533,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/inode.c linux-2.6.32.46/driv atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); -diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/pohmelfs/mcache.c 2011-11-12 12:46:45.000000000 -0500 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -38568,9 +38545,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c linux-2.6.32.46/dri mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/pohmelfs/netfs.h 2011-11-12 12:46:45.000000000 -0500 @@ -570,14 +570,14 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -38588,9 +38565,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h linux-2.6.32.46/driv unsigned int crypto_attached_size; unsigned int crypto_align_size; -diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/trans.c linux-2.6.32.46/drivers/staging/pohmelfs/trans.c ---- linux-2.6.32.46/drivers/staging/pohmelfs/trans.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/pohmelfs/trans.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/pohmelfs/trans.c linux-2.6.32.48/drivers/staging/pohmelfs/trans.c +--- linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/pohmelfs/trans.c 2011-11-12 12:46:45.000000000 -0500 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran int err; struct netfs_cmd *cmd = t->iovec.iov_base; @@ -38600,9 +38577,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/trans.c linux-2.6.32.46/driv cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); -diff -urNp linux-2.6.32.46/drivers/staging/sep/sep_driver.c linux-2.6.32.46/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.46/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/sep/sep_driver.c linux-2.6.32.48/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/sep/sep_driver.c 2011-11-12 12:46:45.000000000 -0500 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -38612,9 +38589,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/sep/sep_driver.c linux-2.6.32.46/driv .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -diff -urNp linux-2.6.32.46/drivers/staging/usbip/usbip_common.h linux-2.6.32.46/drivers/staging/usbip/usbip_common.h ---- linux-2.6.32.46/drivers/staging/usbip/usbip_common.h 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/usbip/usbip_common.h 2011-08-23 20:24:26.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/usbip/usbip_common.h linux-2.6.32.48/drivers/staging/usbip/usbip_common.h +--- linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/usbip/usbip_common.h 2011-11-12 12:46:45.000000000 -0500 @@ -374,7 +374,7 @@ struct usbip_device { void (*shutdown)(struct usbip_device *); void (*reset)(struct usbip_device *); @@ -38624,9 +38601,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/usbip/usbip_common.h linux-2.6.32.46/ }; -diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci.h linux-2.6.32.46/drivers/staging/usbip/vhci.h ---- linux-2.6.32.46/drivers/staging/usbip/vhci.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/usbip/vhci.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci.h linux-2.6.32.48/drivers/staging/usbip/vhci.h +--- linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/usbip/vhci.h 2011-11-12 12:46:45.000000000 -0500 @@ -92,7 +92,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; @@ -38636,9 +38613,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci.h linux-2.6.32.46/drivers/ /* * NOTE: -diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c ---- linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:33.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c +--- linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:46:45.000000000 -0500 @@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb) return; } @@ -38666,9 +38643,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.46/driv spin_lock_init(&vhci->lock); -diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c ---- linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c +--- linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:46:45.000000000 -0500 @@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct usbip_uerr("cannot find a urb of seqnum %u\n", pdu->base.seqnum); @@ -38678,9 +38655,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c linux-2.6.32.46/drive usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } -diff -urNp linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/vme/devices/vme_user.c 2011-11-12 12:46:45.000000000 -0500 @@ -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); @@ -38690,9 +38667,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c linux-2.6.32.4 .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.46/drivers/staging/vt6655/hostap.c linux-2.6.32.46/drivers/staging/vt6655/hostap.c ---- linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/vt6655/hostap.c 2011-09-14 09:51:07.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/vt6655/hostap.c linux-2.6.32.48/drivers/staging/vt6655/hostap.c +--- linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/vt6655/hostap.c 2011-11-12 12:46:45.000000000 -0500 @@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevic PSDevice apdev_priv; struct net_device *dev = pDevice->dev; @@ -38702,9 +38679,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/vt6655/hostap.c linux-2.6.32.46/drive .ndo_start_xmit = pDevice->tx_80211, }; -diff -urNp linux-2.6.32.46/drivers/staging/vt6656/hostap.c linux-2.6.32.46/drivers/staging/vt6656/hostap.c ---- linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/vt6656/hostap.c 2011-09-14 09:49:53.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/vt6656/hostap.c linux-2.6.32.48/drivers/staging/vt6656/hostap.c +--- linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/vt6656/hostap.c 2011-11-12 12:46:45.000000000 -0500 @@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevic PSDevice apdev_priv; struct net_device *dev = pDevice->dev; @@ -38714,9 +38691,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/vt6656/hostap.c linux-2.6.32.46/drive .ndo_start_xmit = pDevice->tx_80211, }; -diff -urNp linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c ---- linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 20:24:26.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c +--- linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-12 12:46:45.000000000 -0500 @@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hf struct usbctlx_completor { @@ -38726,9 +38703,9 @@ diff -urNp linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.46 typedef struct usbctlx_completor usbctlx_completor_t; static int -diff -urNp linux-2.6.32.46/drivers/telephony/ixj.c linux-2.6.32.46/drivers/telephony/ixj.c ---- linux-2.6.32.46/drivers/telephony/ixj.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/telephony/ixj.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/telephony/ixj.c linux-2.6.32.48/drivers/telephony/ixj.c +--- linux-2.6.32.48/drivers/telephony/ixj.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/telephony/ixj.c 2011-11-12 12:46:45.000000000 -0500 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; @@ -38738,9 +38715,9 @@ diff -urNp linux-2.6.32.46/drivers/telephony/ixj.c linux-2.6.32.46/drivers/telep if (!SCI_Prepare(j)) return 0; -diff -urNp linux-2.6.32.46/drivers/uio/uio.c linux-2.6.32.46/drivers/uio/uio.c ---- linux-2.6.32.46/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/uio/uio.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/uio/uio.c linux-2.6.32.48/drivers/uio/uio.c +--- linux-2.6.32.48/drivers/uio/uio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/uio/uio.c 2011-11-12 12:46:45.000000000 -0500 @@ -23,6 +23,7 @@ #include <linux/string.h> #include <linux/kobject.h> @@ -38850,9 +38827,9 @@ diff -urNp linux-2.6.32.46/drivers/uio/uio.c linux-2.6.32.46/drivers/uio/uio.c ret = uio_get_minor(idev); if (ret) -diff -urNp linux-2.6.32.46/drivers/usb/atm/usbatm.c linux-2.6.32.46/drivers/usb/atm/usbatm.c ---- linux-2.6.32.46/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/atm/usbatm.c linux-2.6.32.48/drivers/usb/atm/usbatm.c +--- linux-2.6.32.48/drivers/usb/atm/usbatm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/atm/usbatm.c 2011-11-12 12:46:45.000000000 -0500 @@ -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", @@ -38932,9 +38909,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/atm/usbatm.c linux-2.6.32.46/drivers/usb/ if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.46/drivers/usb/class/cdc-wdm.c linux-2.6.32.46/drivers/usb/class/cdc-wdm.c ---- linux-2.6.32.46/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/class/cdc-wdm.c linux-2.6.32.48/drivers/usb/class/cdc-wdm.c +--- linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/class/cdc-wdm.c 2011-11-12 12:46:45.000000000 -0500 @@ -314,7 +314,7 @@ static ssize_t wdm_write if (r < 0) goto outnp; @@ -38944,9 +38921,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/class/cdc-wdm.c linux-2.6.32.46/drivers/u r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, &desc->flags)); else -diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.c linux-2.6.32.46/drivers/usb/core/hcd.c ---- linux-2.6.32.46/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.c linux-2.6.32.48/drivers/usb/core/hcd.c +--- linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/core/hcd.c 2011-11-12 12:46:45.000000000 -0500 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -38965,9 +38942,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.c linux-2.6.32.46/drivers/usb/co { if (mon_ops) -diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.h linux-2.6.32.46/drivers/usb/core/hcd.h ---- linux-2.6.32.46/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/core/hcd.h linux-2.6.32.48/drivers/usb/core/hcd.h +--- linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/core/hcd.h 2011-11-12 12:46:45.000000000 -0500 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -38995,9 +38972,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.h linux-2.6.32.46/drivers/usb/co void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.46/drivers/usb/core/message.c linux-2.6.32.46/drivers/usb/core/message.c ---- linux-2.6.32.46/drivers/usb/core/message.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/core/message.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/core/message.c linux-2.6.32.48/drivers/usb/core/message.c +--- linux-2.6.32.48/drivers/usb/core/message.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/core/message.c 2011-11-12 12:46:45.000000000 -0500 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -39009,9 +38986,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/core/message.c linux-2.6.32.46/drivers/us if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.46/drivers/usb/misc/appledisplay.c linux-2.6.32.46/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.46/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/misc/appledisplay.c linux-2.6.32.48/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-12 12:44:29.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/misc/appledisplay.c 2011-11-12 12:46:45.000000000 -0500 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -39021,9 +38998,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/misc/appledisplay.c linux-2.6.32.46/drive .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/usb/mon/mon_main.c linux-2.6.32.46/drivers/usb/mon/mon_main.c ---- linux-2.6.32.46/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/mon/mon_main.c linux-2.6.32.48/drivers/usb/mon/mon_main.c +--- linux-2.6.32.48/drivers/usb/mon/mon_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/mon/mon_main.c 2011-11-12 12:46:45.000000000 -0500 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -39033,9 +39010,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/mon/mon_main.c linux-2.6.32.46/drivers/us .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h ---- linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h +--- linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/wusbcore/wa-hc.h 2011-11-12 12:46:45.000000000 -0500 @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; @@ -39054,9 +39031,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.46/drivers/ } /** -diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c ---- linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c +--- linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/usb/wusbcore/wa-xfer.c 2011-11-12 12:46:45.000000000 -0500 @@ -293,7 +293,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) @@ -39066,9 +39043,9 @@ diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.46/driver } /* -diff -urNp linux-2.6.32.46/drivers/uwb/wlp/messages.c linux-2.6.32.46/drivers/uwb/wlp/messages.c ---- linux-2.6.32.46/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/uwb/wlp/messages.c linux-2.6.32.48/drivers/uwb/wlp/messages.c +--- linux-2.6.32.48/drivers/uwb/wlp/messages.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/uwb/wlp/messages.c 2011-11-12 12:46:45.000000000 -0500 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -39078,9 +39055,9 @@ diff -urNp linux-2.6.32.46/drivers/uwb/wlp/messages.c linux-2.6.32.46/drivers/uw enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.46/drivers/uwb/wlp/sysfs.c linux-2.6.32.46/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.46/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/uwb/wlp/sysfs.c linux-2.6.32.48/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/uwb/wlp/sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -39091,9 +39068,9 @@ diff -urNp linux-2.6.32.46/drivers/uwb/wlp/sysfs.c linux-2.6.32.46/drivers/uwb/w .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.46/drivers/video/atmel_lcdfb.c linux-2.6.32.46/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.46/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/atmel_lcdfb.c linux-2.6.32.48/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/atmel_lcdfb.c 2011-11-12 12:46:45.000000000 -0500 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -39103,9 +39080,9 @@ diff -urNp linux-2.6.32.46/drivers/video/atmel_lcdfb.c linux-2.6.32.46/drivers/v .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/aty/aty128fb.c linux-2.6.32.46/drivers/video/aty/aty128fb.c ---- linux-2.6.32.46/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/aty/aty128fb.c linux-2.6.32.48/drivers/video/aty/aty128fb.c +--- linux-2.6.32.48/drivers/video/aty/aty128fb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/aty/aty128fb.c 2011-11-12 12:46:45.000000000 -0500 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -39115,9 +39092,9 @@ diff -urNp linux-2.6.32.46/drivers/video/aty/aty128fb.c linux-2.6.32.46/drivers/ .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/aty/atyfb_base.c linux-2.6.32.46/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.46/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/aty/atyfb_base.c linux-2.6.32.48/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/aty/atyfb_base.c 2011-11-12 12:46:45.000000000 -0500 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -39127,9 +39104,9 @@ diff -urNp linux-2.6.32.46/drivers/video/aty/atyfb_base.c linux-2.6.32.46/driver .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/aty/radeon_backlight.c linux-2.6.32.46/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.46/drivers/video/aty/radeon_backlight.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/aty/radeon_backlight.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/aty/radeon_backlight.c linux-2.6.32.48/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/aty/radeon_backlight.c 2011-11-12 12:46:45.000000000 -0500 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -39139,9 +39116,9 @@ diff -urNp linux-2.6.32.46/drivers/video/aty/radeon_backlight.c linux-2.6.32.46/ .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/adp5520_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -39151,9 +39128,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c linux-2.6.32.46/ .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/adx_bl.c linux-2.6.32.46/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.46/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/adx_bl.c linux-2.6.32.48/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/adx_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -39163,9 +39140,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/adx_bl.c linux-2.6.32.46/driv .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -diff -urNp linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/atmel-pwm-bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -39175,9 +39152,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.4 .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/backlight.c linux-2.6.32.46/drivers/video/backlight/backlight.c ---- linux-2.6.32.46/drivers/video/backlight/backlight.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/backlight.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/backlight.c linux-2.6.32.48/drivers/video/backlight/backlight.c +--- linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/backlight.c 2011-11-12 12:46:45.000000000 -0500 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -39187,9 +39164,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/backlight.c linux-2.6.32.46/d { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/corgi_lcd.c 2011-11-12 12:46:45.000000000 -0500 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -39199,9 +39176,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c linux-2.6.32.46/d .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/cr_bllcd.c 2011-11-12 12:46:45.000000000 -0500 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -39211,9 +39188,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c linux-2.6.32.46/dr .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/da903x_bl.c linux-2.6.32.46/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.46/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/da903x_bl.c linux-2.6.32.48/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/da903x_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -39223,9 +39200,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/da903x_bl.c linux-2.6.32.46/d .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/generic_bl.c linux-2.6.32.46/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.46/drivers/video/backlight/generic_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/generic_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/generic_bl.c linux-2.6.32.48/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/generic_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -39235,9 +39212,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/generic_bl.c linux-2.6.32.46/ .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.46/drivers/video/backlight/hp680_bl.c linux-2.6.32.46/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.46/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/hp680_bl.c linux-2.6.32.48/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/hp680_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -39247,9 +39224,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/hp680_bl.c linux-2.6.32.46/dr .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/jornada720_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -93,7 +93,7 @@ out: return ret; } @@ -39259,9 +39236,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c linux-2.6.32. .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/kb3886_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -39271,9 +39248,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c linux-2.6.32.46/d .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/locomolcd.c linux-2.6.32.46/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.46/drivers/video/backlight/locomolcd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/locomolcd.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/locomolcd.c linux-2.6.32.48/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/locomolcd.c 2011-11-12 12:46:45.000000000 -0500 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -39283,9 +39260,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/locomolcd.c linux-2.6.32.46/d .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 22:12:33.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/mbp_nvidia_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -39295,9 +39272,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32. }; /* Module parameters. */ -diff -urNp linux-2.6.32.46/drivers/video/backlight/omap1_bl.c linux-2.6.32.46/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.46/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/omap1_bl.c linux-2.6.32.48/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/omap1_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -39307,9 +39284,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/omap1_bl.c linux-2.6.32.46/dr .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/progear_bl.c linux-2.6.32.46/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.46/drivers/video/backlight/progear_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/progear_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/progear_bl.c linux-2.6.32.48/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/progear_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -39319,9 +39296,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/progear_bl.c linux-2.6.32.46/ .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/pwm_bl.c linux-2.6.32.46/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.46/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/pwm_bl.c linux-2.6.32.48/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/pwm_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -39331,9 +39308,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/pwm_bl.c linux-2.6.32.46/driv .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/tosa_bl.c linux-2.6.32.46/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.46/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/tosa_bl.c linux-2.6.32.48/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/tosa_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -39343,9 +39320,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/tosa_bl.c linux-2.6.32.46/dri .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/backlight/wm831x_bl.c 2011-11-12 12:46:45.000000000 -0500 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -39355,9 +39332,9 @@ diff -urNp linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c linux-2.6.32.46/d .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.46/drivers/video/bf54x-lq043fb.c linux-2.6.32.46/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.46/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/bf54x-lq043fb.c linux-2.6.32.48/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/bf54x-lq043fb.c 2011-11-12 12:46:45.000000000 -0500 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -39367,9 +39344,9 @@ diff -urNp linux-2.6.32.46/drivers/video/bf54x-lq043fb.c linux-2.6.32.46/drivers .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/bfin-t350mcqb-fb.c 2011-11-12 12:46:45.000000000 -0500 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -39379,9 +39356,9 @@ diff -urNp linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.46/driv .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.46/drivers/video/fbcmap.c linux-2.6.32.46/drivers/video/fbcmap.c ---- linux-2.6.32.46/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/fbcmap.c linux-2.6.32.48/drivers/video/fbcmap.c +--- linux-2.6.32.48/drivers/video/fbcmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/fbcmap.c 2011-11-12 12:46:45.000000000 -0500 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -39392,9 +39369,9 @@ diff -urNp linux-2.6.32.46/drivers/video/fbcmap.c linux-2.6.32.46/drivers/video/ rc = -EINVAL; goto out1; } -diff -urNp linux-2.6.32.46/drivers/video/fbmem.c linux-2.6.32.46/drivers/video/fbmem.c ---- linux-2.6.32.46/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/fbmem.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/fbmem.c linux-2.6.32.48/drivers/video/fbmem.c +--- linux-2.6.32.48/drivers/video/fbmem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/fbmem.c 2011-11-12 12:46:45.000000000 -0500 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -39440,9 +39417,9 @@ diff -urNp linux-2.6.32.46/drivers/video/fbmem.c linux-2.6.32.46/drivers/video/f return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.46/drivers/video/i810/i810_accel.c linux-2.6.32.46/drivers/video/i810/i810_accel.c ---- linux-2.6.32.46/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/i810/i810_accel.c linux-2.6.32.48/drivers/video/i810/i810_accel.c +--- linux-2.6.32.48/drivers/video/i810/i810_accel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/i810/i810_accel.c 2011-11-12 12:46:45.000000000 -0500 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -39451,9 +39428,9 @@ diff -urNp linux-2.6.32.46/drivers/video/i810/i810_accel.c linux-2.6.32.46/drive i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm ---- linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm 2011-08-29 23:49:24.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm +--- linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/logo/logo_linux_clut224.ppm 2011-11-12 12:46:45.000000000 -0500 @@ -1,1604 +1,1123 @@ P3 -# Standard 224-color Linux logo @@ -42179,9 +42156,9 @@ diff -urNp linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.3 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 -diff -urNp linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/nvidia/nv_backlight.c 2011-11-12 12:46:45.000000000 -0500 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -42191,9 +42168,9 @@ diff -urNp linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c linux-2.6.32.46/d .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/riva/fbdev.c linux-2.6.32.46/drivers/video/riva/fbdev.c ---- linux-2.6.32.46/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/riva/fbdev.c linux-2.6.32.48/drivers/video/riva/fbdev.c +--- linux-2.6.32.48/drivers/video/riva/fbdev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/riva/fbdev.c 2011-11-12 12:46:45.000000000 -0500 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -42203,9 +42180,9 @@ diff -urNp linux-2.6.32.46/drivers/video/riva/fbdev.c linux-2.6.32.46/drivers/vi .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.46/drivers/video/uvesafb.c linux-2.6.32.46/drivers/video/uvesafb.c ---- linux-2.6.32.46/drivers/video/uvesafb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/uvesafb.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/uvesafb.c linux-2.6.32.48/drivers/video/uvesafb.c +--- linux-2.6.32.48/drivers/video/uvesafb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/uvesafb.c 2011-11-12 12:46:45.000000000 -0500 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -42281,9 +42258,9 @@ diff -urNp linux-2.6.32.46/drivers/video/uvesafb.c linux-2.6.32.46/drivers/video } framebuffer_release(info); -diff -urNp linux-2.6.32.46/drivers/video/vesafb.c linux-2.6.32.46/drivers/video/vesafb.c ---- linux-2.6.32.46/drivers/video/vesafb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/video/vesafb.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/video/vesafb.c linux-2.6.32.48/drivers/video/vesafb.c +--- linux-2.6.32.48/drivers/video/vesafb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/video/vesafb.c 2011-11-12 12:46:45.000000000 -0500 @@ -9,6 +9,7 @@ */ @@ -42386,9 +42363,9 @@ diff -urNp linux-2.6.32.46/drivers/video/vesafb.c linux-2.6.32.46/drivers/video/ if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.46/drivers/xen/sys-hypervisor.c linux-2.6.32.46/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.46/drivers/xen/sys-hypervisor.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/drivers/xen/sys-hypervisor.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/drivers/xen/sys-hypervisor.c linux-2.6.32.48/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/drivers/xen/sys-hypervisor.c 2011-11-12 12:46:45.000000000 -0500 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -42398,9 +42375,9 @@ diff -urNp linux-2.6.32.46/drivers/xen/sys-hypervisor.c linux-2.6.32.46/drivers/ .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.46/fs/9p/vfs_inode.c linux-2.6.32.46/fs/9p/vfs_inode.c ---- linux-2.6.32.46/fs/9p/vfs_inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/9p/vfs_inode.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/9p/vfs_inode.c linux-2.6.32.48/fs/9p/vfs_inode.c +--- linux-2.6.32.48/fs/9p/vfs_inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/9p/vfs_inode.c 2011-11-12 12:46:45.000000000 -0500 @@ -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) @@ -42410,9 +42387,9 @@ diff -urNp linux-2.6.32.46/fs/9p/vfs_inode.c linux-2.6.32.46/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.32.46/fs/aio.c linux-2.6.32.46/fs/aio.c ---- linux-2.6.32.46/fs/aio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/aio.c 2011-06-04 20:40:21.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/aio.c linux-2.6.32.48/fs/aio.c +--- linux-2.6.32.48/fs/aio.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/aio.c 2011-11-12 12:46:45.000000000 -0500 @@ -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; @@ -42451,9 +42428,9 @@ diff -urNp linux-2.6.32.46/fs/aio.c linux-2.6.32.46/fs/aio.c kiocb->ki_nr_segs = kiocb->ki_nbytes; kiocb->ki_cur_seg = 0; /* ki_nbytes/left now reflect bytes instead of segs */ -diff -urNp linux-2.6.32.46/fs/attr.c linux-2.6.32.46/fs/attr.c ---- linux-2.6.32.46/fs/attr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/attr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/attr.c linux-2.6.32.48/fs/attr.c +--- linux-2.6.32.48/fs/attr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/attr.c 2011-11-12 12:46:45.000000000 -0500 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -42462,9 +42439,9 @@ diff -urNp linux-2.6.32.46/fs/attr.c linux-2.6.32.46/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-2.6.32.46/fs/autofs/root.c linux-2.6.32.46/fs/autofs/root.c ---- linux-2.6.32.46/fs/autofs/root.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/autofs/root.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/autofs/root.c linux-2.6.32.48/fs/autofs/root.c +--- linux-2.6.32.48/fs/autofs/root.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/autofs/root.c 2011-11-12 12:46:45.000000000 -0500 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -42475,9 +42452,9 @@ diff -urNp linux-2.6.32.46/fs/autofs/root.c linux-2.6.32.46/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.46/fs/autofs4/symlink.c linux-2.6.32.46/fs/autofs4/symlink.c ---- linux-2.6.32.46/fs/autofs4/symlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/autofs4/symlink.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/autofs4/symlink.c linux-2.6.32.48/fs/autofs4/symlink.c +--- linux-2.6.32.48/fs/autofs4/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/autofs4/symlink.c 2011-11-12 12:46:45.000000000 -0500 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -42487,9 +42464,9 @@ diff -urNp linux-2.6.32.46/fs/autofs4/symlink.c linux-2.6.32.46/fs/autofs4/symli return NULL; } -diff -urNp linux-2.6.32.46/fs/autofs4/waitq.c linux-2.6.32.46/fs/autofs4/waitq.c ---- linux-2.6.32.46/fs/autofs4/waitq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/autofs4/waitq.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/autofs4/waitq.c linux-2.6.32.48/fs/autofs4/waitq.c +--- linux-2.6.32.48/fs/autofs4/waitq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/autofs4/waitq.c 2011-11-12 12:46:45.000000000 -0500 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi { unsigned long sigpipe, flags; @@ -42499,9 +42476,9 @@ diff -urNp linux-2.6.32.46/fs/autofs4/waitq.c linux-2.6.32.46/fs/autofs4/waitq.c ssize_t wr = 0; /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/ -diff -urNp linux-2.6.32.46/fs/befs/linuxvfs.c linux-2.6.32.46/fs/befs/linuxvfs.c ---- linux-2.6.32.46/fs/befs/linuxvfs.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/fs/befs/linuxvfs.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/befs/linuxvfs.c linux-2.6.32.48/fs/befs/linuxvfs.c +--- linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/befs/linuxvfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -498,7 +498,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -42511,9 +42488,9 @@ diff -urNp linux-2.6.32.46/fs/befs/linuxvfs.c linux-2.6.32.46/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.46/fs/binfmt_aout.c linux-2.6.32.46/fs/binfmt_aout.c ---- linux-2.6.32.46/fs/binfmt_aout.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/binfmt_aout.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/binfmt_aout.c linux-2.6.32.48/fs/binfmt_aout.c +--- linux-2.6.32.48/fs/binfmt_aout.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/binfmt_aout.c 2011-11-12 12:46:45.000000000 -0500 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -42601,9 +42578,9 @@ diff -urNp linux-2.6.32.46/fs/binfmt_aout.c linux-2.6.32.46/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.32.46/fs/binfmt_elf.c linux-2.6.32.46/fs/binfmt_elf.c ---- linux-2.6.32.46/fs/binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/binfmt_elf.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/binfmt_elf.c linux-2.6.32.48/fs/binfmt_elf.c +--- linux-2.6.32.48/fs/binfmt_elf.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/binfmt_elf.c 2011-11-12 12:46:45.000000000 -0500 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -43277,9 +43254,9 @@ diff -urNp linux-2.6.32.46/fs/binfmt_elf.c linux-2.6.32.46/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.46/fs/binfmt_flat.c linux-2.6.32.46/fs/binfmt_flat.c ---- linux-2.6.32.46/fs/binfmt_flat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/binfmt_flat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/binfmt_flat.c linux-2.6.32.48/fs/binfmt_flat.c +--- linux-2.6.32.48/fs/binfmt_flat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/binfmt_flat.c 2011-11-12 12:46:45.000000000 -0500 @@ -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", @@ -43312,9 +43289,9 @@ diff -urNp linux-2.6.32.46/fs/binfmt_flat.c linux-2.6.32.46/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.32.46/fs/bio.c linux-2.6.32.46/fs/bio.c ---- linux-2.6.32.46/fs/bio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/bio.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/bio.c linux-2.6.32.48/fs/bio.c +--- linux-2.6.32.48/fs/bio.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/bio.c 2011-11-12 12:46:45.000000000 -0500 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -43333,9 +43310,9 @@ diff -urNp linux-2.6.32.46/fs/bio.c linux-2.6.32.46/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.46/fs/block_dev.c linux-2.6.32.46/fs/block_dev.c ---- linux-2.6.32.46/fs/block_dev.c 2011-08-09 18:35:29.000000000 -0400 -+++ linux-2.6.32.46/fs/block_dev.c 2011-08-09 18:34:00.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/block_dev.c linux-2.6.32.48/fs/block_dev.c +--- linux-2.6.32.48/fs/block_dev.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/block_dev.c 2011-11-12 12:46:45.000000000 -0500 @@ -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 */ @@ -43345,9 +43322,9 @@ diff -urNp linux-2.6.32.46/fs/block_dev.c linux-2.6.32.46/fs/block_dev.c res = 0; /* is a partition of a device that is being partitioned */ else if (bdev->bd_contains->bd_holder != NULL) res = -EBUSY; /* is a partition of a held device */ -diff -urNp linux-2.6.32.46/fs/btrfs/ctree.c linux-2.6.32.46/fs/btrfs/ctree.c ---- linux-2.6.32.46/fs/btrfs/ctree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/ctree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/ctree.c linux-2.6.32.48/fs/btrfs/ctree.c +--- linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/ctree.c 2011-11-12 12:46:45.000000000 -0500 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -43372,9 +43349,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/ctree.c linux-2.6.32.46/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.32.46/fs/btrfs/disk-io.c linux-2.6.32.46/fs/btrfs/disk-io.c ---- linux-2.6.32.46/fs/btrfs/disk-io.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/disk-io.c 2011-04-17 17:03:11.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/disk-io.c linux-2.6.32.48/fs/btrfs/disk-io.c +--- linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/disk-io.c 2011-11-12 12:46:45.000000000 -0500 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -43393,9 +43370,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/disk-io.c linux-2.6.32.46/fs/btrfs/disk-io.c .write_cache_pages_lock_hook = btree_lock_page_hook, .readpage_end_io_hook = btree_readpage_end_io_hook, .submit_bio_hook = btree_submit_bio_hook, -diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_io.h ---- linux-2.6.32.46/fs/btrfs/extent_io.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/extent_io.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/extent_io.h linux-2.6.32.48/fs/btrfs/extent_io.h +--- linux-2.6.32.48/fs/btrfs/extent_io.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/extent_io.h 2011-11-12 12:46:45.000000000 -0500 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -43456,9 +43433,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_ }; struct extent_state { -diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/extent-tree.c ---- linux-2.6.32.46/fs/btrfs/extent-tree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/extent-tree.c 2011-06-12 06:39:08.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/extent-tree.c linux-2.6.32.48/fs/btrfs/extent-tree.c +--- linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/extent-tree.c 2011-11-12 12:46:45.000000000 -0500 @@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent( u64 group_start = group->key.objectid; new_extents = kmalloc(sizeof(*new_extents), @@ -43470,9 +43447,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/exten nr_extents = 1; ret = get_new_locations(reloc_inode, extent_key, -diff -urNp linux-2.6.32.46/fs/btrfs/free-space-cache.c linux-2.6.32.46/fs/btrfs/free-space-cache.c ---- linux-2.6.32.46/fs/btrfs/free-space-cache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/free-space-cache.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/free-space-cache.c linux-2.6.32.48/fs/btrfs/free-space-cache.c +--- linux-2.6.32.48/fs/btrfs/free-space-cache.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/free-space-cache.c 2011-11-12 12:46:45.000000000 -0500 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -43491,9 +43468,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/free-space-cache.c linux-2.6.32.46/fs/btrfs/ if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.46/fs/btrfs/inode.c linux-2.6.32.46/fs/btrfs/inode.c ---- linux-2.6.32.46/fs/btrfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/inode.c 2011-06-12 06:39:58.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/inode.c linux-2.6.32.48/fs/btrfs/inode.c +--- linux-2.6.32.48/fs/btrfs/inode.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/inode.c 2011-11-12 12:46:45.000000000 -0500 @@ -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; @@ -43553,9 +43530,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/inode.c linux-2.6.32.46/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.46/fs/btrfs/relocation.c linux-2.6.32.46/fs/btrfs/relocation.c ---- linux-2.6.32.46/fs/btrfs/relocation.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/relocation.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/relocation.c linux-2.6.32.48/fs/btrfs/relocation.c +--- linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/relocation.c 2011-11-12 12:46:45.000000000 -0500 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -43565,9 +43542,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/relocation.c linux-2.6.32.46/fs/btrfs/reloca if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-2.6.32.46/fs/btrfs/sysfs.c linux-2.6.32.46/fs/btrfs/sysfs.c ---- linux-2.6.32.46/fs/btrfs/sysfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/btrfs/sysfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/btrfs/sysfs.c linux-2.6.32.48/fs/btrfs/sysfs.c +--- linux-2.6.32.48/fs/btrfs/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/btrfs/sysfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -43583,9 +43560,9 @@ diff -urNp linux-2.6.32.46/fs/btrfs/sysfs.c linux-2.6.32.46/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.46/fs/buffer.c linux-2.6.32.46/fs/buffer.c ---- linux-2.6.32.46/fs/buffer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/buffer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/buffer.c linux-2.6.32.48/fs/buffer.c +--- linux-2.6.32.48/fs/buffer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/buffer.c 2011-11-12 12:46:45.000000000 -0500 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -43594,9 +43571,9 @@ diff -urNp linux-2.6.32.46/fs/buffer.c linux-2.6.32.46/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.46/fs/cachefiles/bind.c linux-2.6.32.46/fs/cachefiles/bind.c ---- linux-2.6.32.46/fs/cachefiles/bind.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/bind.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/bind.c linux-2.6.32.48/fs/cachefiles/bind.c +--- linux-2.6.32.48/fs/cachefiles/bind.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/bind.c 2011-11-12 12:46:45.000000000 -0500 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -43613,9 +43590,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/bind.c linux-2.6.32.46/fs/cachefiles/bi cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-2.6.32.46/fs/cachefiles/daemon.c linux-2.6.32.46/fs/cachefiles/daemon.c ---- linux-2.6.32.46/fs/cachefiles/daemon.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/daemon.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/daemon.c linux-2.6.32.48/fs/cachefiles/daemon.c +--- linux-2.6.32.48/fs/cachefiles/daemon.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/daemon.c 2011-11-12 12:46:45.000000000 -0500 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s if (test_bit(CACHEFILES_DEAD, &cache->flags)) return -EIO; @@ -43643,9 +43620,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/daemon.c linux-2.6.32.46/fs/cachefiles/ return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-2.6.32.46/fs/cachefiles/internal.h linux-2.6.32.46/fs/cachefiles/internal.h ---- linux-2.6.32.46/fs/cachefiles/internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/internal.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/internal.h linux-2.6.32.48/fs/cachefiles/internal.h +--- linux-2.6.32.48/fs/cachefiles/internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/internal.h 2011-11-12 12:46:45.000000000 -0500 @@ -56,7 +56,7 @@ struct cachefiles_cache { wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */ struct rb_root active_nodes; /* active nodes (can't be culled) */ @@ -43680,9 +43657,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/internal.h linux-2.6.32.46/fs/cachefile } #else -diff -urNp linux-2.6.32.46/fs/cachefiles/namei.c linux-2.6.32.46/fs/cachefiles/namei.c ---- linux-2.6.32.46/fs/cachefiles/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/namei.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/namei.c linux-2.6.32.48/fs/cachefiles/namei.c +--- linux-2.6.32.48/fs/cachefiles/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/namei.c 2011-11-12 12:46:45.000000000 -0500 @@ -250,7 +250,7 @@ try_again: /* first step is to make up a grave dentry in the graveyard */ sprintf(nbuffer, "%08x%08x", @@ -43692,9 +43669,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/namei.c linux-2.6.32.46/fs/cachefiles/n /* do the multiway lock magic */ trap = lock_rename(cache->graveyard, dir); -diff -urNp linux-2.6.32.46/fs/cachefiles/proc.c linux-2.6.32.46/fs/cachefiles/proc.c ---- linux-2.6.32.46/fs/cachefiles/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/proc.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/proc.c linux-2.6.32.48/fs/cachefiles/proc.c +--- linux-2.6.32.48/fs/cachefiles/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/proc.c 2011-11-12 12:46:45.000000000 -0500 @@ -14,9 +14,9 @@ #include <linux/seq_file.h> #include "internal.h" @@ -43721,9 +43698,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/proc.c linux-2.6.32.46/fs/cachefiles/pr if (x == 0 && y == 0 && z == 0) return 0; -diff -urNp linux-2.6.32.46/fs/cachefiles/rdwr.c linux-2.6.32.46/fs/cachefiles/rdwr.c ---- linux-2.6.32.46/fs/cachefiles/rdwr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cachefiles/rdwr.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cachefiles/rdwr.c linux-2.6.32.48/fs/cachefiles/rdwr.c +--- linux-2.6.32.48/fs/cachefiles/rdwr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cachefiles/rdwr.c 2011-11-12 12:46:45.000000000 -0500 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -43733,9 +43710,9 @@ diff -urNp linux-2.6.32.46/fs/cachefiles/rdwr.c linux-2.6.32.46/fs/cachefiles/rd set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.46/fs/cifs/cifs_debug.c linux-2.6.32.46/fs/cifs/cifs_debug.c ---- linux-2.6.32.46/fs/cifs/cifs_debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/cifs_debug.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cifs/cifs_debug.c linux-2.6.32.48/fs/cifs/cifs_debug.c +--- linux-2.6.32.48/fs/cifs/cifs_debug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cifs/cifs_debug.c 2011-11-12 12:46:45.000000000 -0500 @@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(str tcon = list_entry(tmp3, struct cifsTconInfo, @@ -43843,9 +43820,9 @@ diff -urNp linux-2.6.32.46/fs/cifs/cifs_debug.c linux-2.6.32.46/fs/cifs/cifs_deb } } } -diff -urNp linux-2.6.32.46/fs/cifs/cifsfs.c linux-2.6.32.46/fs/cifs/cifsfs.c ---- linux-2.6.32.46/fs/cifs/cifsfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/cifsfs.c 2011-08-25 17:17:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cifs/cifsfs.c linux-2.6.32.48/fs/cifs/cifsfs.c +--- linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/cifs/cifsfs.c 2011-11-12 12:46:45.000000000 -0500 @@ -869,7 +869,7 @@ cifs_init_request_bufs(void) cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + @@ -43875,9 +43852,9 @@ diff -urNp linux-2.6.32.46/fs/cifs/cifsfs.c linux-2.6.32.46/fs/cifs/cifsfs.c #endif /* CONFIG_CIFS_STATS2 */ atomic_set(&midCount, 0); -diff -urNp linux-2.6.32.46/fs/cifs/cifsglob.h linux-2.6.32.46/fs/cifs/cifsglob.h ---- linux-2.6.32.46/fs/cifs/cifsglob.h 2011-08-09 18:35:29.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/cifsglob.h 2011-08-25 17:17:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cifs/cifsglob.h linux-2.6.32.48/fs/cifs/cifsglob.h +--- linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/cifs/cifsglob.h 2011-11-12 12:46:45.000000000 -0500 @@ -252,28 +252,28 @@ struct cifsTconInfo { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; @@ -43949,22 +43926,9 @@ diff -urNp linux-2.6.32.46/fs/cifs/cifsglob.h linux-2.6.32.46/fs/cifs/cifsglob.h #endif GLOBAL_EXTERN atomic_t smBufAllocCount; GLOBAL_EXTERN atomic_t midCount; -diff -urNp linux-2.6.32.46/fs/cifs/cifssmb.c linux-2.6.32.46/fs/cifs/cifssmb.c ---- linux-2.6.32.46/fs/cifs/cifssmb.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/cifssmb.c 2011-10-17 02:36:33.000000000 -0400 -@@ -3596,7 +3596,8 @@ int CIFSFindNext(const int xid, struct c - T2_FNEXT_RSP_PARMS *parms; - char *response_data; - int rc = 0; -- int bytes_returned, name_len; -+ int bytes_returned; -+ unsigned int name_len; - __u16 params, byte_count; - - cFYI(1, ("In FindNext")); -diff -urNp linux-2.6.32.46/fs/cifs/link.c linux-2.6.32.46/fs/cifs/link.c ---- linux-2.6.32.46/fs/cifs/link.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/link.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cifs/link.c linux-2.6.32.48/fs/cifs/link.c +--- linux-2.6.32.48/fs/cifs/link.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cifs/link.c 2011-11-12 12:46:47.000000000 -0500 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -43974,9 +43938,9 @@ diff -urNp linux-2.6.32.46/fs/cifs/link.c linux-2.6.32.46/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.46/fs/cifs/misc.c linux-2.6.32.46/fs/cifs/misc.c ---- linux-2.6.32.46/fs/cifs/misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/cifs/misc.c 2011-08-25 17:17:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/cifs/misc.c linux-2.6.32.48/fs/cifs/misc.c +--- linux-2.6.32.48/fs/cifs/misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/cifs/misc.c 2011-11-12 12:46:47.000000000 -0500 @@ -155,7 +155,7 @@ cifs_buf_get(void) memset(ret_buf, 0, sizeof(struct smb_hdr) + 3); atomic_inc(&bufAllocCount); @@ -43995,9 +43959,9 @@ diff -urNp linux-2.6.32.46/fs/cifs/misc.c linux-2.6.32.46/fs/cifs/misc.c #endif /* CONFIG_CIFS_STATS2 */ } -diff -urNp linux-2.6.32.46/fs/coda/cache.c linux-2.6.32.46/fs/coda/cache.c ---- linux-2.6.32.46/fs/coda/cache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/coda/cache.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/coda/cache.c linux-2.6.32.48/fs/coda/cache.c +--- linux-2.6.32.48/fs/coda/cache.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/coda/cache.c 2011-11-12 12:46:47.000000000 -0500 @@ -24,14 +24,14 @@ #include <linux/coda_fs_i.h> #include <linux/coda_cache.h> @@ -44040,9 +44004,9 @@ diff -urNp linux-2.6.32.46/fs/coda/cache.c linux-2.6.32.46/fs/coda/cache.c return hit; } -diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binfmt_elf.c ---- linux-2.6.32.46/fs/compat_binfmt_elf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/compat_binfmt_elf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/compat_binfmt_elf.c linux-2.6.32.48/fs/compat_binfmt_elf.c +--- linux-2.6.32.48/fs/compat_binfmt_elf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/compat_binfmt_elf.c 2011-11-12 12:46:47.000000000 -0500 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -44056,9 +44020,9 @@ diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binf #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c ---- linux-2.6.32.46/fs/compat.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/fs/compat.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/compat.c linux-2.6.32.48/fs/compat.c +--- linux-2.6.32.48/fs/compat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/compat.c 2011-11-12 12:46:47.000000000 -0500 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(char _ static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) { @@ -44304,9 +44268,9 @@ diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c set_fs(oldfs); if (err) -diff -urNp linux-2.6.32.46/fs/compat_ioctl.c linux-2.6.32.46/fs/compat_ioctl.c ---- linux-2.6.32.46/fs/compat_ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/compat_ioctl.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/compat_ioctl.c linux-2.6.32.48/fs/compat_ioctl.c +--- linux-2.6.32.48/fs/compat_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/compat_ioctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -44334,9 +44298,9 @@ diff -urNp linux-2.6.32.46/fs/compat_ioctl.c linux-2.6.32.46/fs/compat_ioctl.c return -EFAULT; return ioctl_preallocate(file, p); -diff -urNp linux-2.6.32.46/fs/configfs/dir.c linux-2.6.32.46/fs/configfs/dir.c ---- linux-2.6.32.46/fs/configfs/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/configfs/dir.c 2011-05-11 18:25:15.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/configfs/dir.c linux-2.6.32.48/fs/configfs/dir.c +--- linux-2.6.32.48/fs/configfs/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/configfs/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file } for (p=q->next; p!= &parent_sd->s_children; p=p->next) { @@ -44361,9 +44325,9 @@ diff -urNp linux-2.6.32.46/fs/configfs/dir.c linux-2.6.32.46/fs/configfs/dir.c if (next->s_dentry) ino = next->s_dentry->d_inode->i_ino; else -diff -urNp linux-2.6.32.46/fs/dcache.c linux-2.6.32.46/fs/dcache.c ---- linux-2.6.32.46/fs/dcache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/dcache.c 2011-04-23 13:32:21.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/dcache.c linux-2.6.32.48/fs/dcache.c +--- linux-2.6.32.48/fs/dcache.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/dcache.c 2011-11-12 12:46:47.000000000 -0500 @@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock); static struct kmem_cache *dentry_cache __read_mostly; @@ -44382,9 +44346,9 @@ diff -urNp linux-2.6.32.46/fs/dcache.c linux-2.6.32.46/fs/dcache.c dcache_init(); inode_init(); -diff -urNp linux-2.6.32.46/fs/dlm/lockspace.c linux-2.6.32.46/fs/dlm/lockspace.c ---- linux-2.6.32.46/fs/dlm/lockspace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/dlm/lockspace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/dlm/lockspace.c linux-2.6.32.48/fs/dlm/lockspace.c +--- linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/dlm/lockspace.c 2011-11-12 12:46:47.000000000 -0500 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -44394,9 +44358,9 @@ diff -urNp linux-2.6.32.46/fs/dlm/lockspace.c linux-2.6.32.46/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.46/fs/ecryptfs/inode.c linux-2.6.32.46/fs/ecryptfs/inode.c ---- linux-2.6.32.46/fs/ecryptfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ecryptfs/inode.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ecryptfs/inode.c linux-2.6.32.48/fs/ecryptfs/inode.c +--- linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ecryptfs/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -44415,9 +44379,9 @@ diff -urNp linux-2.6.32.46/fs/ecryptfs/inode.c linux-2.6.32.46/fs/ecryptfs/inode set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.46/fs/exec.c linux-2.6.32.46/fs/exec.c ---- linux-2.6.32.46/fs/exec.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/fs/exec.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/exec.c linux-2.6.32.48/fs/exec.c +--- linux-2.6.32.48/fs/exec.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/exec.c 2011-11-12 12:46:47.000000000 -0500 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -45011,9 +44975,9 @@ diff -urNp linux-2.6.32.46/fs/exec.c linux-2.6.32.46/fs/exec.c fail_unlock: if (helper_argv) argv_free(helper_argv); -diff -urNp linux-2.6.32.46/fs/ext2/balloc.c linux-2.6.32.46/fs/ext2/balloc.c ---- linux-2.6.32.46/fs/ext2/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext2/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext2/balloc.c linux-2.6.32.48/fs/ext2/balloc.c +--- linux-2.6.32.48/fs/ext2/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ext2/balloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -45023,9 +44987,9 @@ diff -urNp linux-2.6.32.46/fs/ext2/balloc.c linux-2.6.32.46/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.46/fs/ext3/balloc.c linux-2.6.32.46/fs/ext3/balloc.c ---- linux-2.6.32.46/fs/ext3/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext3/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext3/balloc.c linux-2.6.32.48/fs/ext3/balloc.c +--- linux-2.6.32.48/fs/ext3/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ext3/balloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -45035,9 +44999,9 @@ diff -urNp linux-2.6.32.46/fs/ext3/balloc.c linux-2.6.32.46/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.32.46/fs/ext4/balloc.c linux-2.6.32.46/fs/ext4/balloc.c ---- linux-2.6.32.46/fs/ext4/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext4/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext4/balloc.c linux-2.6.32.48/fs/ext4/balloc.c +--- linux-2.6.32.48/fs/ext4/balloc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ext4/balloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -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() || @@ -45047,10 +45011,10 @@ diff -urNp linux-2.6.32.46/fs/ext4/balloc.c linux-2.6.32.46/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.46/fs/ext4/ext4.h linux-2.6.32.46/fs/ext4/ext4.h ---- linux-2.6.32.46/fs/ext4/ext4.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext4/ext4.h 2011-04-17 15:56:46.000000000 -0400 -@@ -1078,19 +1078,19 @@ struct ext4_sb_info { +diff -urNp linux-2.6.32.48/fs/ext4/ext4.h linux-2.6.32.48/fs/ext4/ext4.h +--- linux-2.6.32.48/fs/ext4/ext4.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ext4/ext4.h 2011-11-12 12:46:47.000000000 -0500 +@@ -1077,19 +1077,19 @@ struct ext4_sb_info { /* stats for buddy allocator */ spinlock_t s_mb_pa_lock; @@ -45080,9 +45044,9 @@ diff -urNp linux-2.6.32.46/fs/ext4/ext4.h linux-2.6.32.46/fs/ext4/ext4.h atomic_t s_lock_busy; /* locality groups */ -diff -urNp linux-2.6.32.46/fs/ext4/file.c linux-2.6.32.46/fs/ext4/file.c ---- linux-2.6.32.46/fs/ext4/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext4/file.c 2011-10-17 02:30:06.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext4/file.c linux-2.6.32.48/fs/ext4/file.c +--- linux-2.6.32.48/fs/ext4/file.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ext4/file.c 2011-11-12 12:46:47.000000000 -0500 @@ -122,8 +122,8 @@ static int ext4_file_open(struct inode * cp = d_path(&path, buf, sizeof(buf)); path_put(&path); @@ -45094,9 +45058,9 @@ diff -urNp linux-2.6.32.46/fs/ext4/file.c linux-2.6.32.46/fs/ext4/file.c sb->s_dirt = 1; } } -diff -urNp linux-2.6.32.46/fs/ext4/mballoc.c linux-2.6.32.46/fs/ext4/mballoc.c ---- linux-2.6.32.46/fs/ext4/mballoc.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/fs/ext4/mballoc.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext4/mballoc.c linux-2.6.32.48/fs/ext4/mballoc.c +--- linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ext4/mballoc.c 2011-11-12 12:46:47.000000000 -0500 @@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); @@ -45219,9 +45183,9 @@ diff -urNp linux-2.6.32.46/fs/ext4/mballoc.c linux-2.6.32.46/fs/ext4/mballoc.c if (ac) { ac->ac_sb = sb; -diff -urNp linux-2.6.32.46/fs/ext4/super.c linux-2.6.32.46/fs/ext4/super.c ---- linux-2.6.32.46/fs/ext4/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ext4/super.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ext4/super.c linux-2.6.32.48/fs/ext4/super.c +--- linux-2.6.32.48/fs/ext4/super.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ext4/super.c 2011-11-12 12:46:47.000000000 -0500 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje } @@ -45231,9 +45195,9 @@ diff -urNp linux-2.6.32.46/fs/ext4/super.c linux-2.6.32.46/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.46/fs/fcntl.c linux-2.6.32.46/fs/fcntl.c ---- linux-2.6.32.46/fs/fcntl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fcntl.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fcntl.c linux-2.6.32.48/fs/fcntl.c +--- linux-2.6.32.48/fs/fcntl.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/fcntl.c 2011-11-12 12:46:47.000000000 -0500 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -45272,9 +45236,9 @@ diff -urNp linux-2.6.32.46/fs/fcntl.c linux-2.6.32.46/fs/fcntl.c if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -diff -urNp linux-2.6.32.46/fs/fifo.c linux-2.6.32.46/fs/fifo.c ---- linux-2.6.32.46/fs/fifo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fifo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fifo.c linux-2.6.32.48/fs/fifo.c +--- linux-2.6.32.48/fs/fifo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fifo.c 2011-11-12 12:46:47.000000000 -0500 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -45345,9 +45309,9 @@ diff -urNp linux-2.6.32.46/fs/fifo.c linux-2.6.32.46/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.46/fs/file.c linux-2.6.32.46/fs/file.c ---- linux-2.6.32.46/fs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/file.c linux-2.6.32.48/fs/file.c +--- linux-2.6.32.48/fs/file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/file.c 2011-11-12 12:46:47.000000000 -0500 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -45365,9 +45329,9 @@ diff -urNp linux-2.6.32.46/fs/file.c linux-2.6.32.46/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.46/fs/filesystems.c linux-2.6.32.46/fs/filesystems.c ---- linux-2.6.32.46/fs/filesystems.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/filesystems.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/filesystems.c linux-2.6.32.48/fs/filesystems.c +--- linux-2.6.32.48/fs/filesystems.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/filesystems.c 2011-11-12 12:46:47.000000000 -0500 @@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con int len = dot ? dot - name : strlen(name); @@ -45381,9 +45345,9 @@ diff -urNp linux-2.6.32.46/fs/filesystems.c linux-2.6.32.46/fs/filesystems.c fs = __get_fs_type(name, len); if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-2.6.32.46/fs/fscache/cookie.c linux-2.6.32.46/fs/fscache/cookie.c ---- linux-2.6.32.46/fs/fscache/cookie.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/cookie.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/cookie.c linux-2.6.32.48/fs/fscache/cookie.c +--- linux-2.6.32.48/fs/fscache/cookie.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/cookie.c 2011-11-12 12:46:47.000000000 -0500 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire parent ? (char *) parent->def->name : "<no-parent>", def->name, netfs_data); @@ -45502,9 +45466,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/cookie.c linux-2.6.32.46/fs/fscache/cookie wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, fscache_wait_bit, TASK_UNINTERRUPTIBLE); } -diff -urNp linux-2.6.32.46/fs/fscache/internal.h linux-2.6.32.46/fs/fscache/internal.h ---- linux-2.6.32.46/fs/fscache/internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/internal.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/internal.h linux-2.6.32.48/fs/fscache/internal.h +--- linux-2.6.32.48/fs/fscache/internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/internal.h 2011-11-12 12:46:47.000000000 -0500 @@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void); extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS]; extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS]; @@ -45708,9 +45672,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/internal.h linux-2.6.32.46/fs/fscache/inte #define fscache_stat_d(stat) do {} while (0) #endif -diff -urNp linux-2.6.32.46/fs/fscache/object.c linux-2.6.32.46/fs/fscache/object.c ---- linux-2.6.32.46/fs/fscache/object.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/object.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/object.c linux-2.6.32.48/fs/fscache/object.c +--- linux-2.6.32.48/fs/fscache/object.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/object.c 2011-11-12 12:46:47.000000000 -0500 @@ -144,7 +144,7 @@ static void fscache_object_state_machine /* update the object metadata on disk */ case FSCACHE_OBJECT_UPDATING: @@ -45822,9 +45786,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/object.c linux-2.6.32.46/fs/fscache/object break; default: -diff -urNp linux-2.6.32.46/fs/fscache/operation.c linux-2.6.32.46/fs/fscache/operation.c ---- linux-2.6.32.46/fs/fscache/operation.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/operation.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/operation.c linux-2.6.32.48/fs/fscache/operation.c +--- linux-2.6.32.48/fs/fscache/operation.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/operation.c 2011-11-12 12:46:47.000000000 -0500 @@ -16,7 +16,7 @@ #include <linux/seq_file.h> #include "internal.h" @@ -45940,9 +45904,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/operation.c linux-2.6.32.46/fs/fscache/ope ASSERTCMP(atomic_read(&op->usage), ==, 0); -diff -urNp linux-2.6.32.46/fs/fscache/page.c linux-2.6.32.46/fs/fscache/page.c ---- linux-2.6.32.46/fs/fscache/page.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/page.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/page.c linux-2.6.32.48/fs/fscache/page.c +--- linux-2.6.32.48/fs/fscache/page.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/page.c 2011-11-12 12:46:47.000000000 -0500 @@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct val = radix_tree_lookup(&cookie->stores, page->index); if (!val) { @@ -46326,9 +46290,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/page.c linux-2.6.32.46/fs/fscache/page.c #endif for (loop = 0; loop < pagevec->nr; loop++) { -diff -urNp linux-2.6.32.46/fs/fscache/stats.c linux-2.6.32.46/fs/fscache/stats.c ---- linux-2.6.32.46/fs/fscache/stats.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fscache/stats.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fscache/stats.c linux-2.6.32.48/fs/fscache/stats.c +--- linux-2.6.32.48/fs/fscache/stats.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fscache/stats.c 2011-11-12 12:46:47.000000000 -0500 @@ -18,95 +18,95 @@ /* * operation counters @@ -46704,9 +46668,9 @@ diff -urNp linux-2.6.32.46/fs/fscache/stats.c linux-2.6.32.46/fs/fscache/stats.c seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n", atomic_read(&fscache_n_cop_alloc_object), -diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c ---- linux-2.6.32.46/fs/fs_struct.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fs_struct.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fs_struct.c linux-2.6.32.48/fs/fs_struct.c +--- linux-2.6.32.48/fs/fs_struct.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fs_struct.c 2011-11-12 12:46:47.000000000 -0500 @@ -4,6 +4,7 @@ #include <linux/path.h> #include <linux/slab.h> @@ -46786,9 +46750,9 @@ diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-2.6.32.46/fs/fuse/cuse.c linux-2.6.32.46/fs/fuse/cuse.c ---- linux-2.6.32.46/fs/fuse/cuse.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fuse/cuse.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fuse/cuse.c linux-2.6.32.48/fs/fuse/cuse.c +--- linux-2.6.32.48/fs/fuse/cuse.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fuse/cuse.c 2011-11-12 12:46:47.000000000 -0500 @@ -576,10 +576,12 @@ static int __init cuse_init(void) INIT_LIST_HEAD(&cuse_conntbl[i]); @@ -46806,9 +46770,9 @@ diff -urNp linux-2.6.32.46/fs/fuse/cuse.c linux-2.6.32.46/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) -diff -urNp linux-2.6.32.46/fs/fuse/dev.c linux-2.6.32.46/fs/fuse/dev.c ---- linux-2.6.32.46/fs/fuse/dev.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/fs/fuse/dev.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fuse/dev.c linux-2.6.32.48/fs/fuse/dev.c +--- linux-2.6.32.48/fs/fuse/dev.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/fuse/dev.c 2011-11-12 12:46:47.000000000 -0500 @@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc { struct fuse_notify_inval_entry_out outarg; @@ -46852,9 +46816,9 @@ diff -urNp linux-2.6.32.46/fs/fuse/dev.c linux-2.6.32.46/fs/fuse/dev.c return err; } -diff -urNp linux-2.6.32.46/fs/fuse/dir.c linux-2.6.32.46/fs/fuse/dir.c ---- linux-2.6.32.46/fs/fuse/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/fuse/dir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/fuse/dir.c linux-2.6.32.48/fs/fuse/dir.c +--- linux-2.6.32.48/fs/fuse/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/fuse/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -46864,9 +46828,9 @@ diff -urNp linux-2.6.32.46/fs/fuse/dir.c linux-2.6.32.46/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.46/fs/gfs2/ops_inode.c linux-2.6.32.46/fs/gfs2/ops_inode.c ---- linux-2.6.32.46/fs/gfs2/ops_inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/gfs2/ops_inode.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/gfs2/ops_inode.c linux-2.6.32.48/fs/gfs2/ops_inode.c +--- linux-2.6.32.48/fs/gfs2/ops_inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/gfs2/ops_inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odi unsigned int x; int error; @@ -46876,9 +46840,9 @@ diff -urNp linux-2.6.32.46/fs/gfs2/ops_inode.c linux-2.6.32.46/fs/gfs2/ops_inode if (ndentry->d_inode) { nip = GFS2_I(ndentry->d_inode); if (ip == nip) -diff -urNp linux-2.6.32.46/fs/gfs2/sys.c linux-2.6.32.46/fs/gfs2/sys.c ---- linux-2.6.32.46/fs/gfs2/sys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/gfs2/sys.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/gfs2/sys.c linux-2.6.32.48/fs/gfs2/sys.c +--- linux-2.6.32.48/fs/gfs2/sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/gfs2/sys.c 2011-11-12 12:46:47.000000000 -0500 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -46897,9 +46861,9 @@ diff -urNp linux-2.6.32.46/fs/gfs2/sys.c linux-2.6.32.46/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.46/fs/hfsplus/catalog.c linux-2.6.32.46/fs/hfsplus/catalog.c ---- linux-2.6.32.46/fs/hfsplus/catalog.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hfsplus/catalog.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hfsplus/catalog.c linux-2.6.32.48/fs/hfsplus/catalog.c +--- linux-2.6.32.48/fs/hfsplus/catalog.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hfsplus/catalog.c 2011-11-12 12:46:47.000000000 -0500 @@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block int err; u16 type; @@ -46927,9 +46891,9 @@ diff -urNp linux-2.6.32.46/fs/hfsplus/catalog.c linux-2.6.32.46/fs/hfsplus/catal dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); sb = src_dir->i_sb; -diff -urNp linux-2.6.32.46/fs/hfsplus/dir.c linux-2.6.32.46/fs/hfsplus/dir.c ---- linux-2.6.32.46/fs/hfsplus/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hfsplus/dir.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hfsplus/dir.c linux-2.6.32.48/fs/hfsplus/dir.c +--- linux-2.6.32.48/fs/hfsplus/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hfsplus/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file * struct hfsplus_readdir_data *rd; u16 type; @@ -46939,9 +46903,9 @@ diff -urNp linux-2.6.32.46/fs/hfsplus/dir.c linux-2.6.32.46/fs/hfsplus/dir.c if (filp->f_pos >= inode->i_size) return 0; -diff -urNp linux-2.6.32.46/fs/hfsplus/inode.c linux-2.6.32.46/fs/hfsplus/inode.c ---- linux-2.6.32.46/fs/hfsplus/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hfsplus/inode.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hfsplus/inode.c linux-2.6.32.48/fs/hfsplus/inode.c +--- linux-2.6.32.48/fs/hfsplus/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hfsplus/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode int res = 0; u16 type; @@ -46960,9 +46924,9 @@ diff -urNp linux-2.6.32.46/fs/hfsplus/inode.c linux-2.6.32.46/fs/hfsplus/inode.c if (HFSPLUS_IS_RSRC(inode)) main_inode = HFSPLUS_I(inode).rsrc_inode; -diff -urNp linux-2.6.32.46/fs/hfsplus/ioctl.c linux-2.6.32.46/fs/hfsplus/ioctl.c ---- linux-2.6.32.46/fs/hfsplus/ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hfsplus/ioctl.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hfsplus/ioctl.c linux-2.6.32.48/fs/hfsplus/ioctl.c +--- linux-2.6.32.48/fs/hfsplus/ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hfsplus/ioctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dent struct hfsplus_cat_file *file; int res; @@ -46981,9 +46945,9 @@ diff -urNp linux-2.6.32.46/fs/hfsplus/ioctl.c linux-2.6.32.46/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; -diff -urNp linux-2.6.32.46/fs/hfsplus/super.c linux-2.6.32.46/fs/hfsplus/super.c ---- linux-2.6.32.46/fs/hfsplus/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hfsplus/super.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hfsplus/super.c linux-2.6.32.48/fs/hfsplus/super.c +--- linux-2.6.32.48/fs/hfsplus/super.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hfsplus/super.c 2011-11-12 12:46:47.000000000 -0500 @@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct sup struct nls_table *nls = NULL; int err = -EINVAL; @@ -46993,9 +46957,9 @@ diff -urNp linux-2.6.32.46/fs/hfsplus/super.c linux-2.6.32.46/fs/hfsplus/super.c sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) return -ENOMEM; -diff -urNp linux-2.6.32.46/fs/hugetlbfs/inode.c linux-2.6.32.46/fs/hugetlbfs/inode.c ---- linux-2.6.32.46/fs/hugetlbfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/hugetlbfs/inode.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/hugetlbfs/inode.c linux-2.6.32.48/fs/hugetlbfs/inode.c +--- linux-2.6.32.48/fs/hugetlbfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/hugetlbfs/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -47005,9 +46969,9 @@ diff -urNp linux-2.6.32.46/fs/hugetlbfs/inode.c linux-2.6.32.46/fs/hugetlbfs/ino static int can_do_hugetlb_shm(void) { -diff -urNp linux-2.6.32.46/fs/ioctl.c linux-2.6.32.46/fs/ioctl.c ---- linux-2.6.32.46/fs/ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ioctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ioctl.c linux-2.6.32.48/fs/ioctl.c +--- linux-2.6.32.48/fs/ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ioctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -47035,9 +46999,9 @@ diff -urNp linux-2.6.32.46/fs/ioctl.c linux-2.6.32.46/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.46/fs/jbd/checkpoint.c linux-2.6.32.46/fs/jbd/checkpoint.c ---- linux-2.6.32.46/fs/jbd/checkpoint.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jbd/checkpoint.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jbd/checkpoint.c linux-2.6.32.48/fs/jbd/checkpoint.c +--- linux-2.6.32.48/fs/jbd/checkpoint.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jbd/checkpoint.c 2011-11-12 12:46:47.000000000 -0500 @@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal tid_t this_tid; int result; @@ -47047,9 +47011,9 @@ diff -urNp linux-2.6.32.46/fs/jbd/checkpoint.c linux-2.6.32.46/fs/jbd/checkpoint jbd_debug(1, "Start checkpoint\n"); /* -diff -urNp linux-2.6.32.46/fs/jffs2/compr_rtime.c linux-2.6.32.46/fs/jffs2/compr_rtime.c ---- linux-2.6.32.46/fs/jffs2/compr_rtime.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jffs2/compr_rtime.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jffs2/compr_rtime.c linux-2.6.32.48/fs/jffs2/compr_rtime.c +--- linux-2.6.32.48/fs/jffs2/compr_rtime.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jffs2/compr_rtime.c 2011-11-12 12:46:47.000000000 -0500 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned int outpos = 0; int pos=0; @@ -47068,9 +47032,9 @@ diff -urNp linux-2.6.32.46/fs/jffs2/compr_rtime.c linux-2.6.32.46/fs/jffs2/compr memset(positions,0,sizeof(positions)); while (outpos<destlen) { -diff -urNp linux-2.6.32.46/fs/jffs2/compr_rubin.c linux-2.6.32.46/fs/jffs2/compr_rubin.c ---- linux-2.6.32.46/fs/jffs2/compr_rubin.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jffs2/compr_rubin.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jffs2/compr_rubin.c linux-2.6.32.48/fs/jffs2/compr_rubin.c +--- linux-2.6.32.48/fs/jffs2/compr_rubin.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jffs2/compr_rubin.c 2011-11-12 12:46:47.000000000 -0500 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig int ret; uint32_t mysrclen, mydstlen; @@ -47080,9 +47044,9 @@ diff -urNp linux-2.6.32.46/fs/jffs2/compr_rubin.c linux-2.6.32.46/fs/jffs2/compr mysrclen = *sourcelen; mydstlen = *dstlen - 8; -diff -urNp linux-2.6.32.46/fs/jffs2/erase.c linux-2.6.32.46/fs/jffs2/erase.c ---- linux-2.6.32.46/fs/jffs2/erase.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jffs2/erase.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jffs2/erase.c linux-2.6.32.48/fs/jffs2/erase.c +--- linux-2.6.32.48/fs/jffs2/erase.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jffs2/erase.c 2011-11-12 12:46:47.000000000 -0500 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -47093,9 +47057,9 @@ diff -urNp linux-2.6.32.46/fs/jffs2/erase.c linux-2.6.32.46/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.46/fs/jffs2/wbuf.c linux-2.6.32.46/fs/jffs2/wbuf.c ---- linux-2.6.32.46/fs/jffs2/wbuf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jffs2/wbuf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jffs2/wbuf.c linux-2.6.32.48/fs/jffs2/wbuf.c +--- linux-2.6.32.48/fs/jffs2/wbuf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jffs2/wbuf.c 2011-11-12 12:46:47.000000000 -0500 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -47106,9 +47070,9 @@ diff -urNp linux-2.6.32.46/fs/jffs2/wbuf.c linux-2.6.32.46/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.32.46/fs/jffs2/xattr.c linux-2.6.32.46/fs/jffs2/xattr.c ---- linux-2.6.32.46/fs/jffs2/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jffs2/xattr.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jffs2/xattr.c linux-2.6.32.48/fs/jffs2/xattr.c +--- linux-2.6.32.48/fs/jffs2/xattr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jffs2/xattr.c 2011-11-12 12:46:47.000000000 -0500 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING)); @@ -47118,9 +47082,9 @@ diff -urNp linux-2.6.32.46/fs/jffs2/xattr.c linux-2.6.32.46/fs/jffs2/xattr.c /* Phase.1 : Merge same xref */ for (i=0; i < XREF_TMPHASH_SIZE; i++) xref_tmphash[i] = NULL; -diff -urNp linux-2.6.32.46/fs/jfs/super.c linux-2.6.32.46/fs/jfs/super.c ---- linux-2.6.32.46/fs/jfs/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/jfs/super.c 2011-06-07 18:06:04.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/jfs/super.c linux-2.6.32.48/fs/jfs/super.c +--- linux-2.6.32.48/fs/jfs/super.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/jfs/super.c 2011-11-12 12:46:47.000000000 -0500 @@ -793,7 +793,7 @@ static int __init init_jfs_fs(void) jfs_inode_cachep = @@ -47130,9 +47094,9 @@ diff -urNp linux-2.6.32.46/fs/jfs/super.c linux-2.6.32.46/fs/jfs/super.c init_once); if (jfs_inode_cachep == NULL) return -ENOMEM; -diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt ---- linux-2.6.32.46/fs/Kconfig.binfmt 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/Kconfig.binfmt 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/Kconfig.binfmt linux-2.6.32.48/fs/Kconfig.binfmt +--- linux-2.6.32.48/fs/Kconfig.binfmt 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/Kconfig.binfmt 2011-11-12 12:46:47.000000000 -0500 @@ -86,7 +86,7 @@ config HAVE_AOUT config BINFMT_AOUT @@ -47142,9 +47106,9 @@ diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt ---help--- A.out (Assembler.OUTput) is a set of formats for libraries and executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-2.6.32.46/fs/libfs.c linux-2.6.32.46/fs/libfs.c ---- linux-2.6.32.46/fs/libfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/libfs.c 2011-05-11 18:25:15.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/libfs.c linux-2.6.32.48/fs/libfs.c +--- linux-2.6.32.48/fs/libfs.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/libfs.c 2011-11-12 12:46:47.000000000 -0500 @@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, v for (p=q->next; p != &dentry->d_subdirs; p=p->next) { @@ -47167,9 +47131,9 @@ diff -urNp linux-2.6.32.46/fs/libfs.c linux-2.6.32.46/fs/libfs.c next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0) -diff -urNp linux-2.6.32.46/fs/lockd/clntproc.c linux-2.6.32.46/fs/lockd/clntproc.c ---- linux-2.6.32.46/fs/lockd/clntproc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/lockd/clntproc.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/lockd/clntproc.c linux-2.6.32.48/fs/lockd/clntproc.c +--- linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/lockd/clntproc.c 2011-11-12 12:46:47.000000000 -0500 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt /* * Cookie counter for NLM requests @@ -47193,9 +47157,9 @@ diff -urNp linux-2.6.32.46/fs/lockd/clntproc.c linux-2.6.32.46/fs/lockd/clntproc req = &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); -diff -urNp linux-2.6.32.46/fs/lockd/svc.c linux-2.6.32.46/fs/lockd/svc.c ---- linux-2.6.32.46/fs/lockd/svc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/lockd/svc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/lockd/svc.c linux-2.6.32.48/fs/lockd/svc.c +--- linux-2.6.32.48/fs/lockd/svc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/lockd/svc.c 2011-11-12 12:46:47.000000000 -0500 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -47205,9 +47169,9 @@ diff -urNp linux-2.6.32.46/fs/lockd/svc.c linux-2.6.32.46/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.46/fs/locks.c linux-2.6.32.46/fs/locks.c ---- linux-2.6.32.46/fs/locks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/locks.c 2011-07-06 19:47:11.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/locks.c linux-2.6.32.48/fs/locks.c +--- linux-2.6.32.48/fs/locks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/locks.c 2011-11-12 12:46:47.000000000 -0500 @@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list); static struct kmem_cache *filelock_cache __read_mostly; @@ -47278,9 +47242,9 @@ diff -urNp linux-2.6.32.46/fs/locks.c linux-2.6.32.46/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.46/fs/mbcache.c linux-2.6.32.46/fs/mbcache.c ---- linux-2.6.32.46/fs/mbcache.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/mbcache.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/mbcache.c linux-2.6.32.48/fs/mbcache.c +--- linux-2.6.32.48/fs/mbcache.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/mbcache.c 2011-11-12 12:46:47.000000000 -0500 @@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct if (!cache) goto fail; @@ -47293,9 +47257,9 @@ diff -urNp linux-2.6.32.46/fs/mbcache.c linux-2.6.32.46/fs/mbcache.c atomic_set(&cache->c_entry_count, 0); cache->c_bucket_bits = bucket_bits; #ifdef MB_CACHE_INDEXES_COUNT -diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c ---- linux-2.6.32.46/fs/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/namei.c 2011-10-19 12:12:56.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/namei.c linux-2.6.32.48/fs/namei.c +--- linux-2.6.32.48/fs/namei.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/namei.c 2011-11-12 12:46:47.000000000 -0500 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino return ret; @@ -47748,9 +47712,9 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c len = -EFAULT; out: return len; -diff -urNp linux-2.6.32.46/fs/namespace.c linux-2.6.32.46/fs/namespace.c ---- linux-2.6.32.46/fs/namespace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/namespace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/namespace.c linux-2.6.32.48/fs/namespace.c +--- linux-2.6.32.48/fs/namespace.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/namespace.c 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -47811,9 +47775,9 @@ diff -urNp linux-2.6.32.46/fs/namespace.c linux-2.6.32.46/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.46/fs/ncpfs/dir.c linux-2.6.32.46/fs/ncpfs/dir.c ---- linux-2.6.32.46/fs/ncpfs/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ncpfs/dir.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ncpfs/dir.c linux-2.6.32.48/fs/ncpfs/dir.c +--- linux-2.6.32.48/fs/ncpfs/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ncpfs/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *den int res, val = 0, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -47873,9 +47837,9 @@ diff -urNp linux-2.6.32.46/fs/ncpfs/dir.c linux-2.6.32.46/fs/ncpfs/dir.c DPRINTK("ncp_rename: %s/%s to %s/%s\n", old_dentry->d_parent->d_name.name, old_dentry->d_name.name, new_dentry->d_parent->d_name.name, new_dentry->d_name.name); -diff -urNp linux-2.6.32.46/fs/ncpfs/inode.c linux-2.6.32.46/fs/ncpfs/inode.c ---- linux-2.6.32.46/fs/ncpfs/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ncpfs/inode.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ncpfs/inode.c linux-2.6.32.48/fs/ncpfs/inode.c +--- linux-2.6.32.48/fs/ncpfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ncpfs/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_b #endif struct ncp_entry_info finfo; @@ -47885,9 +47849,9 @@ diff -urNp linux-2.6.32.46/fs/ncpfs/inode.c linux-2.6.32.46/fs/ncpfs/inode.c data.wdog_pid = NULL; server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); if (!server) -diff -urNp linux-2.6.32.46/fs/nfs/inode.c linux-2.6.32.46/fs/nfs/inode.c ---- linux-2.6.32.46/fs/nfs/inode.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/fs/nfs/inode.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/nfs/inode.c linux-2.6.32.48/fs/nfs/inode.c +--- linux-2.6.32.48/fs/nfs/inode.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/nfs/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); nfsi->attrtimeo_timestamp = jiffies; @@ -47917,9 +47881,9 @@ diff -urNp linux-2.6.32.46/fs/nfs/inode.c linux-2.6.32.46/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.46/fs/nfsd/lockd.c linux-2.6.32.46/fs/nfsd/lockd.c ---- linux-2.6.32.46/fs/nfsd/lockd.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/fs/nfsd/lockd.c 2011-04-17 17:03:15.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/nfsd/lockd.c linux-2.6.32.48/fs/nfsd/lockd.c +--- linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/nfsd/lockd.c 2011-11-12 12:46:47.000000000 -0500 @@ -66,7 +66,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -47929,10 +47893,10 @@ diff -urNp linux-2.6.32.46/fs/nfsd/lockd.c linux-2.6.32.46/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.46/fs/nfsd/nfs4state.c linux-2.6.32.46/fs/nfsd/nfs4state.c ---- linux-2.6.32.46/fs/nfsd/nfs4state.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/nfsd/nfs4state.c 2011-05-16 21:46:57.000000000 -0400 -@@ -3457,6 +3457,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc +diff -urNp linux-2.6.32.48/fs/nfsd/nfs4state.c linux-2.6.32.48/fs/nfsd/nfs4state.c +--- linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/nfsd/nfs4state.c 2011-11-12 12:46:47.000000000 -0500 +@@ -3459,6 +3459,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc unsigned int cmd; int err; @@ -47941,9 +47905,9 @@ diff -urNp linux-2.6.32.46/fs/nfsd/nfs4state.c linux-2.6.32.46/fs/nfsd/nfs4state dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", (long long) lock->lk_offset, (long long) lock->lk_length); -diff -urNp linux-2.6.32.46/fs/nfsd/nfs4xdr.c linux-2.6.32.46/fs/nfsd/nfs4xdr.c ---- linux-2.6.32.46/fs/nfsd/nfs4xdr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/nfsd/nfs4xdr.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/nfsd/nfs4xdr.c linux-2.6.32.48/fs/nfsd/nfs4xdr.c +--- linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/nfsd/nfs4xdr.c 2011-11-12 12:46:47.000000000 -0500 @@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s struct nfsd4_compoundres *resp = rqstp->rq_resp; u32 minorversion = resp->cstate.minorversion; @@ -47953,9 +47917,9 @@ diff -urNp linux-2.6.32.46/fs/nfsd/nfs4xdr.c linux-2.6.32.46/fs/nfsd/nfs4xdr.c BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); -diff -urNp linux-2.6.32.46/fs/nfsd/vfs.c linux-2.6.32.46/fs/nfsd/vfs.c ---- linux-2.6.32.46/fs/nfsd/vfs.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/fs/nfsd/vfs.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/nfsd/vfs.c linux-2.6.32.48/fs/nfsd/vfs.c +--- linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/nfsd/vfs.c 2011-11-12 12:46:47.000000000 -0500 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -47983,9 +47947,9 @@ diff -urNp linux-2.6.32.46/fs/nfsd/vfs.c linux-2.6.32.46/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.46/fs/nilfs2/ioctl.c linux-2.6.32.46/fs/nilfs2/ioctl.c ---- linux-2.6.32.46/fs/nilfs2/ioctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/nilfs2/ioctl.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/nilfs2/ioctl.c linux-2.6.32.48/fs/nilfs2/ioctl.c +--- linux-2.6.32.48/fs/nilfs2/ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/nilfs2/ioctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(st unsigned int cmd, void __user *argp) { @@ -47995,9 +47959,9 @@ diff -urNp linux-2.6.32.46/fs/nilfs2/ioctl.c linux-2.6.32.46/fs/nilfs2/ioctl.c sizeof(struct nilfs_vdesc), sizeof(struct nilfs_period), sizeof(__u64), -diff -urNp linux-2.6.32.46/fs/notify/dnotify/dnotify.c linux-2.6.32.46/fs/notify/dnotify/dnotify.c ---- linux-2.6.32.46/fs/notify/dnotify/dnotify.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/notify/dnotify/dnotify.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/notify/dnotify/dnotify.c linux-2.6.32.48/fs/notify/dnotify/dnotify.c +--- linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/notify/dnotify/dnotify.c 2011-11-12 12:46:47.000000000 -0500 @@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn kmem_cache_free(dnotify_mark_entry_cache, dnentry); } @@ -48007,9 +47971,9 @@ diff -urNp linux-2.6.32.46/fs/notify/dnotify/dnotify.c linux-2.6.32.46/fs/notify .handle_event = dnotify_handle_event, .should_send_event = dnotify_should_send_event, .free_group_priv = NULL, -diff -urNp linux-2.6.32.46/fs/notify/notification.c linux-2.6.32.46/fs/notify/notification.c ---- linux-2.6.32.46/fs/notify/notification.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/notify/notification.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/notify/notification.c linux-2.6.32.48/fs/notify/notification.c +--- linux-2.6.32.48/fs/notify/notification.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/notify/notification.c 2011-11-12 12:46:47.000000000 -0500 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event * get set to 0 so it will never get 'freed' */ @@ -48028,9 +47992,9 @@ diff -urNp linux-2.6.32.46/fs/notify/notification.c linux-2.6.32.46/fs/notify/no } EXPORT_SYMBOL_GPL(fsnotify_get_cookie); -diff -urNp linux-2.6.32.46/fs/ntfs/dir.c linux-2.6.32.46/fs/ntfs/dir.c ---- linux-2.6.32.46/fs/ntfs/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ntfs/dir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ntfs/dir.c linux-2.6.32.48/fs/ntfs/dir.c +--- linux-2.6.32.48/fs/ntfs/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ntfs/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -1328,7 +1328,7 @@ find_next_index_buffer: ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -48040,9 +48004,9 @@ diff -urNp linux-2.6.32.46/fs/ntfs/dir.c linux-2.6.32.46/fs/ntfs/dir.c 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.46/fs/ntfs/file.c linux-2.6.32.46/fs/ntfs/file.c ---- linux-2.6.32.46/fs/ntfs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ntfs/file.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ntfs/file.c linux-2.6.32.48/fs/ntfs/file.c +--- linux-2.6.32.48/fs/ntfs/file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ntfs/file.c 2011-11-12 12:46:47.000000000 -0500 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -48052,9 +48016,9 @@ diff -urNp linux-2.6.32.46/fs/ntfs/file.c linux-2.6.32.46/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.32.46/fs/ocfs2/cluster/masklog.c linux-2.6.32.46/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.46/fs/ocfs2/cluster/masklog.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/cluster/masklog.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/cluster/masklog.c linux-2.6.32.48/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/cluster/masklog.c 2011-11-12 12:46:47.000000000 -0500 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -48064,9 +48028,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/cluster/masklog.c linux-2.6.32.46/fs/ocfs2/c .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.46/fs/ocfs2/localalloc.c linux-2.6.32.46/fs/ocfs2/localalloc.c ---- linux-2.6.32.46/fs/ocfs2/localalloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/localalloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/localalloc.c linux-2.6.32.48/fs/ocfs2/localalloc.c +--- linux-2.6.32.48/fs/ocfs2/localalloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/localalloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -48076,9 +48040,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/localalloc.c linux-2.6.32.46/fs/ocfs2/locala status = 0; bail: -diff -urNp linux-2.6.32.46/fs/ocfs2/namei.c linux-2.6.32.46/fs/ocfs2/namei.c ---- linux-2.6.32.46/fs/ocfs2/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/namei.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/namei.c linux-2.6.32.48/fs/ocfs2/namei.c +--- linux-2.6.32.48/fs/ocfs2/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/namei.c 2011-11-12 12:46:47.000000000 -0500 @@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *ol struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; struct ocfs2_dir_lookup_result target_insert = { NULL, }; @@ -48088,9 +48052,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/namei.c linux-2.6.32.46/fs/ocfs2/namei.c /* At some point it might be nice to break this function up a * bit. */ -diff -urNp linux-2.6.32.46/fs/ocfs2/ocfs2.h linux-2.6.32.46/fs/ocfs2/ocfs2.h ---- linux-2.6.32.46/fs/ocfs2/ocfs2.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/ocfs2.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/ocfs2.h linux-2.6.32.48/fs/ocfs2/ocfs2.h +--- linux-2.6.32.48/fs/ocfs2/ocfs2.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/ocfs2.h 2011-11-12 12:46:47.000000000 -0500 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -48108,9 +48072,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/ocfs2.h linux-2.6.32.46/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.46/fs/ocfs2/suballoc.c linux-2.6.32.46/fs/ocfs2/suballoc.c ---- linux-2.6.32.46/fs/ocfs2/suballoc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/suballoc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/suballoc.c linux-2.6.32.48/fs/ocfs2/suballoc.c +--- linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/suballoc.c 2011-11-12 12:46:47.000000000 -0500 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -48156,9 +48120,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/suballoc.c linux-2.6.32.46/fs/ocfs2/suballoc } } if (status < 0) { -diff -urNp linux-2.6.32.46/fs/ocfs2/super.c linux-2.6.32.46/fs/ocfs2/super.c ---- linux-2.6.32.46/fs/ocfs2/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/ocfs2/super.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/ocfs2/super.c linux-2.6.32.48/fs/ocfs2/super.c +--- linux-2.6.32.48/fs/ocfs2/super.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/ocfs2/super.c 2011-11-12 12:46:47.000000000 -0500 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -48193,9 +48157,9 @@ diff -urNp linux-2.6.32.46/fs/ocfs2/super.c linux-2.6.32.46/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.46/fs/open.c linux-2.6.32.46/fs/open.c ---- linux-2.6.32.46/fs/open.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/open.c 2011-09-13 16:03:56.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/open.c linux-2.6.32.48/fs/open.c +--- linux-2.6.32.48/fs/open.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/open.c 2011-11-12 12:46:47.000000000 -0500 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _ error = locks_verify_truncate(inode, NULL, length); if (!error) @@ -48375,9 +48339,9 @@ diff -urNp linux-2.6.32.46/fs/open.c linux-2.6.32.46/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd = PTR_ERR(f); -diff -urNp linux-2.6.32.46/fs/partitions/ldm.c linux-2.6.32.46/fs/partitions/ldm.c ---- linux-2.6.32.46/fs/partitions/ldm.c 2011-06-25 12:55:34.000000000 -0400 -+++ linux-2.6.32.46/fs/partitions/ldm.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/partitions/ldm.c linux-2.6.32.48/fs/partitions/ldm.c +--- linux-2.6.32.48/fs/partitions/ldm.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/partitions/ldm.c 2011-11-12 12:46:47.000000000 -0500 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data ldm_error ("A VBLK claims to have %d parts.", num); return false; @@ -48395,9 +48359,9 @@ diff -urNp linux-2.6.32.46/fs/partitions/ldm.c linux-2.6.32.46/fs/partitions/ldm if (!f) { ldm_crit ("Out of memory."); return false; -diff -urNp linux-2.6.32.46/fs/partitions/mac.c linux-2.6.32.46/fs/partitions/mac.c ---- linux-2.6.32.46/fs/partitions/mac.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/partitions/mac.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/partitions/mac.c linux-2.6.32.48/fs/partitions/mac.c +--- linux-2.6.32.48/fs/partitions/mac.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/partitions/mac.c 2011-11-12 12:46:47.000000000 -0500 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio return 0; /* not a MacOS disk */ } @@ -48411,9 +48375,9 @@ diff -urNp linux-2.6.32.46/fs/partitions/mac.c linux-2.6.32.46/fs/partitions/mac for (slot = 1; slot <= blocks_in_map; ++slot) { int pos = slot * secsize; put_dev_sector(sect); -diff -urNp linux-2.6.32.46/fs/pipe.c linux-2.6.32.46/fs/pipe.c ---- linux-2.6.32.46/fs/pipe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/pipe.c 2011-04-23 13:37:17.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/pipe.c linux-2.6.32.48/fs/pipe.c +--- linux-2.6.32.48/fs/pipe.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/pipe.c 2011-11-12 12:46:47.000000000 -0500 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -48537,9 +48501,9 @@ diff -urNp linux-2.6.32.46/fs/pipe.c linux-2.6.32.46/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c ---- linux-2.6.32.46/fs/proc/array.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/array.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/array.c linux-2.6.32.48/fs/proc/array.c +--- linux-2.6.32.48/fs/proc/array.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/array.c 2011-11-12 12:46:47.000000000 -0500 @@ -60,6 +60,7 @@ #include <linux/tty.h> #include <linux/string.h> @@ -48663,9 +48627,9 @@ diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c ---- linux-2.6.32.46/fs/proc/base.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/base.c 2011-10-19 04:05:03.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/base.c linux-2.6.32.48/fs/proc/base.c +--- linux-2.6.32.48/fs/proc/base.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/base.c 2011-11-12 12:59:33.000000000 -0500 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -48747,16 +48711,16 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/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 +366,7 @@ static int proc_pid_wchan(struct task_st +@@ -345,7 +383,7 @@ static void unlock_trace(struct task_str + mutex_unlock(&task->cred_guard_mutex); } - #endif /* CONFIG_KALLSYMS */ -#ifdef CONFIG_STACKTRACE +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM) #define MAX_STACK_TRACE_DEPTH 64 -@@ -522,7 +560,7 @@ static int proc_pid_limits(struct task_s +@@ -545,7 +583,7 @@ static int proc_pid_limits(struct task_s return count; } @@ -48765,7 +48729,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c static int proc_pid_syscall(struct task_struct *task, char *buffer) { long nr; -@@ -547,7 +585,7 @@ static int proc_pid_syscall(struct task_ +@@ -574,7 +612,7 @@ static int proc_pid_syscall(struct task_ /************************************************************************/ /* permission checks */ @@ -48774,7 +48738,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c { struct task_struct *task; int allowed = 0; -@@ -557,7 +595,10 @@ static int proc_fd_access_allowed(struct +@@ -584,7 +622,10 @@ static int proc_fd_access_allowed(struct */ task = get_proc_task(inode); if (task) { @@ -48786,7 +48750,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c put_task_struct(task); } return allowed; -@@ -936,6 +977,9 @@ static ssize_t environ_read(struct file +@@ -963,6 +1004,9 @@ static ssize_t environ_read(struct file if (!task) goto out_no_task; @@ -48796,7 +48760,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1350,7 +1394,7 @@ static void *proc_pid_follow_link(struct +@@ -1377,7 +1421,7 @@ static void *proc_pid_follow_link(struct path_put(&nd->path); /* Are we allowed to snoop on the tasks file descriptors? */ @@ -48805,7 +48769,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c goto out; error = PROC_I(inode)->op.proc_get_link(inode, &nd->path); -@@ -1390,8 +1434,18 @@ static int proc_pid_readlink(struct dent +@@ -1417,8 +1461,18 @@ static int proc_pid_readlink(struct dent struct path path; /* Are we allowed to snoop on the tasks file descriptors? */ @@ -48826,7 +48790,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c error = PROC_I(inode)->op.proc_get_link(inode, &path); if (error) -@@ -1456,7 +1510,11 @@ static struct inode *proc_pid_make_inode +@@ -1483,7 +1537,11 @@ static struct inode *proc_pid_make_inode rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -48838,7 +48802,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1474,6 +1532,9 @@ static int pid_getattr(struct vfsmount * +@@ -1501,6 +1559,9 @@ static int pid_getattr(struct vfsmount * struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -48848,7 +48812,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1481,13 +1542,41 @@ static int pid_getattr(struct vfsmount * +@@ -1508,13 +1569,41 @@ static int pid_getattr(struct vfsmount * stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -48891,7 +48855,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c } rcu_read_unlock(); return 0; -@@ -1518,11 +1607,20 @@ static int pid_revalidate(struct dentry +@@ -1545,11 +1634,20 @@ static int pid_revalidate(struct dentry if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -48912,7 +48876,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1643,7 +1741,8 @@ static int proc_fd_info(struct inode *in +@@ -1670,7 +1768,8 @@ static int proc_fd_info(struct inode *in int fd = proc_fd(inode); if (task) { @@ -48922,7 +48886,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1895,12 +1994,22 @@ static const struct file_operations proc +@@ -1922,12 +2021,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -48947,7 +48911,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c return rv; } -@@ -2009,6 +2118,9 @@ static struct dentry *proc_pident_lookup +@@ -2036,6 +2145,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -48957,7 +48921,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/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 +2165,9 @@ static int proc_pident_readdir(struct fi +@@ -2080,6 +2192,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -48967,7 +48931,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2320,7 +2435,7 @@ static void *proc_self_follow_link(struc +@@ -2347,7 +2462,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -48976,16 +48940,16 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2522,7 +2637,7 @@ static const struct pid_entry tgid_base_ +@@ -2553,7 +2668,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP) - INF("syscall", S_IRUSR, proc_pid_syscall), + INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2547,10 +2662,10 @@ static const struct pid_entry tgid_base_ +@@ -2578,10 +2693,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 @@ -48995,10 +48959,10 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c #endif -#ifdef CONFIG_STACKTRACE +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM) - ONE("stack", S_IRUSR, proc_pid_stack), + ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2580,6 +2695,9 @@ static const struct pid_entry tgid_base_ +@@ -2611,6 +2726,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUSR, proc_tgid_io_accounting), #endif @@ -49008,7 +48972,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2704,7 +2822,14 @@ static struct dentry *proc_pid_instantia +@@ -2735,7 +2853,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -49023,7 +48987,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2746,7 +2871,14 @@ struct dentry *proc_pid_lookup(struct in +@@ -2777,7 +2902,14 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -49038,7 +49002,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2811,6 +2943,11 @@ int proc_pid_readdir(struct file * filp, +@@ -2842,6 +2974,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr; struct task_struct *reaper; @@ -49050,7 +49014,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2834,8 +2971,27 @@ int proc_pid_readdir(struct file * filp, +@@ -2865,8 +3002,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -49079,16 +49043,16 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -2861,7 +3017,7 @@ static const struct pid_entry tid_base_s +@@ -2892,7 +3048,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP) - INF("syscall", S_IRUSR, proc_pid_syscall), + INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2885,10 +3041,10 @@ static const struct pid_entry tid_base_s +@@ -2916,10 +3072,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 @@ -49098,12 +49062,12 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c #endif -#ifdef CONFIG_STACKTRACE +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM) - ONE("stack", S_IRUSR, proc_pid_stack), + ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.46/fs/proc/cmdline.c linux-2.6.32.46/fs/proc/cmdline.c ---- linux-2.6.32.46/fs/proc/cmdline.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/cmdline.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/cmdline.c linux-2.6.32.48/fs/proc/cmdline.c +--- linux-2.6.32.48/fs/proc/cmdline.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/cmdline.c 2011-11-12 12:46:47.000000000 -0500 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -49116,9 +49080,9 @@ diff -urNp linux-2.6.32.46/fs/proc/cmdline.c linux-2.6.32.46/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.46/fs/proc/devices.c linux-2.6.32.46/fs/proc/devices.c ---- linux-2.6.32.46/fs/proc/devices.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/devices.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/devices.c linux-2.6.32.48/fs/proc/devices.c +--- linux-2.6.32.48/fs/proc/devices.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/devices.c 2011-11-12 12:46:47.000000000 -0500 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -49131,9 +49095,9 @@ diff -urNp linux-2.6.32.46/fs/proc/devices.c linux-2.6.32.46/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.46/fs/proc/inode.c linux-2.6.32.46/fs/proc/inode.c ---- linux-2.6.32.46/fs/proc/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/inode.c 2011-10-19 04:08:02.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/inode.c linux-2.6.32.48/fs/proc/inode.c +--- linux-2.6.32.48/fs/proc/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -18,12 +18,19 @@ #include <linux/module.h> #include <linux/smp_lock.h> @@ -49180,9 +49144,9 @@ diff -urNp linux-2.6.32.46/fs/proc/inode.c linux-2.6.32.46/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.46/fs/proc/internal.h linux-2.6.32.46/fs/proc/internal.h ---- linux-2.6.32.46/fs/proc/internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/internal.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/internal.h linux-2.6.32.48/fs/proc/internal.h +--- linux-2.6.32.48/fs/proc/internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/internal.h 2011-11-12 12:46:47.000000000 -0500 @@ -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, @@ -49193,9 +49157,9 @@ diff -urNp linux-2.6.32.46/fs/proc/internal.h linux-2.6.32.46/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig ---- linux-2.6.32.46/fs/proc/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/Kconfig linux-2.6.32.48/fs/proc/Kconfig +--- linux-2.6.32.48/fs/proc/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/Kconfig 2011-11-12 12:46:47.000000000 -0500 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -49223,9 +49187,9 @@ diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.32.46/fs/proc/kcore.c linux-2.6.32.46/fs/proc/kcore.c ---- linux-2.6.32.46/fs/proc/kcore.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/kcore.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/kcore.c linux-2.6.32.48/fs/proc/kcore.c +--- linux-2.6.32.48/fs/proc/kcore.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/kcore.c 2011-11-12 12:46:47.000000000 -0500 @@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bu off_t offset = 0; struct kcore_list *m; @@ -49293,9 +49257,9 @@ diff -urNp linux-2.6.32.46/fs/proc/kcore.c linux-2.6.32.46/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.46/fs/proc/meminfo.c linux-2.6.32.46/fs/proc/meminfo.c ---- linux-2.6.32.46/fs/proc/meminfo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/meminfo.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/meminfo.c linux-2.6.32.48/fs/proc/meminfo.c +--- linux-2.6.32.48/fs/proc/meminfo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/meminfo.c 2011-11-12 12:46:47.000000000 -0500 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_ unsigned long pages[NR_LRU_LISTS]; int lru; @@ -49314,9 +49278,9 @@ diff -urNp linux-2.6.32.46/fs/proc/meminfo.c linux-2.6.32.46/fs/proc/meminfo.c #endif ); -diff -urNp linux-2.6.32.46/fs/proc/nommu.c linux-2.6.32.46/fs/proc/nommu.c ---- linux-2.6.32.46/fs/proc/nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/nommu.c linux-2.6.32.48/fs/proc/nommu.c +--- linux-2.6.32.48/fs/proc/nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/nommu.c 2011-11-12 12:46:47.000000000 -0500 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -49326,9 +49290,9 @@ diff -urNp linux-2.6.32.46/fs/proc/nommu.c linux-2.6.32.46/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.46/fs/proc/proc_net.c linux-2.6.32.46/fs/proc/proc_net.c ---- linux-2.6.32.46/fs/proc/proc_net.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/proc_net.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/proc_net.c linux-2.6.32.48/fs/proc/proc_net.c +--- linux-2.6.32.48/fs/proc/proc_net.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/proc_net.c 2011-11-12 12:46:47.000000000 -0500 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -49347,9 +49311,9 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_net.c linux-2.6.32.46/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sysctl.c ---- linux-2.6.32.46/fs/proc/proc_sysctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/proc_sysctl.c 2011-10-19 04:08:51.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/proc_sysctl.c linux-2.6.32.48/fs/proc/proc_sysctl.c +--- linux-2.6.32.48/fs/proc/proc_sysctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/proc_sysctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -7,11 +7,13 @@ #include <linux/security.h> #include "internal.h" @@ -49432,9 +49396,9 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sy .lookup = proc_sys_lookup, .permission = proc_sys_permission, .setattr = proc_sys_setattr, -diff -urNp linux-2.6.32.46/fs/proc/root.c linux-2.6.32.46/fs/proc/root.c ---- linux-2.6.32.46/fs/proc/root.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/root.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/root.c linux-2.6.32.48/fs/proc/root.c +--- linux-2.6.32.48/fs/proc/root.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/root.c 2011-11-12 12:46:47.000000000 -0500 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -49451,9 +49415,9 @@ diff -urNp linux-2.6.32.46/fs/proc/root.c linux-2.6.32.46/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.32.46/fs/proc/task_mmu.c linux-2.6.32.46/fs/proc/task_mmu.c ---- linux-2.6.32.46/fs/proc/task_mmu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/task_mmu.c 2011-04-23 13:38:09.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/task_mmu.c linux-2.6.32.48/fs/proc/task_mmu.c +--- linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/task_mmu.c 2011-11-12 12:46:47.000000000 -0500 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -49599,9 +49563,9 @@ diff -urNp linux-2.6.32.46/fs/proc/task_mmu.c linux-2.6.32.46/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.32.46/fs/proc/task_nommu.c linux-2.6.32.46/fs/proc/task_nommu.c ---- linux-2.6.32.46/fs/proc/task_nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/proc/task_nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/proc/task_nommu.c linux-2.6.32.48/fs/proc/task_nommu.c +--- linux-2.6.32.48/fs/proc/task_nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/proc/task_nommu.c 2011-11-12 12:46:47.000000000 -0500 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -49620,9 +49584,9 @@ diff -urNp linux-2.6.32.46/fs/proc/task_nommu.c linux-2.6.32.46/fs/proc/task_nom } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.46/fs/readdir.c linux-2.6.32.46/fs/readdir.c ---- linux-2.6.32.46/fs/readdir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/readdir.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/readdir.c linux-2.6.32.48/fs/readdir.c +--- linux-2.6.32.48/fs/readdir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/readdir.c 2011-11-12 12:46:47.000000000 -0500 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -49721,9 +49685,9 @@ diff -urNp linux-2.6.32.46/fs/readdir.c linux-2.6.32.46/fs/readdir.c if (__put_user(d_off, &lastdirent->d_off)) error = -EFAULT; else -diff -urNp linux-2.6.32.46/fs/reiserfs/dir.c linux-2.6.32.46/fs/reiserfs/dir.c ---- linux-2.6.32.46/fs/reiserfs/dir.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/dir.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/dir.c linux-2.6.32.48/fs/reiserfs/dir.c +--- linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/dir.c 2011-11-12 12:46:47.000000000 -0500 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr struct reiserfs_dir_entry de; int ret = 0; @@ -49733,9 +49697,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/dir.c linux-2.6.32.46/fs/reiserfs/dir.c reiserfs_write_lock(inode->i_sb); reiserfs_check_lock_depth(inode->i_sb, "readdir"); -diff -urNp linux-2.6.32.46/fs/reiserfs/do_balan.c linux-2.6.32.46/fs/reiserfs/do_balan.c ---- linux-2.6.32.46/fs/reiserfs/do_balan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/do_balan.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/do_balan.c linux-2.6.32.48/fs/reiserfs/do_balan.c +--- linux-2.6.32.48/fs/reiserfs/do_balan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/do_balan.c 2011-11-12 12:46:47.000000000 -0500 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -49745,9 +49709,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/do_balan.c linux-2.6.32.46/fs/reiserfs/do do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.46/fs/reiserfs/item_ops.c linux-2.6.32.46/fs/reiserfs/item_ops.c ---- linux-2.6.32.46/fs/reiserfs/item_ops.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/item_ops.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/item_ops.c linux-2.6.32.48/fs/reiserfs/item_ops.c +--- linux-2.6.32.48/fs/reiserfs/item_ops.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/item_ops.c 2011-11-12 12:46:47.000000000 -0500 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -49802,9 +49766,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/item_ops.c linux-2.6.32.46/fs/reiserfs/it &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.46/fs/reiserfs/journal.c linux-2.6.32.46/fs/reiserfs/journal.c ---- linux-2.6.32.46/fs/reiserfs/journal.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/journal.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/journal.c linux-2.6.32.48/fs/reiserfs/journal.c +--- linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/journal.c 2011-11-12 12:46:47.000000000 -0500 @@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_brea struct buffer_head *bh; int i, j; @@ -49814,9 +49778,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/journal.c linux-2.6.32.46/fs/reiserfs/jou bh = __getblk(dev, block, bufsize); if (buffer_uptodate(bh)) return (bh); -diff -urNp linux-2.6.32.46/fs/reiserfs/namei.c linux-2.6.32.46/fs/reiserfs/namei.c ---- linux-2.6.32.46/fs/reiserfs/namei.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/namei.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/namei.c linux-2.6.32.48/fs/reiserfs/namei.c +--- linux-2.6.32.48/fs/reiserfs/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/namei.c 2011-11-12 12:46:47.000000000 -0500 @@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode unsigned long savelink = 1; struct timespec ctime; @@ -49826,9 +49790,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/namei.c linux-2.6.32.46/fs/reiserfs/namei /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion stat data updates: (1) old directory, -diff -urNp linux-2.6.32.46/fs/reiserfs/procfs.c linux-2.6.32.46/fs/reiserfs/procfs.c ---- linux-2.6.32.46/fs/reiserfs/procfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/procfs.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/procfs.c linux-2.6.32.48/fs/reiserfs/procfs.c +--- linux-2.6.32.48/fs/reiserfs/procfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/procfs.c 2011-11-12 12:46:47.000000000 -0500 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -49847,9 +49811,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/procfs.c linux-2.6.32.46/fs/reiserfs/proc seq_printf(m, /* on-disk fields */ "jp_journal_1st_block: \t%i\n" "jp_journal_dev: \t%s[%x]\n" -diff -urNp linux-2.6.32.46/fs/reiserfs/stree.c linux-2.6.32.46/fs/reiserfs/stree.c ---- linux-2.6.32.46/fs/reiserfs/stree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/stree.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/stree.c linux-2.6.32.48/fs/reiserfs/stree.c +--- linux-2.6.32.48/fs/reiserfs/stree.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/stree.c 2011-11-12 12:46:47.000000000 -0500 @@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs int iter = 0; #endif @@ -49895,9 +49859,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/stree.c linux-2.6.32.46/fs/reiserfs/stree BUG_ON(!th->t_trans_id); if (inode) { /* Do we count quotas for item? */ -diff -urNp linux-2.6.32.46/fs/reiserfs/super.c linux-2.6.32.46/fs/reiserfs/super.c ---- linux-2.6.32.46/fs/reiserfs/super.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/reiserfs/super.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/reiserfs/super.c linux-2.6.32.48/fs/reiserfs/super.c +--- linux-2.6.32.48/fs/reiserfs/super.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/reiserfs/super.c 2011-11-12 12:46:47.000000000 -0500 @@ -912,6 +912,8 @@ static int reiserfs_parse_options(struct {.option_name = NULL} }; @@ -49907,9 +49871,9 @@ diff -urNp linux-2.6.32.46/fs/reiserfs/super.c linux-2.6.32.46/fs/reiserfs/super *blocks = 0; if (!options || !*options) /* use default configuration: create tails, journaling on, no -diff -urNp linux-2.6.32.46/fs/select.c linux-2.6.32.46/fs/select.c ---- linux-2.6.32.46/fs/select.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/select.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/select.c linux-2.6.32.48/fs/select.c +--- linux-2.6.32.48/fs/select.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/select.c 2011-11-12 12:46:47.000000000 -0500 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -49946,9 +49910,9 @@ diff -urNp linux-2.6.32.46/fs/select.c linux-2.6.32.46/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.46/fs/seq_file.c linux-2.6.32.46/fs/seq_file.c ---- linux-2.6.32.46/fs/seq_file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/seq_file.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/seq_file.c linux-2.6.32.48/fs/seq_file.c +--- linux-2.6.32.48/fs/seq_file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/seq_file.c 2011-11-12 12:46:47.000000000 -0500 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -49998,9 +49962,9 @@ diff -urNp linux-2.6.32.46/fs/seq_file.c linux-2.6.32.46/fs/seq_file.c int res = -ENOMEM; if (op) { -diff -urNp linux-2.6.32.46/fs/smbfs/proc.c linux-2.6.32.46/fs/smbfs/proc.c ---- linux-2.6.32.46/fs/smbfs/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/smbfs/proc.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/smbfs/proc.c linux-2.6.32.48/fs/smbfs/proc.c +--- linux-2.6.32.48/fs/smbfs/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/smbfs/proc.c 2011-11-12 12:46:47.000000000 -0500 @@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info * out: @@ -50034,9 +49998,9 @@ diff -urNp linux-2.6.32.46/fs/smbfs/proc.c linux-2.6.32.46/fs/smbfs/proc.c } /* < LANMAN2 */ -diff -urNp linux-2.6.32.46/fs/smbfs/symlink.c linux-2.6.32.46/fs/smbfs/symlink.c ---- linux-2.6.32.46/fs/smbfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/smbfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/smbfs/symlink.c linux-2.6.32.48/fs/smbfs/symlink.c +--- linux-2.6.32.48/fs/smbfs/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/smbfs/symlink.c 2011-11-12 12:46:47.000000000 -0500 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -50046,9 +50010,9 @@ diff -urNp linux-2.6.32.46/fs/smbfs/symlink.c linux-2.6.32.46/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c ---- linux-2.6.32.46/fs/splice.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/splice.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/splice.c linux-2.6.32.48/fs/splice.c +--- linux-2.6.32.48/fs/splice.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/splice.c 2011-11-12 12:46:47.000000000 -0500 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -50137,7 +50101,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c current->splice_pipe = pipe; } -@@ -1592,6 +1596,8 @@ static long vmsplice_to_pipe(struct file +@@ -1593,6 +1597,8 @@ static long vmsplice_to_pipe(struct file .spd_release = spd_release_page, }; @@ -50146,7 +50110,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c pipe = pipe_info(file->f_path.dentry->d_inode); if (!pipe) return -EBADF; -@@ -1700,9 +1706,9 @@ static int ipipe_prep(struct pipe_inode_ +@@ -1701,9 +1707,9 @@ static int ipipe_prep(struct pipe_inode_ ret = -ERESTARTSYS; break; } @@ -50158,7 +50122,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c if (flags & SPLICE_F_NONBLOCK) { ret = -EAGAIN; break; -@@ -1734,7 +1740,7 @@ static int opipe_prep(struct pipe_inode_ +@@ -1735,7 +1741,7 @@ static int opipe_prep(struct pipe_inode_ pipe_lock(pipe); while (pipe->nrbufs >= PIPE_BUFFERS) { @@ -50167,7 +50131,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c send_sig(SIGPIPE, current, 0); ret = -EPIPE; break; -@@ -1747,9 +1753,9 @@ static int opipe_prep(struct pipe_inode_ +@@ -1748,9 +1754,9 @@ static int opipe_prep(struct pipe_inode_ ret = -ERESTARTSYS; break; } @@ -50179,7 +50143,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c } pipe_unlock(pipe); -@@ -1785,14 +1791,14 @@ retry: +@@ -1786,14 +1792,14 @@ retry: pipe_double_lock(ipipe, opipe); do { @@ -50196,7 +50160,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c break; /* -@@ -1892,7 +1898,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1893,7 +1899,7 @@ static int link_pipe(struct pipe_inode_i pipe_double_lock(ipipe, opipe); do { @@ -50205,7 +50169,7 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -1937,7 +1943,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1938,7 +1944,7 @@ static int link_pipe(struct pipe_inode_i * return EAGAIN if we have the potential of some data in the * future, otherwise just return 0 */ @@ -50214,9 +50178,9 @@ diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.46/fs/sysfs/file.c linux-2.6.32.46/fs/sysfs/file.c ---- linux-2.6.32.46/fs/sysfs/file.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/sysfs/file.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/sysfs/file.c linux-2.6.32.48/fs/sysfs/file.c +--- linux-2.6.32.48/fs/sysfs/file.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/sysfs/file.c 2011-11-12 12:46:47.000000000 -0500 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent struct sysfs_open_dirent { @@ -50298,9 +50262,9 @@ diff -urNp linux-2.6.32.46/fs/sysfs/file.c linux-2.6.32.46/fs/sysfs/file.c wake_up_interruptible(&od->poll); } -diff -urNp linux-2.6.32.46/fs/sysfs/mount.c linux-2.6.32.46/fs/sysfs/mount.c ---- linux-2.6.32.46/fs/sysfs/mount.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/sysfs/mount.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/sysfs/mount.c linux-2.6.32.48/fs/sysfs/mount.c +--- linux-2.6.32.48/fs/sysfs/mount.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/sysfs/mount.c 2011-11-12 12:46:47.000000000 -0500 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { .s_name = "", .s_count = ATOMIC_INIT(1), @@ -50313,9 +50277,9 @@ diff -urNp linux-2.6.32.46/fs/sysfs/mount.c linux-2.6.32.46/fs/sysfs/mount.c .s_ino = 1, }; -diff -urNp linux-2.6.32.46/fs/sysfs/symlink.c linux-2.6.32.46/fs/sysfs/symlink.c ---- linux-2.6.32.46/fs/sysfs/symlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/sysfs/symlink.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/sysfs/symlink.c linux-2.6.32.48/fs/sysfs/symlink.c +--- linux-2.6.32.48/fs/sysfs/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/sysfs/symlink.c 2011-11-12 12:46:47.000000000 -0500 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -50325,9 +50289,9 @@ diff -urNp linux-2.6.32.46/fs/sysfs/symlink.c linux-2.6.32.46/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.46/fs/udf/balloc.c linux-2.6.32.46/fs/udf/balloc.c ---- linux-2.6.32.46/fs/udf/balloc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/udf/balloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/udf/balloc.c linux-2.6.32.48/fs/udf/balloc.c +--- linux-2.6.32.48/fs/udf/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/udf/balloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -50350,9 +50314,9 @@ diff -urNp linux-2.6.32.46/fs/udf/balloc.c linux-2.6.32.46/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.32.46/fs/udf/inode.c linux-2.6.32.46/fs/udf/inode.c ---- linux-2.6.32.46/fs/udf/inode.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/udf/inode.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/udf/inode.c linux-2.6.32.48/fs/udf/inode.c +--- linux-2.6.32.48/fs/udf/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/udf/inode.c 2011-11-12 12:46:47.000000000 -0500 @@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk( int goal = 0, pgoal = iinfo->i_location.logicalBlockNum; int lastblock = 0; @@ -50362,9 +50326,9 @@ diff -urNp linux-2.6.32.46/fs/udf/inode.c linux-2.6.32.46/fs/udf/inode.c prev_epos.offset = udf_file_entry_alloc_offset(inode); prev_epos.block = iinfo->i_location; prev_epos.bh = NULL; -diff -urNp linux-2.6.32.46/fs/udf/misc.c linux-2.6.32.46/fs/udf/misc.c ---- linux-2.6.32.46/fs/udf/misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/udf/misc.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/udf/misc.c linux-2.6.32.48/fs/udf/misc.c +--- linux-2.6.32.48/fs/udf/misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/udf/misc.c 2011-11-12 12:46:47.000000000 -0500 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id u8 udf_tag_checksum(const struct tag *t) @@ -50374,9 +50338,9 @@ diff -urNp linux-2.6.32.46/fs/udf/misc.c linux-2.6.32.46/fs/udf/misc.c u8 checksum = 0; int i; for (i = 0; i < sizeof(struct tag); ++i) -diff -urNp linux-2.6.32.46/fs/utimes.c linux-2.6.32.46/fs/utimes.c ---- linux-2.6.32.46/fs/utimes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/utimes.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/utimes.c linux-2.6.32.48/fs/utimes.c +--- linux-2.6.32.48/fs/utimes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/utimes.c 2011-11-12 12:46:47.000000000 -0500 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -50398,9 +50362,9 @@ diff -urNp linux-2.6.32.46/fs/utimes.c linux-2.6.32.46/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c ---- linux-2.6.32.46/fs/xattr_acl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xattr_acl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xattr_acl.c linux-2.6.32.48/fs/xattr_acl.c +--- linux-2.6.32.48/fs/xattr_acl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/xattr_acl.c 2011-11-12 12:46:47.000000000 -0500 @@ -17,8 +17,8 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) @@ -50412,9 +50376,9 @@ diff -urNp linux-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c int count; struct posix_acl *acl; struct posix_acl_entry *acl_e; -diff -urNp linux-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c ---- linux-2.6.32.46/fs/xattr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xattr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xattr.c linux-2.6.32.48/fs/xattr.c +--- linux-2.6.32.48/fs/xattr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/xattr.c 2011-11-12 12:46:47.000000000 -0500 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -50477,9 +50441,9 @@ diff -urNp linux-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:46:47.000000000 -0500 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1( xfs_fsop_geom_t fsgeo; int error; @@ -50488,9 +50452,9 @@ diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs error = xfs_fs_geometry(mp, &fsgeo, 3); if (error) return -error; -diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c 2011-04-17 20:07:09.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -134,7 +134,7 @@ xfs_find_handle( } @@ -50518,9 +50482,9 @@ diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/l int error; error = xfs_fs_geometry(mp, &fsgeo, 3); -diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:46:47.000000000 -0500 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -50530,9 +50494,9 @@ diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.46/fs/xfs/li if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.46/fs/xfs/xfs_bmap.c linux-2.6.32.46/fs/xfs/xfs_bmap.c ---- linux-2.6.32.46/fs/xfs/xfs_bmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xfs/xfs_bmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xfs/xfs_bmap.c linux-2.6.32.48/fs/xfs/xfs_bmap.c +--- linux-2.6.32.48/fs/xfs/xfs_bmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/xfs/xfs_bmap.c 2011-11-12 12:46:47.000000000 -0500 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -50542,9 +50506,9 @@ diff -urNp linux-2.6.32.46/fs/xfs/xfs_bmap.c linux-2.6.32.46/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c ---- linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c 2011-04-18 22:07:30.000000000 -0400 +diff -urNp linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c +--- linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/fs/xfs/xfs_dir2_sf.c 2011-11-12 12:46:47.000000000 -0500 @@ -779,7 +779,15 @@ xfs_dir2_sf_getdents( } @@ -50562,9 +50526,9 @@ diff -urNp linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c linux-2.6.32.46/fs/xfs/xfs_dir2_ off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset = off & 0x7fffffff; return 0; -diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/gracl_alloc.c ---- linux-2.6.32.46/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_alloc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_alloc.c linux-2.6.32.48/grsecurity/gracl_alloc.c +--- linux-2.6.32.48/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_alloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -50671,9 +50635,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/g + else + return 1; +} -diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c ---- linux-2.6.32.46/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl.c 2011-10-17 07:04:31.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl.c linux-2.6.32.48/grsecurity/gracl.c +--- linux-2.6.32.48/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,4140 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -54815,9 +54779,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gracl_cap.c ---- linux-2.6.32.46/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_cap.c 2011-09-14 08:53:50.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_cap.c linux-2.6.32.48/grsecurity/gracl_cap.c +--- linux-2.6.32.48/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_cap.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,101 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -54920,9 +54884,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gra + return 0; +} + -diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/gracl_fs.c ---- linux-2.6.32.46/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_fs.c 2011-10-17 02:16:34.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_fs.c linux-2.6.32.48/grsecurity/gracl_fs.c +--- linux-2.6.32.48/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_fs.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55355,9 +55319,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/grac + + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/gracl_ip.c linux-2.6.32.46/grsecurity/gracl_ip.c ---- linux-2.6.32.46/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_ip.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_ip.c linux-2.6.32.48/grsecurity/gracl_ip.c +--- linux-2.6.32.48/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_ip.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,382 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -55741,9 +55705,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_ip.c linux-2.6.32.46/grsecurity/grac + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.46/grsecurity/gracl_learn.c linux-2.6.32.46/grsecurity/gracl_learn.c ---- linux-2.6.32.46/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_learn.c 2011-07-14 21:02:03.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_learn.c linux-2.6.32.48/grsecurity/gracl_learn.c +--- linux-2.6.32.48/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_learn.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,208 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -55953,9 +55917,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_learn.c linux-2.6.32.46/grsecurity/g + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.46/grsecurity/gracl_res.c linux-2.6.32.46/grsecurity/gracl_res.c ---- linux-2.6.32.46/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_res.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_res.c linux-2.6.32.48/grsecurity/gracl_res.c +--- linux-2.6.32.48/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_res.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,67 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -56024,9 +55988,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_res.c linux-2.6.32.46/grsecurity/gra + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.46/grsecurity/gracl_segv.c linux-2.6.32.46/grsecurity/gracl_segv.c ---- linux-2.6.32.46/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_segv.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_segv.c linux-2.6.32.48/grsecurity/gracl_segv.c +--- linux-2.6.32.48/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_segv.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,284 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -56312,9 +56276,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_segv.c linux-2.6.32.46/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.46/grsecurity/gracl_shm.c linux-2.6.32.46/grsecurity/gracl_shm.c ---- linux-2.6.32.46/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/gracl_shm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/gracl_shm.c linux-2.6.32.48/grsecurity/gracl_shm.c +--- linux-2.6.32.48/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/gracl_shm.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -56356,9 +56320,9 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_shm.c linux-2.6.32.46/grsecurity/gra + + return 1; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_chdir.c linux-2.6.32.46/grsecurity/grsec_chdir.c ---- linux-2.6.32.46/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_chdir.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_chdir.c linux-2.6.32.48/grsecurity/grsec_chdir.c +--- linux-2.6.32.48/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_chdir.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -56379,9 +56343,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_chdir.c linux-2.6.32.46/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_chroot.c linux-2.6.32.46/grsecurity/grsec_chroot.c ---- linux-2.6.32.46/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_chroot.c 2011-09-15 06:48:16.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_chroot.c linux-2.6.32.48/grsecurity/grsec_chroot.c +--- linux-2.6.32.48/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_chroot.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,386 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -56769,9 +56733,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_chroot.c linux-2.6.32.46/grsecurity/ +#endif + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_disabled.c linux-2.6.32.46/grsecurity/grsec_disabled.c ---- linux-2.6.32.46/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_disabled.c 2011-10-25 09:16:40.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_disabled.c linux-2.6.32.48/grsecurity/grsec_disabled.c +--- linux-2.6.32.48/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_disabled.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,439 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -57212,9 +57176,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_disabled.c linux-2.6.32.46/grsecurit +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.46/grsecurity/grsec_exec.c linux-2.6.32.46/grsecurity/grsec_exec.c ---- linux-2.6.32.46/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_exec.c 2011-09-13 22:54:27.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_exec.c linux-2.6.32.48/grsecurity/grsec_exec.c +--- linux-2.6.32.48/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_exec.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,204 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -57420,9 +57384,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_exec.c linux-2.6.32.46/grsecurity/gr + +EXPORT_SYMBOL(gr_is_capable); +EXPORT_SYMBOL(gr_is_capable_nolog); -diff -urNp linux-2.6.32.46/grsecurity/grsec_fifo.c linux-2.6.32.46/grsecurity/grsec_fifo.c ---- linux-2.6.32.46/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_fifo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_fifo.c linux-2.6.32.48/grsecurity/grsec_fifo.c +--- linux-2.6.32.48/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_fifo.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -57448,9 +57412,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_fifo.c linux-2.6.32.46/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_fork.c linux-2.6.32.46/grsecurity/grsec_fork.c ---- linux-2.6.32.46/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_fork.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_fork.c linux-2.6.32.48/grsecurity/grsec_fork.c +--- linux-2.6.32.48/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_fork.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,23 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -57475,9 +57439,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_fork.c linux-2.6.32.46/grsecurity/gr +#endif + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_init.c linux-2.6.32.46/grsecurity/grsec_init.c ---- linux-2.6.32.46/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_init.c 2011-08-11 19:57:42.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_init.c linux-2.6.32.48/grsecurity/grsec_init.c +--- linux-2.6.32.48/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_init.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,270 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -57749,9 +57713,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_init.c linux-2.6.32.46/grsecurity/gr + + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_link.c linux-2.6.32.46/grsecurity/grsec_link.c ---- linux-2.6.32.46/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_link.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_link.c linux-2.6.32.48/grsecurity/grsec_link.c +--- linux-2.6.32.48/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_link.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -57796,9 +57760,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_link.c linux-2.6.32.46/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_log.c linux-2.6.32.46/grsecurity/grsec_log.c ---- linux-2.6.32.46/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_log.c 2011-09-26 10:44:49.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_log.c linux-2.6.32.48/grsecurity/grsec_log.c +--- linux-2.6.32.48/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_log.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,315 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58115,9 +58079,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_log.c linux-2.6.32.46/grsecurity/grs + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_mem.c linux-2.6.32.46/grsecurity/grsec_mem.c ---- linux-2.6.32.46/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_mem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_mem.c linux-2.6.32.48/grsecurity/grsec_mem.c +--- linux-2.6.32.48/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_mem.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,33 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58152,9 +58116,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_mem.c linux-2.6.32.46/grsecurity/grs + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_mount.c linux-2.6.32.46/grsecurity/grsec_mount.c ---- linux-2.6.32.46/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_mount.c 2011-06-20 19:47:03.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_mount.c linux-2.6.32.48/grsecurity/grsec_mount.c +--- linux-2.6.32.48/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_mount.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58218,9 +58182,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_mount.c linux-2.6.32.46/grsecurity/g +#endif + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_pax.c linux-2.6.32.46/grsecurity/grsec_pax.c ---- linux-2.6.32.46/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_pax.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_pax.c linux-2.6.32.48/grsecurity/grsec_pax.c +--- linux-2.6.32.48/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_pax.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,36 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58258,9 +58222,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_pax.c linux-2.6.32.46/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_ptrace.c linux-2.6.32.46/grsecurity/grsec_ptrace.c ---- linux-2.6.32.46/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_ptrace.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_ptrace.c linux-2.6.32.48/grsecurity/grsec_ptrace.c +--- linux-2.6.32.48/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_ptrace.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58276,9 +58240,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_ptrace.c linux-2.6.32.46/grsecurity/ +#endif + return; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_sig.c linux-2.6.32.46/grsecurity/grsec_sig.c ---- linux-2.6.32.46/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_sig.c 2011-06-29 19:40:31.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_sig.c linux-2.6.32.48/grsecurity/grsec_sig.c +--- linux-2.6.32.48/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_sig.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,205 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -58485,9 +58449,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_sig.c linux-2.6.32.46/grsecurity/grs +#endif + return 0; +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_sock.c linux-2.6.32.46/grsecurity/grsec_sock.c ---- linux-2.6.32.46/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_sock.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_sock.c linux-2.6.32.48/grsecurity/grsec_sock.c +--- linux-2.6.32.48/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_sock.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,275 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -58764,9 +58728,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_sock.c linux-2.6.32.46/grsecurity/gr + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.46/grsecurity/grsec_sysctl.c linux-2.6.32.46/grsecurity/grsec_sysctl.c ---- linux-2.6.32.46/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_sysctl.c 2011-08-11 19:57:54.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_sysctl.c linux-2.6.32.48/grsecurity/grsec_sysctl.c +--- linux-2.6.32.48/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_sysctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,479 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -59247,9 +59211,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_sysctl.c linux-2.6.32.46/grsecurity/ + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.46/grsecurity/grsec_time.c linux-2.6.32.46/grsecurity/grsec_time.c ---- linux-2.6.32.46/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_time.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_time.c linux-2.6.32.48/grsecurity/grsec_time.c +--- linux-2.6.32.48/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_time.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -59267,9 +59231,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_time.c linux-2.6.32.46/grsecurity/gr +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-2.6.32.46/grsecurity/grsec_tpe.c linux-2.6.32.46/grsecurity/grsec_tpe.c ---- linux-2.6.32.46/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsec_tpe.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsec_tpe.c linux-2.6.32.48/grsecurity/grsec_tpe.c +--- linux-2.6.32.48/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsec_tpe.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,39 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -59310,9 +59274,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsec_tpe.c linux-2.6.32.46/grsecurity/grs +#endif + return 1; +} -diff -urNp linux-2.6.32.46/grsecurity/grsum.c linux-2.6.32.46/grsecurity/grsum.c ---- linux-2.6.32.46/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/grsum.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/grsum.c linux-2.6.32.48/grsecurity/grsum.c +--- linux-2.6.32.48/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/grsum.c 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -59375,9 +59339,9 @@ diff -urNp linux-2.6.32.46/grsecurity/grsum.c linux-2.6.32.46/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig ---- linux-2.6.32.46/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/Kconfig 2011-09-15 00:00:38.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/Kconfig linux-2.6.32.48/grsecurity/Kconfig +--- linux-2.6.32.48/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/Kconfig 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,1037 @@ +# +# grecurity configuration @@ -60416,9 +60380,9 @@ diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefile ---- linux-2.6.32.46/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/grsecurity/Makefile 2011-10-17 06:48:36.000000000 -0400 +diff -urNp linux-2.6.32.48/grsecurity/Makefile linux-2.6.32.48/grsecurity/Makefile +--- linux-2.6.32.48/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/grsecurity/Makefile 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,36 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -60456,9 +60420,9 @@ diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefi + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.46/include/acpi/acpi_bus.h linux-2.6.32.46/include/acpi/acpi_bus.h ---- linux-2.6.32.46/include/acpi/acpi_bus.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/acpi/acpi_bus.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/acpi/acpi_bus.h linux-2.6.32.48/include/acpi/acpi_bus.h +--- linux-2.6.32.48/include/acpi/acpi_bus.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/acpi/acpi_bus.h 2011-11-12 12:46:47.000000000 -0500 @@ -107,7 +107,7 @@ struct acpi_device_ops { acpi_op_bind bind; acpi_op_unbind unbind; @@ -60468,9 +60432,9 @@ diff -urNp linux-2.6.32.46/include/acpi/acpi_bus.h linux-2.6.32.46/include/acpi/ #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */ -diff -urNp linux-2.6.32.46/include/acpi/acpi_drivers.h linux-2.6.32.46/include/acpi/acpi_drivers.h ---- linux-2.6.32.46/include/acpi/acpi_drivers.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/acpi/acpi_drivers.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/acpi/acpi_drivers.h linux-2.6.32.48/include/acpi/acpi_drivers.h +--- linux-2.6.32.48/include/acpi/acpi_drivers.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/acpi/acpi_drivers.h 2011-11-12 12:46:47.000000000 -0500 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -60500,9 +60464,9 @@ diff -urNp linux-2.6.32.46/include/acpi/acpi_drivers.h linux-2.6.32.46/include/a void *context) { return -ENODEV; -diff -urNp linux-2.6.32.46/include/asm-generic/atomic-long.h linux-2.6.32.46/include/asm-generic/atomic-long.h ---- linux-2.6.32.46/include/asm-generic/atomic-long.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/atomic-long.h 2011-07-13 22:21:25.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/atomic-long.h linux-2.6.32.48/include/asm-generic/atomic-long.h +--- linux-2.6.32.48/include/asm-generic/atomic-long.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/atomic-long.h 2011-11-12 12:46:47.000000000 -0500 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -60769,9 +60733,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/atomic-long.h linux-2.6.32.46/inc +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.46/include/asm-generic/bug.h linux-2.6.32.46/include/asm-generic/bug.h ---- linux-2.6.32.46/include/asm-generic/bug.h 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/bug.h 2011-08-21 17:56:07.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/bug.h linux-2.6.32.48/include/asm-generic/bug.h +--- linux-2.6.32.48/include/asm-generic/bug.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/bug.h 2011-11-12 12:46:47.000000000 -0500 @@ -105,11 +105,11 @@ extern void warn_slowpath_null(const cha #else /* !CONFIG_BUG */ @@ -60786,9 +60750,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/bug.h linux-2.6.32.46/include/asm #endif #ifndef HAVE_ARCH_WARN_ON -diff -urNp linux-2.6.32.46/include/asm-generic/cache.h linux-2.6.32.46/include/asm-generic/cache.h ---- linux-2.6.32.46/include/asm-generic/cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/cache.h 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/cache.h linux-2.6.32.48/include/asm-generic/cache.h +--- linux-2.6.32.48/include/asm-generic/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/cache.h 2011-11-12 12:46:47.000000000 -0500 @@ -6,7 +6,7 @@ * cache lines need to provide their own cache.h. */ @@ -60799,9 +60763,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/cache.h linux-2.6.32.46/include/a +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT) #endif /* __ASM_GENERIC_CACHE_H */ -diff -urNp linux-2.6.32.46/include/asm-generic/dma-mapping-common.h linux-2.6.32.46/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.46/include/asm-generic/dma-mapping-common.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/dma-mapping-common.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/dma-mapping-common.h linux-2.6.32.48/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/dma-mapping-common.h 2011-11-12 12:46:47.000000000 -0500 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -60910,9 +60874,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/dma-mapping-common.h linux-2.6.32 BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.32.46/include/asm-generic/emergency-restart.h linux-2.6.32.46/include/asm-generic/emergency-restart.h ---- linux-2.6.32.46/include/asm-generic/emergency-restart.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/emergency-restart.h 2011-08-21 19:17:17.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/emergency-restart.h linux-2.6.32.48/include/asm-generic/emergency-restart.h +--- linux-2.6.32.48/include/asm-generic/emergency-restart.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/emergency-restart.h 2011-11-12 12:46:47.000000000 -0500 @@ -1,7 +1,7 @@ #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H #define _ASM_GENERIC_EMERGENCY_RESTART_H @@ -60922,9 +60886,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/emergency-restart.h linux-2.6.32. { machine_restart(NULL); } -diff -urNp linux-2.6.32.46/include/asm-generic/futex.h linux-2.6.32.46/include/asm-generic/futex.h ---- linux-2.6.32.46/include/asm-generic/futex.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/futex.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/futex.h linux-2.6.32.48/include/asm-generic/futex.h +--- linux-2.6.32.48/include/asm-generic/futex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/futex.h 2011-11-12 12:46:47.000000000 -0500 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -60943,9 +60907,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/futex.h linux-2.6.32.46/include/a { return -ENOSYS; } -diff -urNp linux-2.6.32.46/include/asm-generic/int-l64.h linux-2.6.32.46/include/asm-generic/int-l64.h ---- linux-2.6.32.46/include/asm-generic/int-l64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/int-l64.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/int-l64.h linux-2.6.32.48/include/asm-generic/int-l64.h +--- linux-2.6.32.48/include/asm-generic/int-l64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/int-l64.h 2011-11-12 12:46:47.000000000 -0500 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -60955,9 +60919,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/int-l64.h linux-2.6.32.46/include #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.46/include/asm-generic/int-ll64.h linux-2.6.32.46/include/asm-generic/int-ll64.h ---- linux-2.6.32.46/include/asm-generic/int-ll64.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/int-ll64.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/int-ll64.h linux-2.6.32.48/include/asm-generic/int-ll64.h +--- linux-2.6.32.48/include/asm-generic/int-ll64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/int-ll64.h 2011-11-12 12:46:47.000000000 -0500 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -60967,9 +60931,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/int-ll64.h linux-2.6.32.46/includ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.46/include/asm-generic/kmap_types.h linux-2.6.32.46/include/asm-generic/kmap_types.h ---- linux-2.6.32.46/include/asm-generic/kmap_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/kmap_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/kmap_types.h linux-2.6.32.48/include/asm-generic/kmap_types.h +--- linux-2.6.32.48/include/asm-generic/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/kmap_types.h 2011-11-12 12:46:47.000000000 -0500 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -60980,9 +60944,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/kmap_types.h linux-2.6.32.46/incl }; #undef KMAP_D -diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include/asm-generic/pgtable.h ---- linux-2.6.32.46/include/asm-generic/pgtable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/pgtable.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/pgtable.h linux-2.6.32.48/include/asm-generic/pgtable.h +--- linux-2.6.32.48/include/asm-generic/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/pgtable.h 2011-11-12 12:46:47.000000000 -0500 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -60998,9 +60962,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h ---- linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h +--- linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/pgtable-nopmd.h 2011-11-12 12:46:47.000000000 -0500 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -61037,9 +61001,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h linux-2.6.32.46/i /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopud.h linux-2.6.32.46/include/asm-generic/pgtable-nopud.h ---- linux-2.6.32.46/include/asm-generic/pgtable-nopud.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/pgtable-nopud.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/pgtable-nopud.h linux-2.6.32.48/include/asm-generic/pgtable-nopud.h +--- linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/pgtable-nopud.h 2011-11-12 12:46:47.000000000 -0500 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -61070,9 +61034,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopud.h linux-2.6.32.46/i /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.46/include/asm-generic/vmlinux.lds.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/asm-generic/vmlinux.lds.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/asm-generic/vmlinux.lds.h linux-2.6.32.48/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/asm-generic/vmlinux.lds.h 2011-11-12 12:46:47.000000000 -0500 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -61111,9 +61075,9 @@ diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/inc /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include/drm/drm_crtc_helper.h ---- linux-2.6.32.46/include/drm/drm_crtc_helper.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/drm/drm_crtc_helper.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/drm/drm_crtc_helper.h linux-2.6.32.48/include/drm/drm_crtc_helper.h +--- linux-2.6.32.48/include/drm/drm_crtc_helper.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/drm/drm_crtc_helper.h 2011-11-12 12:46:47.000000000 -0500 @@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs { /* reload the current crtc LUT */ @@ -61132,9 +61096,9 @@ diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include struct drm_connector_helper_funcs { int (*get_modes)(struct drm_connector *connector); -diff -urNp linux-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h ---- linux-2.6.32.46/include/drm/drmP.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/drm/drmP.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/drm/drmP.h linux-2.6.32.48/include/drm/drmP.h +--- linux-2.6.32.48/include/drm/drmP.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/drm/drmP.h 2011-11-12 12:46:47.000000000 -0500 @@ -71,6 +71,7 @@ #include <linux/workqueue.h> #include <linux/poll.h> @@ -61194,9 +61158,9 @@ diff -urNp linux-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h uint32_t gtt_total; uint32_t invalidate_domains; /* domains pending invalidation */ uint32_t flush_domains; /* domains pending flush */ -diff -urNp linux-2.6.32.46/include/drm/ttm/ttm_memory.h linux-2.6.32.46/include/drm/ttm/ttm_memory.h ---- linux-2.6.32.46/include/drm/ttm/ttm_memory.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/drm/ttm/ttm_memory.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/drm/ttm/ttm_memory.h linux-2.6.32.48/include/drm/ttm/ttm_memory.h +--- linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/drm/ttm/ttm_memory.h 2011-11-12 12:46:47.000000000 -0500 @@ -47,7 +47,7 @@ struct ttm_mem_shrink { @@ -61206,9 +61170,9 @@ diff -urNp linux-2.6.32.46/include/drm/ttm/ttm_memory.h linux-2.6.32.46/include/ /** * struct ttm_mem_global - Global memory accounting structure. -diff -urNp linux-2.6.32.46/include/linux/a.out.h linux-2.6.32.46/include/linux/a.out.h ---- linux-2.6.32.46/include/linux/a.out.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/a.out.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/a.out.h linux-2.6.32.48/include/linux/a.out.h +--- linux-2.6.32.48/include/linux/a.out.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/a.out.h 2011-11-12 12:46:47.000000000 -0500 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -61224,9 +61188,9 @@ diff -urNp linux-2.6.32.46/include/linux/a.out.h linux-2.6.32.46/include/linux/a #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.46/include/linux/atmdev.h linux-2.6.32.46/include/linux/atmdev.h ---- linux-2.6.32.46/include/linux/atmdev.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/atmdev.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/atmdev.h linux-2.6.32.48/include/linux/atmdev.h +--- linux-2.6.32.48/include/linux/atmdev.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/atmdev.h 2011-11-12 12:46:47.000000000 -0500 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -61236,9 +61200,9 @@ diff -urNp linux-2.6.32.46/include/linux/atmdev.h linux-2.6.32.46/include/linux/ __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.46/include/linux/backlight.h linux-2.6.32.46/include/linux/backlight.h ---- linux-2.6.32.46/include/linux/backlight.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/backlight.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/backlight.h linux-2.6.32.48/include/linux/backlight.h +--- linux-2.6.32.48/include/linux/backlight.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/backlight.h 2011-11-12 12:46:47.000000000 -0500 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -61280,9 +61244,9 @@ diff -urNp linux-2.6.32.46/include/linux/backlight.h linux-2.6.32.46/include/lin extern void backlight_device_unregister(struct backlight_device *bd); extern void backlight_force_update(struct backlight_device *bd, enum backlight_update_reason reason); -diff -urNp linux-2.6.32.46/include/linux/binfmts.h linux-2.6.32.46/include/linux/binfmts.h ---- linux-2.6.32.46/include/linux/binfmts.h 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/include/linux/binfmts.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/binfmts.h linux-2.6.32.48/include/linux/binfmts.h +--- linux-2.6.32.48/include/linux/binfmts.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/binfmts.h 2011-11-12 12:46:47.000000000 -0500 @@ -83,6 +83,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -61291,9 +61255,9 @@ diff -urNp linux-2.6.32.46/include/linux/binfmts.h linux-2.6.32.46/include/linux unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.46/include/linux/blkdev.h linux-2.6.32.46/include/linux/blkdev.h ---- linux-2.6.32.46/include/linux/blkdev.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/blkdev.h 2011-08-26 20:27:21.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/blkdev.h linux-2.6.32.48/include/linux/blkdev.h +--- linux-2.6.32.48/include/linux/blkdev.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/blkdev.h 2011-11-12 12:46:47.000000000 -0500 @@ -1278,7 +1278,7 @@ struct block_device_operations { int (*revalidate_disk) (struct gendisk *); int (*getgeo)(struct block_device *, struct hd_geometry *); @@ -61303,9 +61267,9 @@ diff -urNp linux-2.6.32.46/include/linux/blkdev.h linux-2.6.32.46/include/linux/ extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long); -diff -urNp linux-2.6.32.46/include/linux/blktrace_api.h linux-2.6.32.46/include/linux/blktrace_api.h ---- linux-2.6.32.46/include/linux/blktrace_api.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/blktrace_api.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/blktrace_api.h linux-2.6.32.48/include/linux/blktrace_api.h +--- linux-2.6.32.48/include/linux/blktrace_api.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/blktrace_api.h 2011-11-12 12:46:47.000000000 -0500 @@ -160,7 +160,7 @@ struct blk_trace { struct dentry *dir; struct dentry *dropped_file; @@ -61315,9 +61279,9 @@ diff -urNp linux-2.6.32.46/include/linux/blktrace_api.h linux-2.6.32.46/include/ }; extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); -diff -urNp linux-2.6.32.46/include/linux/byteorder/little_endian.h linux-2.6.32.46/include/linux/byteorder/little_endian.h ---- linux-2.6.32.46/include/linux/byteorder/little_endian.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/byteorder/little_endian.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/byteorder/little_endian.h linux-2.6.32.48/include/linux/byteorder/little_endian.h +--- linux-2.6.32.48/include/linux/byteorder/little_endian.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/byteorder/little_endian.h 2011-11-12 12:46:47.000000000 -0500 @@ -42,51 +42,51 @@ static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -61382,9 +61346,9 @@ diff -urNp linux-2.6.32.46/include/linux/byteorder/little_endian.h linux-2.6.32. } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-2.6.32.46/include/linux/cache.h linux-2.6.32.46/include/linux/cache.h ---- linux-2.6.32.46/include/linux/cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/cache.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/cache.h linux-2.6.32.48/include/linux/cache.h +--- linux-2.6.32.48/include/linux/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/cache.h 2011-11-12 12:46:47.000000000 -0500 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -61396,9 +61360,9 @@ diff -urNp linux-2.6.32.46/include/linux/cache.h linux-2.6.32.46/include/linux/c #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.46/include/linux/capability.h linux-2.6.32.46/include/linux/capability.h ---- linux-2.6.32.46/include/linux/capability.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/capability.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/capability.h linux-2.6.32.48/include/linux/capability.h +--- linux-2.6.32.48/include/linux/capability.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/capability.h 2011-11-12 12:46:47.000000000 -0500 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -61407,9 +61371,9 @@ diff -urNp linux-2.6.32.46/include/linux/capability.h linux-2.6.32.46/include/li /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.46/include/linux/compiler-gcc4.h linux-2.6.32.46/include/linux/compiler-gcc4.h ---- linux-2.6.32.46/include/linux/compiler-gcc4.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/compiler-gcc4.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/compiler-gcc4.h linux-2.6.32.48/include/linux/compiler-gcc4.h +--- linux-2.6.32.48/include/linux/compiler-gcc4.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/compiler-gcc4.h 2011-11-12 12:46:47.000000000 -0500 @@ -36,4 +36,16 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -61427,9 +61391,9 @@ diff -urNp linux-2.6.32.46/include/linux/compiler-gcc4.h linux-2.6.32.46/include +#endif + #endif -diff -urNp linux-2.6.32.46/include/linux/compiler.h linux-2.6.32.46/include/linux/compiler.h ---- linux-2.6.32.46/include/linux/compiler.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/compiler.h 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/compiler.h linux-2.6.32.48/include/linux/compiler.h +--- linux-2.6.32.48/include/linux/compiler.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/compiler.h 2011-11-12 12:46:47.000000000 -0500 @@ -5,11 +5,14 @@ #ifdef __CHECKER__ @@ -61527,9 +61491,9 @@ diff -urNp linux-2.6.32.46/include/linux/compiler.h linux-2.6.32.46/include/linu +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-2.6.32.46/include/linux/crypto.h linux-2.6.32.46/include/linux/crypto.h ---- linux-2.6.32.46/include/linux/crypto.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/crypto.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/crypto.h linux-2.6.32.48/include/linux/crypto.h +--- linux-2.6.32.48/include/linux/crypto.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/crypto.h 2011-11-12 12:46:47.000000000 -0500 @@ -394,7 +394,7 @@ struct cipher_tfm { const u8 *key, unsigned int keylen); void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src); @@ -61555,9 +61519,9 @@ diff -urNp linux-2.6.32.46/include/linux/crypto.h linux-2.6.32.46/include/linux/ #define crt_ablkcipher crt_u.ablkcipher #define crt_aead crt_u.aead -diff -urNp linux-2.6.32.46/include/linux/dcache.h linux-2.6.32.46/include/linux/dcache.h ---- linux-2.6.32.46/include/linux/dcache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/dcache.h 2011-04-23 13:34:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/dcache.h linux-2.6.32.48/include/linux/dcache.h +--- linux-2.6.32.48/include/linux/dcache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/dcache.h 2011-11-12 12:46:47.000000000 -0500 @@ -119,6 +119,8 @@ struct dentry { unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ }; @@ -61567,9 +61531,9 @@ diff -urNp linux-2.6.32.46/include/linux/dcache.h linux-2.6.32.46/include/linux/ /* * dentry->d_lock spinlock nesting subclasses: * -diff -urNp linux-2.6.32.46/include/linux/decompress/mm.h linux-2.6.32.46/include/linux/decompress/mm.h ---- linux-2.6.32.46/include/linux/decompress/mm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/decompress/mm.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/decompress/mm.h linux-2.6.32.48/include/linux/decompress/mm.h +--- linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/decompress/mm.h 2011-11-12 12:46:47.000000000 -0500 @@ -78,7 +78,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -61579,9 +61543,9 @@ diff -urNp linux-2.6.32.46/include/linux/decompress/mm.h linux-2.6.32.46/include #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.46/include/linux/dma-mapping.h linux-2.6.32.46/include/linux/dma-mapping.h ---- linux-2.6.32.46/include/linux/dma-mapping.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/dma-mapping.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/dma-mapping.h linux-2.6.32.48/include/linux/dma-mapping.h +--- linux-2.6.32.48/include/linux/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/dma-mapping.h 2011-11-12 12:46:47.000000000 -0500 @@ -16,51 +16,51 @@ enum dma_data_direction { }; @@ -61649,9 +61613,9 @@ diff -urNp linux-2.6.32.46/include/linux/dma-mapping.h linux-2.6.32.46/include/l #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.46/include/linux/dst.h linux-2.6.32.46/include/linux/dst.h ---- linux-2.6.32.46/include/linux/dst.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/dst.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/dst.h linux-2.6.32.48/include/linux/dst.h +--- linux-2.6.32.48/include/linux/dst.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/dst.h 2011-11-12 12:46:47.000000000 -0500 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -61661,9 +61625,9 @@ diff -urNp linux-2.6.32.46/include/linux/dst.h linux-2.6.32.46/include/linux/dst /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.46/include/linux/elf.h linux-2.6.32.46/include/linux/elf.h ---- linux-2.6.32.46/include/linux/elf.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/elf.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/elf.h linux-2.6.32.48/include/linux/elf.h +--- linux-2.6.32.48/include/linux/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/elf.h 2011-11-12 12:46:47.000000000 -0500 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -61736,9 +61700,9 @@ diff -urNp linux-2.6.32.46/include/linux/elf.h linux-2.6.32.46/include/linux/elf #endif -diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include/linux/fscache-cache.h ---- linux-2.6.32.46/include/linux/fscache-cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/fscache-cache.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/fscache-cache.h linux-2.6.32.48/include/linux/fscache-cache.h +--- linux-2.6.32.48/include/linux/fscache-cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/fscache-cache.h 2011-11-12 12:46:47.000000000 -0500 @@ -116,7 +116,7 @@ struct fscache_operation { #endif }; @@ -61757,9 +61721,9 @@ diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include op->release = release; INIT_LIST_HEAD(&op->pend_link); fscache_set_op_state(op, "Init"); -diff -urNp linux-2.6.32.46/include/linux/fs.h linux-2.6.32.46/include/linux/fs.h ---- linux-2.6.32.46/include/linux/fs.h 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/include/linux/fs.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/fs.h linux-2.6.32.48/include/linux/fs.h +--- linux-2.6.32.48/include/linux/fs.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/fs.h 2011-11-12 12:46:47.000000000 -0500 @@ -90,6 +90,11 @@ struct inodes_stat_t { /* Expect random access pattern */ #define FMODE_RANDOM ((__force fmode_t)4096) @@ -61931,9 +61895,9 @@ diff -urNp linux-2.6.32.46/include/linux/fs.h linux-2.6.32.46/include/linux/fs.h }; /* -diff -urNp linux-2.6.32.46/include/linux/fs_struct.h linux-2.6.32.46/include/linux/fs_struct.h ---- linux-2.6.32.46/include/linux/fs_struct.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/fs_struct.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/fs_struct.h linux-2.6.32.48/include/linux/fs_struct.h +--- linux-2.6.32.48/include/linux/fs_struct.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/fs_struct.h 2011-11-12 12:46:47.000000000 -0500 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -61943,9 +61907,9 @@ diff -urNp linux-2.6.32.46/include/linux/fs_struct.h linux-2.6.32.46/include/lin rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.46/include/linux/ftrace_event.h linux-2.6.32.46/include/linux/ftrace_event.h ---- linux-2.6.32.46/include/linux/ftrace_event.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/ftrace_event.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/ftrace_event.h linux-2.6.32.48/include/linux/ftrace_event.h +--- linux-2.6.32.48/include/linux/ftrace_event.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/ftrace_event.h 2011-11-12 12:46:47.000000000 -0500 @@ -163,7 +163,7 @@ extern int trace_define_field(struct ftr int filter_type); extern int trace_define_common_fields(struct ftrace_event_call *call); @@ -61955,9 +61919,9 @@ diff -urNp linux-2.6.32.46/include/linux/ftrace_event.h linux-2.6.32.46/include/ int trace_set_clr_event(const char *system, const char *event, int set); -diff -urNp linux-2.6.32.46/include/linux/genhd.h linux-2.6.32.46/include/linux/genhd.h ---- linux-2.6.32.46/include/linux/genhd.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/genhd.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/genhd.h linux-2.6.32.48/include/linux/genhd.h +--- linux-2.6.32.48/include/linux/genhd.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/genhd.h 2011-11-12 12:46:47.000000000 -0500 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -61967,9 +61931,9 @@ diff -urNp linux-2.6.32.46/include/linux/genhd.h linux-2.6.32.46/include/linux/g struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.46/include/linux/gracl.h linux-2.6.32.46/include/linux/gracl.h ---- linux-2.6.32.46/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/gracl.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/gracl.h linux-2.6.32.48/include/linux/gracl.h +--- linux-2.6.32.48/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/gracl.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -62288,9 +62252,9 @@ diff -urNp linux-2.6.32.46/include/linux/gracl.h linux-2.6.32.46/include/linux/g + +#endif + -diff -urNp linux-2.6.32.46/include/linux/gralloc.h linux-2.6.32.46/include/linux/gralloc.h ---- linux-2.6.32.46/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/gralloc.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/gralloc.h linux-2.6.32.48/include/linux/gralloc.h +--- linux-2.6.32.48/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/gralloc.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -62301,9 +62265,9 @@ diff -urNp linux-2.6.32.46/include/linux/gralloc.h linux-2.6.32.46/include/linux +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.46/include/linux/grdefs.h linux-2.6.32.46/include/linux/grdefs.h ---- linux-2.6.32.46/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/grdefs.h 2011-06-11 16:20:26.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/grdefs.h linux-2.6.32.48/include/linux/grdefs.h +--- linux-2.6.32.48/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/grdefs.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,140 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -62445,9 +62409,9 @@ diff -urNp linux-2.6.32.46/include/linux/grdefs.h linux-2.6.32.46/include/linux/ +}; + +#endif -diff -urNp linux-2.6.32.46/include/linux/grinternal.h linux-2.6.32.46/include/linux/grinternal.h ---- linux-2.6.32.46/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/grinternal.h 2011-10-20 00:48:45.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/grinternal.h linux-2.6.32.48/include/linux/grinternal.h +--- linux-2.6.32.48/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/grinternal.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,218 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -62667,9 +62631,9 @@ diff -urNp linux-2.6.32.46/include/linux/grinternal.h linux-2.6.32.46/include/li +#endif + +#endif -diff -urNp linux-2.6.32.46/include/linux/grmsg.h linux-2.6.32.46/include/linux/grmsg.h ---- linux-2.6.32.46/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/grmsg.h 2011-09-13 15:44:53.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/grmsg.h linux-2.6.32.48/include/linux/grmsg.h +--- linux-2.6.32.48/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/grmsg.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%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" @@ -62779,9 +62743,9 @@ diff -urNp linux-2.6.32.46/include/linux/grmsg.h linux-2.6.32.46/include/linux/g +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " -diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/linux/grsecurity.h ---- linux-2.6.32.46/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/grsecurity.h 2011-10-17 06:48:36.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/grsecurity.h linux-2.6.32.48/include/linux/grsecurity.h +--- linux-2.6.32.48/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/grsecurity.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,218 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -63001,9 +62965,9 @@ diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/li +#endif + +#endif -diff -urNp linux-2.6.32.46/include/linux/hdpu_features.h linux-2.6.32.46/include/linux/hdpu_features.h ---- linux-2.6.32.46/include/linux/hdpu_features.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/hdpu_features.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/hdpu_features.h linux-2.6.32.48/include/linux/hdpu_features.h +--- linux-2.6.32.48/include/linux/hdpu_features.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/hdpu_features.h 2011-11-12 12:46:47.000000000 -0500 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -63013,9 +62977,9 @@ diff -urNp linux-2.6.32.46/include/linux/hdpu_features.h linux-2.6.32.46/include unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.46/include/linux/highmem.h linux-2.6.32.46/include/linux/highmem.h ---- linux-2.6.32.46/include/linux/highmem.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/highmem.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/highmem.h linux-2.6.32.48/include/linux/highmem.h +--- linux-2.6.32.48/include/linux/highmem.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/highmem.h 2011-11-12 12:46:47.000000000 -0500 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -63035,9 +62999,9 @@ diff -urNp linux-2.6.32.46/include/linux/highmem.h linux-2.6.32.46/include/linux static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.46/include/linux/i2c.h linux-2.6.32.46/include/linux/i2c.h ---- linux-2.6.32.46/include/linux/i2c.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/i2c.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/i2c.h linux-2.6.32.48/include/linux/i2c.h +--- linux-2.6.32.48/include/linux/i2c.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/i2c.h 2011-11-12 12:46:47.000000000 -0500 @@ -325,6 +325,7 @@ struct i2c_algorithm { /* To determine what the adapter supports */ u32 (*functionality) (struct i2c_adapter *); @@ -63046,9 +63010,9 @@ diff -urNp linux-2.6.32.46/include/linux/i2c.h linux-2.6.32.46/include/linux/i2c /* * i2c_adapter is the structure used to identify a physical i2c bus along -diff -urNp linux-2.6.32.46/include/linux/i2o.h linux-2.6.32.46/include/linux/i2o.h ---- linux-2.6.32.46/include/linux/i2o.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/i2o.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/i2o.h linux-2.6.32.48/include/linux/i2o.h +--- linux-2.6.32.48/include/linux/i2o.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/i2o.h 2011-11-12 12:46:47.000000000 -0500 @@ -564,7 +564,7 @@ struct i2o_controller { struct i2o_device *exec; /* Executive */ #if BITS_PER_LONG == 64 @@ -63058,9 +63022,9 @@ diff -urNp linux-2.6.32.46/include/linux/i2o.h linux-2.6.32.46/include/linux/i2o struct list_head context_list; /* list of context id's and pointers */ #endif -diff -urNp linux-2.6.32.46/include/linux/init_task.h linux-2.6.32.46/include/linux/init_task.h ---- linux-2.6.32.46/include/linux/init_task.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/init_task.h 2011-05-18 20:44:59.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/init_task.h linux-2.6.32.48/include/linux/init_task.h +--- linux-2.6.32.48/include/linux/init_task.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/init_task.h 2011-11-12 12:46:47.000000000 -0500 @@ -83,6 +83,12 @@ extern struct group_info init_groups; #define INIT_IDS #endif @@ -63082,9 +63046,9 @@ diff -urNp linux-2.6.32.46/include/linux/init_task.h linux-2.6.32.46/include/lin .fs = &init_fs, \ .files = &init_files, \ .signal = &init_signals, \ -diff -urNp linux-2.6.32.46/include/linux/intel-iommu.h linux-2.6.32.46/include/linux/intel-iommu.h ---- linux-2.6.32.46/include/linux/intel-iommu.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/intel-iommu.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/intel-iommu.h linux-2.6.32.48/include/linux/intel-iommu.h +--- linux-2.6.32.48/include/linux/intel-iommu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/intel-iommu.h 2011-11-12 12:46:47.000000000 -0500 @@ -296,7 +296,7 @@ struct iommu_flush { u8 fm, u64 type); void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr, @@ -63094,9 +63058,9 @@ diff -urNp linux-2.6.32.46/include/linux/intel-iommu.h linux-2.6.32.46/include/l enum { SR_DMAR_FECTL_REG, -diff -urNp linux-2.6.32.46/include/linux/interrupt.h linux-2.6.32.46/include/linux/interrupt.h ---- linux-2.6.32.46/include/linux/interrupt.h 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/include/linux/interrupt.h 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/interrupt.h linux-2.6.32.48/include/linux/interrupt.h +--- linux-2.6.32.48/include/linux/interrupt.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/interrupt.h 2011-11-12 12:46:47.000000000 -0500 @@ -363,7 +363,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -63121,9 +63085,9 @@ diff -urNp linux-2.6.32.46/include/linux/interrupt.h linux-2.6.32.46/include/lin extern void softirq_init(void); #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) extern void raise_softirq_irqoff(unsigned int nr); -diff -urNp linux-2.6.32.46/include/linux/irq.h linux-2.6.32.46/include/linux/irq.h ---- linux-2.6.32.46/include/linux/irq.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/irq.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/irq.h linux-2.6.32.48/include/linux/irq.h +--- linux-2.6.32.48/include/linux/irq.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/irq.h 2011-11-12 12:46:47.000000000 -0500 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq, static inline bool alloc_desc_masks(struct irq_desc *desc, int node, bool boot) @@ -63138,9 +63102,9 @@ diff -urNp linux-2.6.32.46/include/linux/irq.h linux-2.6.32.46/include/linux/irq if (!alloc_cpumask_var_node(&desc->affinity, gfp, node)) return false; -diff -urNp linux-2.6.32.46/include/linux/kallsyms.h linux-2.6.32.46/include/linux/kallsyms.h ---- linux-2.6.32.46/include/linux/kallsyms.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/kallsyms.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/kallsyms.h linux-2.6.32.48/include/linux/kallsyms.h +--- linux-2.6.32.48/include/linux/kallsyms.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/kallsyms.h 2011-11-12 12:46:47.000000000 -0500 @@ -15,7 +15,8 @@ struct module; @@ -63167,9 +63131,9 @@ diff -urNp linux-2.6.32.46/include/linux/kallsyms.h linux-2.6.32.46/include/linu /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.46/include/linux/kgdb.h linux-2.6.32.46/include/linux/kgdb.h ---- linux-2.6.32.46/include/linux/kgdb.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/kgdb.h 2011-08-26 20:25:20.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/kgdb.h linux-2.6.32.48/include/linux/kgdb.h +--- linux-2.6.32.48/include/linux/kgdb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/kgdb.h 2011-11-12 12:46:47.000000000 -0500 @@ -74,8 +74,8 @@ void kgdb_breakpoint(void); extern int kgdb_connected; @@ -63209,9 +63173,9 @@ diff -urNp linux-2.6.32.46/include/linux/kgdb.h linux-2.6.32.46/include/linux/kg extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.32.46/include/linux/kmod.h linux-2.6.32.46/include/linux/kmod.h ---- linux-2.6.32.46/include/linux/kmod.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/kmod.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/kmod.h linux-2.6.32.48/include/linux/kmod.h +--- linux-2.6.32.48/include/linux/kmod.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/kmod.h 2011-11-12 12:46:47.000000000 -0500 @@ -31,6 +31,8 @@ * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -63221,9 +63185,9 @@ diff -urNp linux-2.6.32.46/include/linux/kmod.h linux-2.6.32.46/include/linux/km #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-2.6.32.46/include/linux/kobject.h linux-2.6.32.46/include/linux/kobject.h ---- linux-2.6.32.46/include/linux/kobject.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/kobject.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/kobject.h linux-2.6.32.48/include/linux/kobject.h +--- linux-2.6.32.48/include/linux/kobject.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/kobject.h 2011-11-12 12:46:47.000000000 -0500 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -63272,9 +63236,9 @@ diff -urNp linux-2.6.32.46/include/linux/kobject.h linux-2.6.32.46/include/linux struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.46/include/linux/kvm_host.h linux-2.6.32.46/include/linux/kvm_host.h ---- linux-2.6.32.46/include/linux/kvm_host.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/kvm_host.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/kvm_host.h linux-2.6.32.48/include/linux/kvm_host.h +--- linux-2.6.32.48/include/linux/kvm_host.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/kvm_host.h 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -63293,9 +63257,9 @@ diff -urNp linux-2.6.32.46/include/linux/kvm_host.h linux-2.6.32.46/include/linu void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.46/include/linux/libata.h linux-2.6.32.46/include/linux/libata.h ---- linux-2.6.32.46/include/linux/libata.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/libata.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/libata.h linux-2.6.32.48/include/linux/libata.h +--- linux-2.6.32.48/include/linux/libata.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/libata.h 2011-11-12 12:46:47.000000000 -0500 @@ -525,11 +525,11 @@ struct ata_ioports { struct ata_host { @@ -63355,9 +63319,9 @@ diff -urNp linux-2.6.32.46/include/linux/libata.h linux-2.6.32.46/include/linux/ extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.32.46/include/linux/lockd/bind.h linux-2.6.32.46/include/linux/lockd/bind.h ---- linux-2.6.32.46/include/linux/lockd/bind.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/lockd/bind.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/lockd/bind.h linux-2.6.32.48/include/linux/lockd/bind.h +--- linux-2.6.32.48/include/linux/lockd/bind.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/lockd/bind.h 2011-11-12 12:46:47.000000000 -0500 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -63375,9 +63339,9 @@ diff -urNp linux-2.6.32.46/include/linux/lockd/bind.h linux-2.6.32.46/include/li /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.46/include/linux/mca.h linux-2.6.32.46/include/linux/mca.h ---- linux-2.6.32.46/include/linux/mca.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mca.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mca.h linux-2.6.32.48/include/linux/mca.h +--- linux-2.6.32.48/include/linux/mca.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mca.h 2011-11-12 12:46:47.000000000 -0500 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions { int region); void * (*mca_transform_memory)(struct mca_device *, @@ -63387,9 +63351,9 @@ diff -urNp linux-2.6.32.46/include/linux/mca.h linux-2.6.32.46/include/linux/mca struct mca_bus { u64 default_dma_mask; -diff -urNp linux-2.6.32.46/include/linux/memory.h linux-2.6.32.46/include/linux/memory.h ---- linux-2.6.32.46/include/linux/memory.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/memory.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/memory.h linux-2.6.32.48/include/linux/memory.h +--- linux-2.6.32.48/include/linux/memory.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/memory.h 2011-11-12 12:46:47.000000000 -0500 @@ -108,7 +108,7 @@ struct memory_accessor { size_t count); ssize_t (*write)(struct memory_accessor *, const char *buf, @@ -63399,9 +63363,9 @@ diff -urNp linux-2.6.32.46/include/linux/memory.h linux-2.6.32.46/include/linux/ /* * Kernel text modification mutex, used for code patching. Users of this lock -diff -urNp linux-2.6.32.46/include/linux/mm.h linux-2.6.32.46/include/linux/mm.h ---- linux-2.6.32.46/include/linux/mm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mm.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mm.h linux-2.6.32.48/include/linux/mm.h +--- linux-2.6.32.48/include/linux/mm.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mm.h 2011-11-12 12:46:47.000000000 -0500 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ @@ -63481,9 +63445,9 @@ diff -urNp linux-2.6.32.46/include/linux/mm.h linux-2.6.32.46/include/linux/mm.h #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.46/include/linux/mm_types.h linux-2.6.32.46/include/linux/mm_types.h ---- linux-2.6.32.46/include/linux/mm_types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mm_types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mm_types.h linux-2.6.32.48/include/linux/mm_types.h +--- linux-2.6.32.48/include/linux/mm_types.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mm_types.h 2011-11-12 12:46:47.000000000 -0500 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -63518,9 +63482,9 @@ diff -urNp linux-2.6.32.46/include/linux/mm_types.h linux-2.6.32.46/include/linu }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.46/include/linux/mmu_notifier.h linux-2.6.32.46/include/linux/mmu_notifier.h ---- linux-2.6.32.46/include/linux/mmu_notifier.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mmu_notifier.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mmu_notifier.h linux-2.6.32.48/include/linux/mmu_notifier.h +--- linux-2.6.32.48/include/linux/mmu_notifier.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mmu_notifier.h 2011-11-12 12:46:47.000000000 -0500 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -63537,9 +63501,9 @@ diff -urNp linux-2.6.32.46/include/linux/mmu_notifier.h linux-2.6.32.46/include/ }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.46/include/linux/mmzone.h linux-2.6.32.46/include/linux/mmzone.h ---- linux-2.6.32.46/include/linux/mmzone.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mmzone.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mmzone.h linux-2.6.32.48/include/linux/mmzone.h +--- linux-2.6.32.48/include/linux/mmzone.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mmzone.h 2011-11-12 12:46:47.000000000 -0500 @@ -350,7 +350,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -63549,9 +63513,9 @@ diff -urNp linux-2.6.32.46/include/linux/mmzone.h linux-2.6.32.46/include/linux/ /* * prev_priority holds the scanning priority for this zone. It is -diff -urNp linux-2.6.32.46/include/linux/mod_devicetable.h linux-2.6.32.46/include/linux/mod_devicetable.h ---- linux-2.6.32.46/include/linux/mod_devicetable.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mod_devicetable.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mod_devicetable.h linux-2.6.32.48/include/linux/mod_devicetable.h +--- linux-2.6.32.48/include/linux/mod_devicetable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mod_devicetable.h 2011-11-12 12:46:47.000000000 -0500 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -63570,9 +63534,9 @@ diff -urNp linux-2.6.32.46/include/linux/mod_devicetable.h linux-2.6.32.46/inclu struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.46/include/linux/module.h linux-2.6.32.46/include/linux/module.h ---- linux-2.6.32.46/include/linux/module.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/module.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/module.h linux-2.6.32.48/include/linux/module.h +--- linux-2.6.32.48/include/linux/module.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/module.h 2011-11-12 12:46:47.000000000 -0500 @@ -16,6 +16,7 @@ #include <linux/kobject.h> #include <linux/moduleparam.h> @@ -63664,9 +63628,9 @@ diff -urNp linux-2.6.32.46/include/linux/module.h linux-2.6.32.46/include/linux/ } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.46/include/linux/moduleloader.h linux-2.6.32.46/include/linux/moduleloader.h ---- linux-2.6.32.46/include/linux/moduleloader.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/moduleloader.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/moduleloader.h linux-2.6.32.48/include/linux/moduleloader.h +--- linux-2.6.32.48/include/linux/moduleloader.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/moduleloader.h 2011-11-12 12:46:47.000000000 -0500 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -63689,9 +63653,9 @@ diff -urNp linux-2.6.32.46/include/linux/moduleloader.h linux-2.6.32.46/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.46/include/linux/moduleparam.h linux-2.6.32.46/include/linux/moduleparam.h ---- linux-2.6.32.46/include/linux/moduleparam.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/moduleparam.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/moduleparam.h linux-2.6.32.48/include/linux/moduleparam.h +--- linux-2.6.32.48/include/linux/moduleparam.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/moduleparam.h 2011-11-12 12:46:47.000000000 -0500 @@ -132,7 +132,7 @@ struct kparam_array /* Actually copy string: maxlen param is usually sizeof(string). */ @@ -63710,9 +63674,9 @@ diff -urNp linux-2.6.32.46/include/linux/moduleparam.h linux-2.6.32.46/include/l = { 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.46/include/linux/mutex.h linux-2.6.32.46/include/linux/mutex.h ---- linux-2.6.32.46/include/linux/mutex.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/mutex.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/mutex.h linux-2.6.32.48/include/linux/mutex.h +--- linux-2.6.32.48/include/linux/mutex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/mutex.h 2011-11-12 12:46:47.000000000 -0500 @@ -51,7 +51,7 @@ struct mutex { spinlock_t wait_lock; struct list_head wait_list; @@ -63722,9 +63686,9 @@ diff -urNp linux-2.6.32.46/include/linux/mutex.h linux-2.6.32.46/include/linux/m #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name; -diff -urNp linux-2.6.32.46/include/linux/namei.h linux-2.6.32.46/include/linux/namei.h ---- linux-2.6.32.46/include/linux/namei.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/namei.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/namei.h linux-2.6.32.48/include/linux/namei.h +--- linux-2.6.32.48/include/linux/namei.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/namei.h 2011-11-12 12:46:47.000000000 -0500 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -63749,9 +63713,9 @@ diff -urNp linux-2.6.32.46/include/linux/namei.h linux-2.6.32.46/include/linux/n { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.46/include/linux/netdevice.h linux-2.6.32.46/include/linux/netdevice.h ---- linux-2.6.32.46/include/linux/netdevice.h 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/include/linux/netdevice.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/netdevice.h linux-2.6.32.48/include/linux/netdevice.h +--- linux-2.6.32.48/include/linux/netdevice.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/netdevice.h 2011-11-12 12:46:47.000000000 -0500 @@ -637,6 +637,7 @@ struct net_device_ops { u16 xid); #endif @@ -63760,9 +63724,9 @@ diff -urNp linux-2.6.32.46/include/linux/netdevice.h linux-2.6.32.46/include/lin /* * The DEVICE structure. -diff -urNp linux-2.6.32.46/include/linux/netfilter/xt_gradm.h linux-2.6.32.46/include/linux/netfilter/xt_gradm.h ---- linux-2.6.32.46/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/include/linux/netfilter/xt_gradm.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/netfilter/xt_gradm.h linux-2.6.32.48/include/linux/netfilter/xt_gradm.h +--- linux-2.6.32.48/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/include/linux/netfilter/xt_gradm.h 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -63773,9 +63737,9 @@ diff -urNp linux-2.6.32.46/include/linux/netfilter/xt_gradm.h linux-2.6.32.46/in +}; + +#endif -diff -urNp linux-2.6.32.46/include/linux/nodemask.h linux-2.6.32.46/include/linux/nodemask.h ---- linux-2.6.32.46/include/linux/nodemask.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/nodemask.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/nodemask.h linux-2.6.32.48/include/linux/nodemask.h +--- linux-2.6.32.48/include/linux/nodemask.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/nodemask.h 2011-11-12 12:46:47.000000000 -0500 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -63792,9 +63756,9 @@ diff -urNp linux-2.6.32.46/include/linux/nodemask.h linux-2.6.32.46/include/linu }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.46/include/linux/oprofile.h linux-2.6.32.46/include/linux/oprofile.h ---- linux-2.6.32.46/include/linux/oprofile.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/oprofile.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/oprofile.h linux-2.6.32.48/include/linux/oprofile.h +--- linux-2.6.32.48/include/linux/oprofile.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/oprofile.h 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -63807,9 +63771,9 @@ diff -urNp linux-2.6.32.46/include/linux/oprofile.h linux-2.6.32.46/include/linu /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.46/include/linux/pagemap.h linux-2.6.32.46/include/linux/pagemap.h ---- linux-2.6.32.46/include/linux/pagemap.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/pagemap.h 2011-08-17 19:36:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/pagemap.h linux-2.6.32.48/include/linux/pagemap.h +--- linux-2.6.32.48/include/linux/pagemap.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/pagemap.h 2011-11-12 12:46:47.000000000 -0500 @@ -425,6 +425,7 @@ static inline int fault_in_pages_readabl if (((unsigned long)uaddr & PAGE_MASK) != ((unsigned long)end & PAGE_MASK)) @@ -63818,9 +63782,9 @@ diff -urNp linux-2.6.32.46/include/linux/pagemap.h linux-2.6.32.46/include/linux } return ret; } -diff -urNp linux-2.6.32.46/include/linux/perf_event.h linux-2.6.32.46/include/linux/perf_event.h ---- linux-2.6.32.46/include/linux/perf_event.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/perf_event.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/perf_event.h linux-2.6.32.48/include/linux/perf_event.h +--- linux-2.6.32.48/include/linux/perf_event.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/perf_event.h 2011-11-12 12:46:47.000000000 -0500 @@ -476,7 +476,7 @@ struct hw_perf_event { struct hrtimer hrtimer; }; @@ -63850,9 +63814,9 @@ diff -urNp linux-2.6.32.46/include/linux/perf_event.h linux-2.6.32.46/include/li /* * Protect attach/detach and child_list: -diff -urNp linux-2.6.32.46/include/linux/pipe_fs_i.h linux-2.6.32.46/include/linux/pipe_fs_i.h ---- linux-2.6.32.46/include/linux/pipe_fs_i.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/pipe_fs_i.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/pipe_fs_i.h linux-2.6.32.48/include/linux/pipe_fs_i.h +--- linux-2.6.32.48/include/linux/pipe_fs_i.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/pipe_fs_i.h 2011-11-12 12:46:47.000000000 -0500 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -63866,9 +63830,9 @@ diff -urNp linux-2.6.32.46/include/linux/pipe_fs_i.h linux-2.6.32.46/include/lin unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.46/include/linux/poison.h linux-2.6.32.46/include/linux/poison.h ---- linux-2.6.32.46/include/linux/poison.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/poison.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/poison.h linux-2.6.32.48/include/linux/poison.h +--- linux-2.6.32.48/include/linux/poison.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/poison.h 2011-11-12 12:46:47.000000000 -0500 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -63880,9 +63844,9 @@ diff -urNp linux-2.6.32.46/include/linux/poison.h linux-2.6.32.46/include/linux/ /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.46/include/linux/posix-timers.h linux-2.6.32.46/include/linux/posix-timers.h ---- linux-2.6.32.46/include/linux/posix-timers.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/posix-timers.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/posix-timers.h linux-2.6.32.48/include/linux/posix-timers.h +--- linux-2.6.32.48/include/linux/posix-timers.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/posix-timers.h 2011-11-12 12:46:47.000000000 -0500 @@ -67,7 +67,7 @@ struct k_itimer { }; @@ -63892,9 +63856,9 @@ diff -urNp linux-2.6.32.46/include/linux/posix-timers.h linux-2.6.32.46/include/ int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); int (*clock_set) (const clockid_t which_clock, struct timespec * tp); int (*clock_get) (const clockid_t which_clock, struct timespec * tp); -diff -urNp linux-2.6.32.46/include/linux/preempt.h linux-2.6.32.46/include/linux/preempt.h ---- linux-2.6.32.46/include/linux/preempt.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/preempt.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/preempt.h linux-2.6.32.48/include/linux/preempt.h +--- linux-2.6.32.48/include/linux/preempt.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/preempt.h 2011-11-12 12:46:47.000000000 -0500 @@ -110,7 +110,7 @@ struct preempt_ops { void (*sched_in)(struct preempt_notifier *notifier, int cpu); void (*sched_out)(struct preempt_notifier *notifier, @@ -63904,9 +63868,9 @@ diff -urNp linux-2.6.32.46/include/linux/preempt.h linux-2.6.32.46/include/linux /** * preempt_notifier - key for installing preemption notifiers -diff -urNp linux-2.6.32.46/include/linux/proc_fs.h linux-2.6.32.46/include/linux/proc_fs.h ---- linux-2.6.32.46/include/linux/proc_fs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/proc_fs.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/proc_fs.h linux-2.6.32.48/include/linux/proc_fs.h +--- linux-2.6.32.48/include/linux/proc_fs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/proc_fs.h 2011-11-12 12:46:47.000000000 -0500 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -63936,9 +63900,9 @@ diff -urNp linux-2.6.32.46/include/linux/proc_fs.h linux-2.6.32.46/include/linux struct ctl_table_header; struct ctl_table; -diff -urNp linux-2.6.32.46/include/linux/ptrace.h linux-2.6.32.46/include/linux/ptrace.h ---- linux-2.6.32.46/include/linux/ptrace.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/ptrace.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/ptrace.h linux-2.6.32.48/include/linux/ptrace.h +--- linux-2.6.32.48/include/linux/ptrace.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/ptrace.h 2011-11-12 12:46:47.000000000 -0500 @@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -63952,9 +63916,9 @@ diff -urNp linux-2.6.32.46/include/linux/ptrace.h linux-2.6.32.46/include/linux/ static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-2.6.32.46/include/linux/random.h linux-2.6.32.46/include/linux/random.h ---- linux-2.6.32.46/include/linux/random.h 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/include/linux/random.h 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/random.h linux-2.6.32.48/include/linux/random.h +--- linux-2.6.32.48/include/linux/random.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/random.h 2011-11-12 12:46:47.000000000 -0500 @@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -63967,9 +63931,9 @@ diff -urNp linux-2.6.32.46/include/linux/random.h linux-2.6.32.46/include/linux/ #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.46/include/linux/reboot.h linux-2.6.32.46/include/linux/reboot.h ---- linux-2.6.32.46/include/linux/reboot.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/reboot.h 2011-05-22 23:02:06.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/reboot.h linux-2.6.32.48/include/linux/reboot.h +--- linux-2.6.32.48/include/linux/reboot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/reboot.h 2011-11-12 12:46:47.000000000 -0500 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st * Architecture-specific implementations of sys_reboot commands. */ @@ -64005,9 +63969,9 @@ diff -urNp linux-2.6.32.46/include/linux/reboot.h linux-2.6.32.46/include/linux/ #include <asm/emergency-restart.h> #endif -diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs.h linux-2.6.32.46/include/linux/reiserfs_fs.h ---- linux-2.6.32.46/include/linux/reiserfs_fs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/reiserfs_fs.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/reiserfs_fs.h linux-2.6.32.48/include/linux/reiserfs_fs.h +--- linux-2.6.32.48/include/linux/reiserfs_fs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/reiserfs_fs.h 2011-11-12 12:46:47.000000000 -0500 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -64054,9 +64018,9 @@ diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs.h linux-2.6.32.46/include/l #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) #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.46/include/linux/reiserfs_fs_sb.h linux-2.6.32.46/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.46/include/linux/reiserfs_fs_sb.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/reiserfs_fs_sb.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/reiserfs_fs_sb.h linux-2.6.32.48/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/reiserfs_fs_sb.h 2011-11-12 12:46:47.000000000 -0500 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -64066,9 +64030,9 @@ diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs_sb.h linux-2.6.32.46/includ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.46/include/linux/relay.h linux-2.6.32.46/include/linux/relay.h ---- linux-2.6.32.46/include/linux/relay.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/relay.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/relay.h linux-2.6.32.48/include/linux/relay.h +--- linux-2.6.32.48/include/linux/relay.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/relay.h 2011-11-12 12:46:47.000000000 -0500 @@ -159,7 +159,7 @@ struct rchan_callbacks * The callback should return 0 if successful, negative if not. */ @@ -64078,9 +64042,9 @@ diff -urNp linux-2.6.32.46/include/linux/relay.h linux-2.6.32.46/include/linux/r /* * CONFIG_RELAY kernel API, kernel/relay.c -diff -urNp linux-2.6.32.46/include/linux/rfkill.h linux-2.6.32.46/include/linux/rfkill.h ---- linux-2.6.32.46/include/linux/rfkill.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/rfkill.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/rfkill.h linux-2.6.32.48/include/linux/rfkill.h +--- linux-2.6.32.48/include/linux/rfkill.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/rfkill.h 2011-11-12 12:46:47.000000000 -0500 @@ -144,6 +144,7 @@ struct rfkill_ops { void (*query)(struct rfkill *rfkill, void *data); int (*set_block)(void *data, bool blocked); @@ -64089,9 +64053,9 @@ diff -urNp linux-2.6.32.46/include/linux/rfkill.h linux-2.6.32.46/include/linux/ #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) /** -diff -urNp linux-2.6.32.46/include/linux/sched.h linux-2.6.32.46/include/linux/sched.h ---- linux-2.6.32.46/include/linux/sched.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sched.h 2011-08-11 19:48:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sched.h linux-2.6.32.48/include/linux/sched.h +--- linux-2.6.32.48/include/linux/sched.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sched.h 2011-11-12 12:46:47.000000000 -0500 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -64352,9 +64316,9 @@ diff -urNp linux-2.6.32.46/include/linux/sched.h linux-2.6.32.46/include/linux/s extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.46/include/linux/screen_info.h linux-2.6.32.46/include/linux/screen_info.h ---- linux-2.6.32.46/include/linux/screen_info.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/screen_info.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/screen_info.h linux-2.6.32.48/include/linux/screen_info.h +--- linux-2.6.32.48/include/linux/screen_info.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/screen_info.h 2011-11-12 12:46:47.000000000 -0500 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -64365,9 +64329,9 @@ diff -urNp linux-2.6.32.46/include/linux/screen_info.h linux-2.6.32.46/include/l } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.46/include/linux/security.h linux-2.6.32.46/include/linux/security.h ---- linux-2.6.32.46/include/linux/security.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/security.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/security.h linux-2.6.32.48/include/linux/security.h +--- linux-2.6.32.48/include/linux/security.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/security.h 2011-11-12 12:46:47.000000000 -0500 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -64376,9 +64340,9 @@ diff -urNp linux-2.6.32.46/include/linux/security.h linux-2.6.32.46/include/linu #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.46/include/linux/seq_file.h linux-2.6.32.46/include/linux/seq_file.h ---- linux-2.6.32.46/include/linux/seq_file.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/seq_file.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/seq_file.h linux-2.6.32.48/include/linux/seq_file.h +--- linux-2.6.32.48/include/linux/seq_file.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/seq_file.h 2011-11-12 12:46:47.000000000 -0500 @@ -32,6 +32,7 @@ struct seq_operations { void * (*next) (struct seq_file *m, void *v, loff_t *pos); int (*show) (struct seq_file *m, void *v); @@ -64387,9 +64351,9 @@ diff -urNp linux-2.6.32.46/include/linux/seq_file.h linux-2.6.32.46/include/linu #define SEQ_SKIP 1 -diff -urNp linux-2.6.32.46/include/linux/shm.h linux-2.6.32.46/include/linux/shm.h ---- linux-2.6.32.46/include/linux/shm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/shm.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/shm.h linux-2.6.32.48/include/linux/shm.h +--- linux-2.6.32.48/include/linux/shm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/shm.h 2011-11-12 12:46:47.000000000 -0500 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -64401,9 +64365,9 @@ diff -urNp linux-2.6.32.46/include/linux/shm.h linux-2.6.32.46/include/linux/shm }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.46/include/linux/skbuff.h linux-2.6.32.46/include/linux/skbuff.h ---- linux-2.6.32.46/include/linux/skbuff.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/skbuff.h 2011-08-21 15:27:56.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/skbuff.h linux-2.6.32.48/include/linux/skbuff.h +--- linux-2.6.32.48/include/linux/skbuff.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/skbuff.h 2011-11-12 12:46:47.000000000 -0500 @@ -14,6 +14,7 @@ #ifndef _LINUX_SKBUFF_H #define _LINUX_SKBUFF_H @@ -64448,9 +64412,9 @@ diff -urNp linux-2.6.32.46/include/linux/skbuff.h linux-2.6.32.46/include/linux/ #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linux/slab_def.h ---- linux-2.6.32.46/include/linux/slab_def.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/slab_def.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/slab_def.h linux-2.6.32.48/include/linux/slab_def.h +--- linux-2.6.32.48/include/linux/slab_def.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/slab_def.h 2011-11-12 12:46:47.000000000 -0500 @@ -69,10 +69,10 @@ struct kmem_cache { unsigned long node_allocs; unsigned long node_frees; @@ -64466,9 +64430,9 @@ diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linu /* * If debugging is enabled, then the allocator can add additional -diff -urNp linux-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/slab.h ---- linux-2.6.32.46/include/linux/slab.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/slab.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/slab.h linux-2.6.32.48/include/linux/slab.h +--- linux-2.6.32.48/include/linux/slab.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/slab.h 2011-11-12 12:46:47.000000000 -0500 @@ -11,12 +11,20 @@ #include <linux/gfp.h> @@ -64553,9 +64517,9 @@ diff -urNp linux-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/sl +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.46/include/linux/slub_def.h linux-2.6.32.46/include/linux/slub_def.h ---- linux-2.6.32.46/include/linux/slub_def.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/slub_def.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/slub_def.h linux-2.6.32.48/include/linux/slub_def.h +--- linux-2.6.32.48/include/linux/slub_def.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/slub_def.h 2011-11-12 12:46:47.000000000 -0500 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -64574,9 +64538,9 @@ diff -urNp linux-2.6.32.46/include/linux/slub_def.h linux-2.6.32.46/include/linu #ifdef CONFIG_KMEMTRACE extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags); -diff -urNp linux-2.6.32.46/include/linux/sonet.h linux-2.6.32.46/include/linux/sonet.h ---- linux-2.6.32.46/include/linux/sonet.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sonet.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sonet.h linux-2.6.32.48/include/linux/sonet.h +--- linux-2.6.32.48/include/linux/sonet.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sonet.h 2011-11-12 12:46:47.000000000 -0500 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -64586,9 +64550,9 @@ diff -urNp linux-2.6.32.46/include/linux/sonet.h linux-2.6.32.46/include/linux/s __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.46/include/linux/sunrpc/cache.h linux-2.6.32.46/include/linux/sunrpc/cache.h ---- linux-2.6.32.46/include/linux/sunrpc/cache.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sunrpc/cache.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sunrpc/cache.h linux-2.6.32.48/include/linux/sunrpc/cache.h +--- linux-2.6.32.48/include/linux/sunrpc/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sunrpc/cache.h 2011-11-12 12:46:47.000000000 -0500 @@ -125,7 +125,7 @@ struct cache_detail { */ struct cache_req { @@ -64598,9 +64562,9 @@ diff -urNp linux-2.6.32.46/include/linux/sunrpc/cache.h linux-2.6.32.46/include/ /* this must be embedded in a deferred_request that is being * delayed awaiting cache-fill */ -diff -urNp linux-2.6.32.46/include/linux/sunrpc/clnt.h linux-2.6.32.46/include/linux/sunrpc/clnt.h ---- linux-2.6.32.46/include/linux/sunrpc/clnt.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sunrpc/clnt.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sunrpc/clnt.h linux-2.6.32.48/include/linux/sunrpc/clnt.h +--- linux-2.6.32.48/include/linux/sunrpc/clnt.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sunrpc/clnt.h 2011-11-12 12:46:47.000000000 -0500 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -64631,9 +64595,9 @@ diff -urNp linux-2.6.32.46/include/linux/sunrpc/clnt.h linux-2.6.32.46/include/l } #endif /* __KERNEL__ */ -diff -urNp linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h ---- linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h +--- linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sunrpc/svc_rdma.h 2011-11-12 12:46:47.000000000 -0500 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord; extern unsigned int svcrdma_max_requests; extern unsigned int svcrdma_max_req_size; @@ -64659,9 +64623,9 @@ diff -urNp linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h linux-2.6.32.46/inclu #define RPCRDMA_VERSION 1 -diff -urNp linux-2.6.32.46/include/linux/suspend.h linux-2.6.32.46/include/linux/suspend.h ---- linux-2.6.32.46/include/linux/suspend.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/suspend.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/suspend.h linux-2.6.32.48/include/linux/suspend.h +--- linux-2.6.32.48/include/linux/suspend.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/suspend.h 2011-11-12 12:46:47.000000000 -0500 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -64750,9 +64714,9 @@ diff -urNp linux-2.6.32.46/include/linux/suspend.h linux-2.6.32.46/include/linux static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.32.46/include/linux/sysctl.h linux-2.6.32.46/include/linux/sysctl.h ---- linux-2.6.32.46/include/linux/sysctl.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sysctl.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sysctl.h linux-2.6.32.48/include/linux/sysctl.h +--- linux-2.6.32.48/include/linux/sysctl.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sysctl.h 2011-11-12 12:46:47.000000000 -0500 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -64783,9 +64747,9 @@ diff -urNp linux-2.6.32.46/include/linux/sysctl.h linux-2.6.32.46/include/linux/ extern ctl_handler sysctl_intvec; extern ctl_handler sysctl_jiffies; extern ctl_handler sysctl_ms_jiffies; -diff -urNp linux-2.6.32.46/include/linux/sysfs.h linux-2.6.32.46/include/linux/sysfs.h ---- linux-2.6.32.46/include/linux/sysfs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/sysfs.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/sysfs.h linux-2.6.32.48/include/linux/sysfs.h +--- linux-2.6.32.48/include/linux/sysfs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/sysfs.h 2011-11-12 12:46:47.000000000 -0500 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -64797,9 +64761,9 @@ diff -urNp linux-2.6.32.46/include/linux/sysfs.h linux-2.6.32.46/include/linux/s }; struct sysfs_dirent; -diff -urNp linux-2.6.32.46/include/linux/thread_info.h linux-2.6.32.46/include/linux/thread_info.h ---- linux-2.6.32.46/include/linux/thread_info.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/thread_info.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/thread_info.h linux-2.6.32.48/include/linux/thread_info.h +--- linux-2.6.32.48/include/linux/thread_info.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/thread_info.h 2011-11-12 12:46:47.000000000 -0500 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -64809,9 +64773,9 @@ diff -urNp linux-2.6.32.46/include/linux/thread_info.h linux-2.6.32.46/include/l u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.46/include/linux/tty.h linux-2.6.32.46/include/linux/tty.h ---- linux-2.6.32.46/include/linux/tty.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/tty.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/tty.h linux-2.6.32.48/include/linux/tty.h +--- linux-2.6.32.48/include/linux/tty.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/tty.h 2011-11-12 12:46:47.000000000 -0500 @@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void); /* This last one is just for the tty layer internals and shouldn't be used elsewhere */ extern void tty_ldisc_enable(struct tty_struct *tty); @@ -64820,9 +64784,9 @@ diff -urNp linux-2.6.32.46/include/linux/tty.h linux-2.6.32.46/include/linux/tty /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.46/include/linux/tty_ldisc.h linux-2.6.32.46/include/linux/tty_ldisc.h ---- linux-2.6.32.46/include/linux/tty_ldisc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/tty_ldisc.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/tty_ldisc.h linux-2.6.32.48/include/linux/tty_ldisc.h +--- linux-2.6.32.48/include/linux/tty_ldisc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/tty_ldisc.h 2011-11-12 12:46:47.000000000 -0500 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -64832,9 +64796,9 @@ diff -urNp linux-2.6.32.46/include/linux/tty_ldisc.h linux-2.6.32.46/include/lin }; struct tty_ldisc { -diff -urNp linux-2.6.32.46/include/linux/types.h linux-2.6.32.46/include/linux/types.h ---- linux-2.6.32.46/include/linux/types.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/types.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/types.h linux-2.6.32.48/include/linux/types.h +--- linux-2.6.32.48/include/linux/types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/types.h 2011-11-12 12:46:47.000000000 -0500 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -64862,9 +64826,9 @@ diff -urNp linux-2.6.32.46/include/linux/types.h linux-2.6.32.46/include/linux/t #endif struct ustat { -diff -urNp linux-2.6.32.46/include/linux/uaccess.h linux-2.6.32.46/include/linux/uaccess.h ---- linux-2.6.32.46/include/linux/uaccess.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/uaccess.h 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/uaccess.h linux-2.6.32.48/include/linux/uaccess.h +--- linux-2.6.32.48/include/linux/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/uaccess.h 2011-11-12 12:46:47.000000000 -0500 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -64897,9 +64861,9 @@ diff -urNp linux-2.6.32.46/include/linux/uaccess.h linux-2.6.32.46/include/linux +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.46/include/linux/unaligned/access_ok.h linux-2.6.32.46/include/linux/unaligned/access_ok.h ---- linux-2.6.32.46/include/linux/unaligned/access_ok.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/unaligned/access_ok.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/unaligned/access_ok.h linux-2.6.32.48/include/linux/unaligned/access_ok.h +--- linux-2.6.32.48/include/linux/unaligned/access_ok.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/unaligned/access_ok.h 2011-11-12 12:46:47.000000000 -0500 @@ -6,32 +6,32 @@ static inline u16 get_unaligned_le16(const void *p) @@ -64939,9 +64903,9 @@ diff -urNp linux-2.6.32.46/include/linux/unaligned/access_ok.h linux-2.6.32.46/i } static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-2.6.32.46/include/linux/vermagic.h linux-2.6.32.46/include/linux/vermagic.h ---- linux-2.6.32.46/include/linux/vermagic.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/vermagic.h 2011-10-08 08:17:48.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/vermagic.h linux-2.6.32.48/include/linux/vermagic.h +--- linux-2.6.32.48/include/linux/vermagic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/linux/vermagic.h 2011-11-12 12:46:47.000000000 -0500 @@ -26,9 +26,28 @@ #define MODULE_ARCH_VERMAGIC "" #endif @@ -64972,9 +64936,9 @@ diff -urNp linux-2.6.32.46/include/linux/vermagic.h linux-2.6.32.46/include/linu + MODULE_ARCH_VERMAGIC \ + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC -diff -urNp linux-2.6.32.46/include/linux/vmalloc.h linux-2.6.32.46/include/linux/vmalloc.h ---- linux-2.6.32.46/include/linux/vmalloc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/vmalloc.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/vmalloc.h linux-2.6.32.48/include/linux/vmalloc.h +--- linux-2.6.32.48/include/linux/vmalloc.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/vmalloc.h 2011-11-12 12:46:47.000000000 -0500 @@ -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 */ @@ -65069,9 +65033,9 @@ diff -urNp linux-2.6.32.46/include/linux/vmalloc.h linux-2.6.32.46/include/linux +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.46/include/linux/vmstat.h linux-2.6.32.46/include/linux/vmstat.h ---- linux-2.6.32.46/include/linux/vmstat.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/linux/vmstat.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/linux/vmstat.h linux-2.6.32.48/include/linux/vmstat.h +--- linux-2.6.32.48/include/linux/vmstat.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/linux/vmstat.h 2011-11-12 12:46:47.000000000 -0500 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -65135,9 +65099,9 @@ diff -urNp linux-2.6.32.46/include/linux/vmstat.h linux-2.6.32.46/include/linux/ } static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-2.6.32.46/include/media/saa7146_vv.h linux-2.6.32.46/include/media/saa7146_vv.h ---- linux-2.6.32.46/include/media/saa7146_vv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/media/saa7146_vv.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/media/saa7146_vv.h linux-2.6.32.48/include/media/saa7146_vv.h +--- linux-2.6.32.48/include/media/saa7146_vv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/media/saa7146_vv.h 2011-11-12 12:46:47.000000000 -0500 @@ -167,7 +167,7 @@ struct saa7146_ext_vv int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *); @@ -65147,9 +65111,9 @@ diff -urNp linux-2.6.32.46/include/media/saa7146_vv.h linux-2.6.32.46/include/me /* pointer to the saa7146 core ops */ const struct v4l2_ioctl_ops *core_ops; -diff -urNp linux-2.6.32.46/include/media/v4l2-dev.h linux-2.6.32.46/include/media/v4l2-dev.h ---- linux-2.6.32.46/include/media/v4l2-dev.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/media/v4l2-dev.h 2011-10-08 08:14:40.000000000 -0400 +diff -urNp linux-2.6.32.48/include/media/v4l2-dev.h linux-2.6.32.48/include/media/v4l2-dev.h +--- linux-2.6.32.48/include/media/v4l2-dev.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/media/v4l2-dev.h 2011-11-12 12:46:47.000000000 -0500 @@ -34,7 +34,7 @@ struct v4l2_device; #define V4L2_FL_UNREGISTERED (0) @@ -65167,9 +65131,9 @@ diff -urNp linux-2.6.32.46/include/media/v4l2-dev.h linux-2.6.32.46/include/medi /* * Newer version of video_device, handled by videodev2.c -diff -urNp linux-2.6.32.46/include/media/v4l2-device.h linux-2.6.32.46/include/media/v4l2-device.h ---- linux-2.6.32.46/include/media/v4l2-device.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/media/v4l2-device.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/media/v4l2-device.h linux-2.6.32.48/include/media/v4l2-device.h +--- linux-2.6.32.48/include/media/v4l2-device.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/media/v4l2-device.h 2011-11-12 12:46:47.000000000 -0500 @@ -71,7 +71,7 @@ int __must_check v4l2_device_register(st this function returns 0. If the name ends with a digit (e.g. cx18), then the name will be set to cx18-0 since cx180 looks really odd. */ @@ -65179,9 +65143,9 @@ diff -urNp linux-2.6.32.46/include/media/v4l2-device.h linux-2.6.32.46/include/m /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects. Since the parent disappears this ensures that v4l2_dev doesn't have an -diff -urNp linux-2.6.32.46/include/media/v4l2-ioctl.h linux-2.6.32.46/include/media/v4l2-ioctl.h ---- linux-2.6.32.46/include/media/v4l2-ioctl.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/media/v4l2-ioctl.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/media/v4l2-ioctl.h linux-2.6.32.48/include/media/v4l2-ioctl.h +--- linux-2.6.32.48/include/media/v4l2-ioctl.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/media/v4l2-ioctl.h 2011-11-12 12:46:47.000000000 -0500 @@ -243,6 +243,7 @@ struct v4l2_ioctl_ops { long (*vidioc_default) (struct file *file, void *fh, int cmd, void *arg); @@ -65190,9 +65154,9 @@ diff -urNp linux-2.6.32.46/include/media/v4l2-ioctl.h linux-2.6.32.46/include/me /* v4l debugging and diagnostics */ -diff -urNp linux-2.6.32.46/include/net/flow.h linux-2.6.32.46/include/net/flow.h ---- linux-2.6.32.46/include/net/flow.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/flow.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/flow.h linux-2.6.32.48/include/net/flow.h +--- linux-2.6.32.48/include/net/flow.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/flow.h 2011-11-12 12:46:47.000000000 -0500 @@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, flow_resolve_t resolver); @@ -65202,9 +65166,9 @@ diff -urNp linux-2.6.32.46/include/net/flow.h linux-2.6.32.46/include/net/flow.h static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2) { -diff -urNp linux-2.6.32.46/include/net/inetpeer.h linux-2.6.32.46/include/net/inetpeer.h ---- linux-2.6.32.46/include/net/inetpeer.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/inetpeer.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/inetpeer.h linux-2.6.32.48/include/net/inetpeer.h +--- linux-2.6.32.48/include/net/inetpeer.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/inetpeer.h 2011-11-12 12:46:47.000000000 -0500 @@ -24,7 +24,7 @@ struct inet_peer __u32 dtime; /* the time of last use of not * referenced entries */ @@ -65214,9 +65178,9 @@ diff -urNp linux-2.6.32.46/include/net/inetpeer.h linux-2.6.32.46/include/net/in __u32 tcp_ts; unsigned long tcp_ts_stamp; }; -diff -urNp linux-2.6.32.46/include/net/ip_vs.h linux-2.6.32.46/include/net/ip_vs.h ---- linux-2.6.32.46/include/net/ip_vs.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/ip_vs.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/ip_vs.h linux-2.6.32.48/include/net/ip_vs.h +--- linux-2.6.32.48/include/net/ip_vs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/ip_vs.h 2011-11-12 12:46:47.000000000 -0500 @@ -365,7 +365,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection */ atomic_t n_control; /* Number of controlled ones */ @@ -65235,9 +65199,9 @@ diff -urNp linux-2.6.32.46/include/net/ip_vs.h linux-2.6.32.46/include/net/ip_vs atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -diff -urNp linux-2.6.32.46/include/net/irda/ircomm_core.h linux-2.6.32.46/include/net/irda/ircomm_core.h ---- linux-2.6.32.46/include/net/irda/ircomm_core.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/irda/ircomm_core.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/irda/ircomm_core.h linux-2.6.32.48/include/net/irda/ircomm_core.h +--- linux-2.6.32.48/include/net/irda/ircomm_core.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/irda/ircomm_core.h 2011-11-12 12:46:47.000000000 -0500 @@ -51,7 +51,7 @@ typedef struct { int (*connect_response)(struct ircomm_cb *, struct sk_buff *); int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, @@ -65247,9 +65211,9 @@ diff -urNp linux-2.6.32.46/include/net/irda/ircomm_core.h linux-2.6.32.46/includ struct ircomm_cb { irda_queue_t queue; -diff -urNp linux-2.6.32.46/include/net/irda/ircomm_tty.h linux-2.6.32.46/include/net/irda/ircomm_tty.h ---- linux-2.6.32.46/include/net/irda/ircomm_tty.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/irda/ircomm_tty.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/irda/ircomm_tty.h linux-2.6.32.48/include/net/irda/ircomm_tty.h +--- linux-2.6.32.48/include/net/irda/ircomm_tty.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/irda/ircomm_tty.h 2011-11-12 12:46:47.000000000 -0500 @@ -35,6 +35,7 @@ #include <linux/termios.h> #include <linux/timer.h> @@ -65269,9 +65233,9 @@ diff -urNp linux-2.6.32.46/include/net/irda/ircomm_tty.h linux-2.6.32.46/include /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.46/include/net/iucv/af_iucv.h linux-2.6.32.46/include/net/iucv/af_iucv.h ---- linux-2.6.32.46/include/net/iucv/af_iucv.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/iucv/af_iucv.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/iucv/af_iucv.h linux-2.6.32.48/include/net/iucv/af_iucv.h +--- linux-2.6.32.48/include/net/iucv/af_iucv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/iucv/af_iucv.h 2011-11-12 12:46:47.000000000 -0500 @@ -87,7 +87,7 @@ struct iucv_sock { struct iucv_sock_list { struct hlist_head head; @@ -65281,9 +65245,9 @@ diff -urNp linux-2.6.32.46/include/net/iucv/af_iucv.h linux-2.6.32.46/include/ne }; unsigned int iucv_sock_poll(struct file *file, struct socket *sock, -diff -urNp linux-2.6.32.46/include/net/lapb.h linux-2.6.32.46/include/net/lapb.h ---- linux-2.6.32.46/include/net/lapb.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/lapb.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/lapb.h linux-2.6.32.48/include/net/lapb.h +--- linux-2.6.32.48/include/net/lapb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/lapb.h 2011-11-12 12:46:47.000000000 -0500 @@ -95,7 +95,7 @@ struct lapb_cb { struct sk_buff_head write_queue; struct sk_buff_head ack_queue; @@ -65293,9 +65257,9 @@ diff -urNp linux-2.6.32.46/include/net/lapb.h linux-2.6.32.46/include/net/lapb.h /* FRMR control information */ struct lapb_frame frmr_data; -diff -urNp linux-2.6.32.46/include/net/neighbour.h linux-2.6.32.46/include/net/neighbour.h ---- linux-2.6.32.46/include/net/neighbour.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/neighbour.h 2011-08-26 20:29:08.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/neighbour.h linux-2.6.32.48/include/net/neighbour.h +--- linux-2.6.32.48/include/net/neighbour.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/neighbour.h 2011-11-12 12:46:47.000000000 -0500 @@ -131,7 +131,7 @@ struct neigh_ops int (*connected_output)(struct sk_buff*); int (*hh_output)(struct sk_buff*); @@ -65305,9 +65269,9 @@ diff -urNp linux-2.6.32.46/include/net/neighbour.h linux-2.6.32.46/include/net/n struct pneigh_entry { -diff -urNp linux-2.6.32.46/include/net/netlink.h linux-2.6.32.46/include/net/netlink.h ---- linux-2.6.32.46/include/net/netlink.h 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/include/net/netlink.h 2011-08-21 18:08:11.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/netlink.h linux-2.6.32.48/include/net/netlink.h +--- linux-2.6.32.48/include/net/netlink.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/net/netlink.h 2011-11-12 12:46:47.000000000 -0500 @@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct { return (remaining >= (int) sizeof(struct nlmsghdr) && @@ -65326,9 +65290,9 @@ diff -urNp linux-2.6.32.46/include/net/netlink.h linux-2.6.32.46/include/net/net } /** -diff -urNp linux-2.6.32.46/include/net/netns/ipv4.h linux-2.6.32.46/include/net/netns/ipv4.h ---- linux-2.6.32.46/include/net/netns/ipv4.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/netns/ipv4.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/netns/ipv4.h linux-2.6.32.48/include/net/netns/ipv4.h +--- linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/net/netns/ipv4.h 2011-11-12 12:46:47.000000000 -0500 @@ -54,7 +54,7 @@ struct netns_ipv4 { int current_rt_cache_rebuild_count; @@ -65338,9 +65302,9 @@ diff -urNp linux-2.6.32.46/include/net/netns/ipv4.h linux-2.6.32.46/include/net/ #ifdef CONFIG_IP_MROUTE struct sock *mroute_sk; -diff -urNp linux-2.6.32.46/include/net/sctp/sctp.h linux-2.6.32.46/include/net/sctp/sctp.h ---- linux-2.6.32.46/include/net/sctp/sctp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/sctp/sctp.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/sctp/sctp.h linux-2.6.32.48/include/net/sctp/sctp.h +--- linux-2.6.32.48/include/net/sctp/sctp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/sctp/sctp.h 2011-11-12 12:46:47.000000000 -0500 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -65352,9 +65316,9 @@ diff -urNp linux-2.6.32.46/include/net/sctp/sctp.h linux-2.6.32.46/include/net/s #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.46/include/net/secure_seq.h linux-2.6.32.46/include/net/secure_seq.h ---- linux-2.6.32.46/include/net/secure_seq.h 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/include/net/secure_seq.h 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/secure_seq.h linux-2.6.32.48/include/net/secure_seq.h +--- linux-2.6.32.48/include/net/secure_seq.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/net/secure_seq.h 2011-11-12 12:46:47.000000000 -0500 @@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr); extern __u32 secure_ipv6_id(const __be32 daddr[4]); extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport); @@ -65374,9 +65338,9 @@ diff -urNp linux-2.6.32.46/include/net/secure_seq.h linux-2.6.32.46/include/net/ + __be16 sport, __be16 dport); #endif /* _NET_SECURE_SEQ */ -diff -urNp linux-2.6.32.46/include/net/sock.h linux-2.6.32.46/include/net/sock.h ---- linux-2.6.32.46/include/net/sock.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/sock.h 2011-08-21 17:24:37.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/sock.h linux-2.6.32.48/include/net/sock.h +--- linux-2.6.32.48/include/net/sock.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/sock.h 2011-11-12 12:46:47.000000000 -0500 @@ -272,7 +272,7 @@ struct sock { rwlock_t sk_callback_lock; int sk_err, @@ -65395,9 +65359,9 @@ diff -urNp linux-2.6.32.46/include/net/sock.h linux-2.6.32.46/include/net/sock.h int inc) { } -diff -urNp linux-2.6.32.46/include/net/tcp.h linux-2.6.32.46/include/net/tcp.h ---- linux-2.6.32.46/include/net/tcp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/tcp.h 2011-08-23 21:29:10.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/tcp.h linux-2.6.32.48/include/net/tcp.h +--- linux-2.6.32.48/include/net/tcp.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/net/tcp.h 2011-11-12 12:46:47.000000000 -0500 @@ -1444,8 +1444,8 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -65409,9 +65373,9 @@ diff -urNp linux-2.6.32.46/include/net/tcp.h linux-2.6.32.46/include/net/tcp.h }; struct tcp_iter_state { -diff -urNp linux-2.6.32.46/include/net/udp.h linux-2.6.32.46/include/net/udp.h ---- linux-2.6.32.46/include/net/udp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/net/udp.h 2011-08-23 21:29:34.000000000 -0400 +diff -urNp linux-2.6.32.48/include/net/udp.h linux-2.6.32.48/include/net/udp.h +--- linux-2.6.32.48/include/net/udp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/net/udp.h 2011-11-12 12:46:47.000000000 -0500 @@ -187,8 +187,8 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -65423,9 +65387,9 @@ diff -urNp linux-2.6.32.46/include/net/udp.h linux-2.6.32.46/include/net/udp.h }; struct udp_iter_state { -diff -urNp linux-2.6.32.46/include/rdma/iw_cm.h linux-2.6.32.46/include/rdma/iw_cm.h ---- linux-2.6.32.46/include/rdma/iw_cm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/rdma/iw_cm.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/rdma/iw_cm.h linux-2.6.32.48/include/rdma/iw_cm.h +--- linux-2.6.32.48/include/rdma/iw_cm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/rdma/iw_cm.h 2011-11-12 12:46:47.000000000 -0500 @@ -129,7 +129,7 @@ struct iw_cm_verbs { int backlog); @@ -65435,9 +65399,9 @@ diff -urNp linux-2.6.32.46/include/rdma/iw_cm.h linux-2.6.32.46/include/rdma/iw_ /** * iw_create_cm_id - Create an IW CM identifier. -diff -urNp linux-2.6.32.46/include/scsi/libfc.h linux-2.6.32.46/include/scsi/libfc.h ---- linux-2.6.32.46/include/scsi/libfc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/scsi/libfc.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/scsi/libfc.h linux-2.6.32.48/include/scsi/libfc.h +--- linux-2.6.32.48/include/scsi/libfc.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/scsi/libfc.h 2011-11-12 12:46:47.000000000 -0500 @@ -675,6 +675,7 @@ struct libfc_function_template { */ void (*disc_stop_final) (struct fc_lport *); @@ -65455,9 +65419,9 @@ diff -urNp linux-2.6.32.46/include/scsi/libfc.h linux-2.6.32.46/include/scsi/lib u8 link_up; u8 qfull; enum fc_lport_state state; -diff -urNp linux-2.6.32.46/include/scsi/scsi_device.h linux-2.6.32.46/include/scsi/scsi_device.h ---- linux-2.6.32.46/include/scsi/scsi_device.h 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/include/scsi/scsi_device.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/scsi/scsi_device.h linux-2.6.32.48/include/scsi/scsi_device.h +--- linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/include/scsi/scsi_device.h 2011-11-12 12:46:47.000000000 -0500 @@ -156,9 +156,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -65471,9 +65435,9 @@ diff -urNp linux-2.6.32.46/include/scsi/scsi_device.h linux-2.6.32.46/include/sc struct device sdev_gendev, sdev_dev; -diff -urNp linux-2.6.32.46/include/scsi/scsi_transport_fc.h linux-2.6.32.46/include/scsi/scsi_transport_fc.h ---- linux-2.6.32.46/include/scsi/scsi_transport_fc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/scsi/scsi_transport_fc.h 2011-08-26 20:19:09.000000000 -0400 +diff -urNp linux-2.6.32.48/include/scsi/scsi_transport_fc.h linux-2.6.32.48/include/scsi/scsi_transport_fc.h +--- linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/scsi/scsi_transport_fc.h 2011-11-12 12:46:47.000000000 -0500 @@ -708,7 +708,7 @@ struct fc_function_template { unsigned long show_host_system_hostname:1; @@ -65483,9 +65447,9 @@ diff -urNp linux-2.6.32.46/include/scsi/scsi_transport_fc.h linux-2.6.32.46/incl /** -diff -urNp linux-2.6.32.46/include/sound/ac97_codec.h linux-2.6.32.46/include/sound/ac97_codec.h ---- linux-2.6.32.46/include/sound/ac97_codec.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/ac97_codec.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/ac97_codec.h linux-2.6.32.48/include/sound/ac97_codec.h +--- linux-2.6.32.48/include/sound/ac97_codec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/ac97_codec.h 2011-11-12 12:46:47.000000000 -0500 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -65518,9 +65482,9 @@ diff -urNp linux-2.6.32.46/include/sound/ac97_codec.h linux-2.6.32.46/include/so void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.46/include/sound/ak4xxx-adda.h linux-2.6.32.46/include/sound/ak4xxx-adda.h ---- linux-2.6.32.46/include/sound/ak4xxx-adda.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/ak4xxx-adda.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/ak4xxx-adda.h linux-2.6.32.48/include/sound/ak4xxx-adda.h +--- linux-2.6.32.48/include/sound/ak4xxx-adda.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/ak4xxx-adda.h 2011-11-12 12:46:47.000000000 -0500 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops { void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg, unsigned char val); @@ -65530,9 +65494,9 @@ diff -urNp linux-2.6.32.46/include/sound/ak4xxx-adda.h linux-2.6.32.46/include/s #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */ -diff -urNp linux-2.6.32.46/include/sound/hwdep.h linux-2.6.32.46/include/sound/hwdep.h ---- linux-2.6.32.46/include/sound/hwdep.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/hwdep.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/hwdep.h linux-2.6.32.48/include/sound/hwdep.h +--- linux-2.6.32.48/include/sound/hwdep.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/hwdep.h 2011-11-12 12:46:47.000000000 -0500 @@ -49,7 +49,7 @@ struct snd_hwdep_ops { struct snd_hwdep_dsp_status *status); int (*dsp_load)(struct snd_hwdep *hw, @@ -65542,9 +65506,9 @@ diff -urNp linux-2.6.32.46/include/sound/hwdep.h linux-2.6.32.46/include/sound/h struct snd_hwdep { struct snd_card *card; -diff -urNp linux-2.6.32.46/include/sound/info.h linux-2.6.32.46/include/sound/info.h ---- linux-2.6.32.46/include/sound/info.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/info.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/info.h linux-2.6.32.48/include/sound/info.h +--- linux-2.6.32.48/include/sound/info.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/info.h 2011-11-12 12:46:47.000000000 -0500 @@ -44,7 +44,7 @@ struct snd_info_entry_text { struct snd_info_buffer *buffer); void (*write)(struct snd_info_entry *entry, @@ -65554,9 +65518,9 @@ diff -urNp linux-2.6.32.46/include/sound/info.h linux-2.6.32.46/include/sound/in struct snd_info_entry_ops { int (*open)(struct snd_info_entry *entry, -diff -urNp linux-2.6.32.46/include/sound/pcm.h linux-2.6.32.46/include/sound/pcm.h ---- linux-2.6.32.46/include/sound/pcm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/pcm.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/pcm.h linux-2.6.32.48/include/sound/pcm.h +--- linux-2.6.32.48/include/sound/pcm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/pcm.h 2011-11-12 12:46:47.000000000 -0500 @@ -80,6 +80,7 @@ struct snd_pcm_ops { int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma); int (*ack)(struct snd_pcm_substream *substream); @@ -65565,9 +65529,9 @@ diff -urNp linux-2.6.32.46/include/sound/pcm.h linux-2.6.32.46/include/sound/pcm /* * -diff -urNp linux-2.6.32.46/include/sound/sb16_csp.h linux-2.6.32.46/include/sound/sb16_csp.h ---- linux-2.6.32.46/include/sound/sb16_csp.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/sb16_csp.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/sb16_csp.h linux-2.6.32.48/include/sound/sb16_csp.h +--- linux-2.6.32.48/include/sound/sb16_csp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/sb16_csp.h 2011-11-12 12:46:47.000000000 -0500 @@ -139,7 +139,7 @@ struct snd_sb_csp_ops { int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels); int (*csp_stop) (struct snd_sb_csp * p); @@ -65577,9 +65541,9 @@ diff -urNp linux-2.6.32.46/include/sound/sb16_csp.h linux-2.6.32.46/include/soun /* * CSP private data -diff -urNp linux-2.6.32.46/include/sound/ymfpci.h linux-2.6.32.46/include/sound/ymfpci.h ---- linux-2.6.32.46/include/sound/ymfpci.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/sound/ymfpci.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/include/sound/ymfpci.h linux-2.6.32.48/include/sound/ymfpci.h +--- linux-2.6.32.48/include/sound/ymfpci.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/sound/ymfpci.h 2011-11-12 12:46:47.000000000 -0500 @@ -358,7 +358,7 @@ struct snd_ymfpci { spinlock_t reg_lock; spinlock_t voice_lock; @@ -65589,9 +65553,9 @@ diff -urNp linux-2.6.32.46/include/sound/ymfpci.h linux-2.6.32.46/include/sound/ struct snd_info_entry *proc_entry; const struct firmware *dsp_microcode; const struct firmware *controller_microcode; -diff -urNp linux-2.6.32.46/include/trace/events/irq.h linux-2.6.32.46/include/trace/events/irq.h ---- linux-2.6.32.46/include/trace/events/irq.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/trace/events/irq.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/trace/events/irq.h linux-2.6.32.48/include/trace/events/irq.h +--- linux-2.6.32.48/include/trace/events/irq.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/trace/events/irq.h 2011-11-12 12:46:47.000000000 -0500 @@ -34,7 +34,7 @@ */ TRACE_EVENT(irq_handler_entry, @@ -65628,9 +65592,9 @@ diff -urNp linux-2.6.32.46/include/trace/events/irq.h linux-2.6.32.46/include/tr TP_ARGS(h, vec), -diff -urNp linux-2.6.32.46/include/video/uvesafb.h linux-2.6.32.46/include/video/uvesafb.h ---- linux-2.6.32.46/include/video/uvesafb.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/include/video/uvesafb.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/include/video/uvesafb.h linux-2.6.32.48/include/video/uvesafb.h +--- linux-2.6.32.48/include/video/uvesafb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/include/video/uvesafb.h 2011-11-12 12:46:47.000000000 -0500 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -65639,9 +65603,9 @@ diff -urNp linux-2.6.32.46/include/video/uvesafb.h linux-2.6.32.46/include/video void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.46/init/do_mounts.c linux-2.6.32.46/init/do_mounts.c ---- linux-2.6.32.46/init/do_mounts.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/do_mounts.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/init/do_mounts.c linux-2.6.32.48/init/do_mounts.c +--- linux-2.6.32.48/init/do_mounts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/init/do_mounts.c 2011-11-12 12:46:47.000000000 -0500 @@ -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) @@ -65687,9 +65651,9 @@ diff -urNp linux-2.6.32.46/init/do_mounts.c linux-2.6.32.46/init/do_mounts.c + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } -diff -urNp linux-2.6.32.46/init/do_mounts.h linux-2.6.32.46/init/do_mounts.h ---- linux-2.6.32.46/init/do_mounts.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/do_mounts.h 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/init/do_mounts.h linux-2.6.32.48/init/do_mounts.h +--- linux-2.6.32.48/init/do_mounts.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/init/do_mounts.h 2011-11-12 12:46:47.000000000 -0500 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -65718,9 +65682,9 @@ diff -urNp linux-2.6.32.46/init/do_mounts.h linux-2.6.32.46/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.46/init/do_mounts_initrd.c linux-2.6.32.46/init/do_mounts_initrd.c ---- linux-2.6.32.46/init/do_mounts_initrd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/do_mounts_initrd.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/init/do_mounts_initrd.c linux-2.6.32.48/init/do_mounts_initrd.c +--- linux-2.6.32.48/init/do_mounts_initrd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/init/do_mounts_initrd.c 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -65804,9 +65768,9 @@ diff -urNp linux-2.6.32.46/init/do_mounts_initrd.c linux-2.6.32.46/init/do_mount + sys_unlink((const char __force_user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.46/init/do_mounts_md.c linux-2.6.32.46/init/do_mounts_md.c ---- linux-2.6.32.46/init/do_mounts_md.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/do_mounts_md.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/init/do_mounts_md.c linux-2.6.32.48/init/do_mounts_md.c +--- linux-2.6.32.48/init/do_mounts_md.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/init/do_mounts_md.c 2011-11-12 12:46:47.000000000 -0500 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -65834,9 +65798,9 @@ diff -urNp linux-2.6.32.46/init/do_mounts_md.c linux-2.6.32.46/init/do_mounts_md if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.46/init/initramfs.c linux-2.6.32.46/init/initramfs.c ---- linux-2.6.32.46/init/initramfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/initramfs.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/init/initramfs.c linux-2.6.32.48/init/initramfs.c +--- linux-2.6.32.48/init/initramfs.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/init/initramfs.c 2011-11-12 12:46:47.000000000 -0500 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -65945,9 +65909,9 @@ diff -urNp linux-2.6.32.46/init/initramfs.c linux-2.6.32.46/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig ---- linux-2.6.32.46/init/Kconfig 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/init/Kconfig 2011-05-10 22:12:34.000000000 -0400 +diff -urNp linux-2.6.32.48/init/Kconfig linux-2.6.32.48/init/Kconfig +--- linux-2.6.32.48/init/Kconfig 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/init/Kconfig 2011-11-12 12:46:47.000000000 -0500 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -65957,9 +65921,9 @@ diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-2.6.32.46/init/main.c linux-2.6.32.46/init/main.c ---- linux-2.6.32.46/init/main.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/init/main.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/init/main.c linux-2.6.32.48/init/main.c +--- linux-2.6.32.48/init/main.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/init/main.c 2011-11-12 12:46:47.000000000 -0500 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -66103,9 +66067,9 @@ diff -urNp linux-2.6.32.46/init/main.c linux-2.6.32.46/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.32.46/init/noinitramfs.c linux-2.6.32.46/init/noinitramfs.c ---- linux-2.6.32.46/init/noinitramfs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/init/noinitramfs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/init/noinitramfs.c linux-2.6.32.48/init/noinitramfs.c +--- linux-2.6.32.48/init/noinitramfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/init/noinitramfs.c 2011-11-12 12:46:47.000000000 -0500 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -66124,9 +66088,9 @@ diff -urNp linux-2.6.32.46/init/noinitramfs.c linux-2.6.32.46/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.46/ipc/mqueue.c linux-2.6.32.46/ipc/mqueue.c ---- linux-2.6.32.46/ipc/mqueue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/ipc/mqueue.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/ipc/mqueue.c linux-2.6.32.48/ipc/mqueue.c +--- linux-2.6.32.48/ipc/mqueue.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/ipc/mqueue.c 2011-11-12 12:46:47.000000000 -0500 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -66135,9 +66099,9 @@ diff -urNp linux-2.6.32.46/ipc/mqueue.c linux-2.6.32.46/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -diff -urNp linux-2.6.32.46/ipc/msg.c linux-2.6.32.46/ipc/msg.c ---- linux-2.6.32.46/ipc/msg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/ipc/msg.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/ipc/msg.c linux-2.6.32.48/ipc/msg.c +--- linux-2.6.32.48/ipc/msg.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/ipc/msg.c 2011-11-12 12:46:47.000000000 -0500 @@ -310,18 +310,19 @@ static inline int msg_security(struct ke return security_msg_queue_associate(msq, msgflg); } @@ -66163,9 +66127,9 @@ diff -urNp linux-2.6.32.46/ipc/msg.c linux-2.6.32.46/ipc/msg.c msg_params.key = key; msg_params.flg = msgflg; -diff -urNp linux-2.6.32.46/ipc/sem.c linux-2.6.32.46/ipc/sem.c ---- linux-2.6.32.46/ipc/sem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/ipc/sem.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/ipc/sem.c linux-2.6.32.48/ipc/sem.c +--- linux-2.6.32.48/ipc/sem.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/ipc/sem.c 2011-11-12 12:46:47.000000000 -0500 @@ -309,10 +309,15 @@ static inline int sem_more_checks(struct return 0; } @@ -66212,9 +66176,9 @@ diff -urNp linux-2.6.32.46/ipc/sem.c linux-2.6.32.46/ipc/sem.c ns = current->nsproxy->ipc_ns; if (nsops < 1 || semid < 0) -diff -urNp linux-2.6.32.46/ipc/shm.c linux-2.6.32.46/ipc/shm.c ---- linux-2.6.32.46/ipc/shm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/ipc/shm.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/ipc/shm.c linux-2.6.32.48/ipc/shm.c +--- linux-2.6.32.48/ipc/shm.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/ipc/shm.c 2011-11-12 12:46:47.000000000 -0500 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -66292,9 +66256,9 @@ diff -urNp linux-2.6.32.46/ipc/shm.c linux-2.6.32.46/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.46/kernel/acct.c linux-2.6.32.46/kernel/acct.c ---- linux-2.6.32.46/kernel/acct.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/acct.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/acct.c linux-2.6.32.48/kernel/acct.c +--- linux-2.6.32.48/kernel/acct.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/acct.c 2011-11-12 12:46:47.000000000 -0500 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -66304,9 +66268,9 @@ diff -urNp linux-2.6.32.46/kernel/acct.c linux-2.6.32.46/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.32.46/kernel/audit.c linux-2.6.32.46/kernel/audit.c ---- linux-2.6.32.46/kernel/audit.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/audit.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/audit.c linux-2.6.32.48/kernel/audit.c +--- linux-2.6.32.48/kernel/audit.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/audit.c 2011-11-12 12:46:47.000000000 -0500 @@ -110,7 +110,7 @@ u32 audit_sig_sid = 0; 3) suppressed due to audit_rate_limit 4) suppressed due to audit_backlog_limit @@ -66356,9 +66320,9 @@ diff -urNp linux-2.6.32.46/kernel/audit.c linux-2.6.32.46/kernel/audit.c break; } case AUDIT_TTY_SET: { -diff -urNp linux-2.6.32.46/kernel/auditsc.c linux-2.6.32.46/kernel/auditsc.c ---- linux-2.6.32.46/kernel/auditsc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/auditsc.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/auditsc.c linux-2.6.32.48/kernel/auditsc.c +--- linux-2.6.32.48/kernel/auditsc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/auditsc.c 2011-11-12 12:46:47.000000000 -0500 @@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_conte } @@ -66377,9 +66341,9 @@ diff -urNp linux-2.6.32.46/kernel/auditsc.c linux-2.6.32.46/kernel/auditsc.c struct audit_context *context = task->audit_context; if (context && context->in_syscall) { -diff -urNp linux-2.6.32.46/kernel/capability.c linux-2.6.32.46/kernel/capability.c ---- linux-2.6.32.46/kernel/capability.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/capability.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/capability.c linux-2.6.32.48/kernel/capability.c +--- linux-2.6.32.48/kernel/capability.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/capability.c 2011-11-12 12:46:47.000000000 -0500 @@ -305,10 +305,26 @@ int capable(int cap) BUG(); } @@ -66408,9 +66372,9 @@ diff -urNp linux-2.6.32.46/kernel/capability.c linux-2.6.32.46/kernel/capability + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.46/kernel/cgroup.c linux-2.6.32.46/kernel/cgroup.c ---- linux-2.6.32.46/kernel/cgroup.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/cgroup.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/cgroup.c linux-2.6.32.48/kernel/cgroup.c +--- linux-2.6.32.48/kernel/cgroup.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/cgroup.c 2011-11-12 12:46:47.000000000 -0500 @@ -536,6 +536,8 @@ static struct css_set *find_css_set( struct hlist_head *hhead; struct cg_cgroup_link *link; @@ -66420,9 +66384,9 @@ diff -urNp linux-2.6.32.46/kernel/cgroup.c linux-2.6.32.46/kernel/cgroup.c /* First see if we already have a cgroup group that matches * the desired set */ read_lock(&css_set_lock); -diff -urNp linux-2.6.32.46/kernel/compat.c linux-2.6.32.46/kernel/compat.c ---- linux-2.6.32.46/kernel/compat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/compat.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/compat.c linux-2.6.32.48/kernel/compat.c +--- linux-2.6.32.48/kernel/compat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/compat.c 2011-11-12 12:46:47.000000000 -0500 @@ -108,7 +108,7 @@ static long compat_nanosleep_restart(str mm_segment_t oldfs; long ret; @@ -66571,9 +66535,9 @@ diff -urNp linux-2.6.32.46/kernel/compat.c linux-2.6.32.46/kernel/compat.c set_fs(oldfs); if ((err == -ERESTART_RESTARTBLOCK) && rmtp && -diff -urNp linux-2.6.32.46/kernel/configs.c linux-2.6.32.46/kernel/configs.c ---- linux-2.6.32.46/kernel/configs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/configs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/configs.c linux-2.6.32.48/kernel/configs.c +--- linux-2.6.32.48/kernel/configs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/configs.c 2011-11-12 12:46:47.000000000 -0500 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -66594,9 +66558,9 @@ diff -urNp linux-2.6.32.46/kernel/configs.c linux-2.6.32.46/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.46/kernel/cpu.c linux-2.6.32.46/kernel/cpu.c ---- linux-2.6.32.46/kernel/cpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/cpu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/cpu.c linux-2.6.32.48/kernel/cpu.c +--- linux-2.6.32.48/kernel/cpu.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/cpu.c 2011-11-12 12:46:47.000000000 -0500 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -66606,9 +66570,9 @@ diff -urNp linux-2.6.32.46/kernel/cpu.c linux-2.6.32.46/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.32.46/kernel/cred.c linux-2.6.32.46/kernel/cred.c ---- linux-2.6.32.46/kernel/cred.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/cred.c 2011-08-11 19:49:38.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/cred.c linux-2.6.32.48/kernel/cred.c +--- linux-2.6.32.48/kernel/cred.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/cred.c 2011-11-12 12:46:47.000000000 -0500 @@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head */ void __put_cred(struct cred *cred) @@ -66757,9 +66721,9 @@ diff -urNp linux-2.6.32.46/kernel/cred.c linux-2.6.32.46/kernel/cred.c ret = security_secctx_to_secid(secctx, strlen(secctx), &secid); if (ret < 0) return ret; -diff -urNp linux-2.6.32.46/kernel/exit.c linux-2.6.32.46/kernel/exit.c ---- linux-2.6.32.46/kernel/exit.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/exit.c 2011-08-17 19:19:50.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/exit.c linux-2.6.32.48/kernel/exit.c +--- linux-2.6.32.48/kernel/exit.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/exit.c 2011-11-12 12:46:47.000000000 -0500 @@ -55,6 +55,10 @@ #include <asm/pgtable.h> #include <asm/mmu_context.h> @@ -66890,9 +66854,9 @@ diff -urNp linux-2.6.32.46/kernel/exit.c linux-2.6.32.46/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.46/kernel/fork.c linux-2.6.32.46/kernel/fork.c ---- linux-2.6.32.46/kernel/fork.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/fork.c 2011-08-11 19:50:07.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/fork.c linux-2.6.32.48/kernel/fork.c +--- linux-2.6.32.48/kernel/fork.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/fork.c 2011-11-12 12:46:47.000000000 -0500 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -67034,9 +66998,9 @@ diff -urNp linux-2.6.32.46/kernel/fork.c linux-2.6.32.46/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.32.46/kernel/futex.c linux-2.6.32.46/kernel/futex.c ---- linux-2.6.32.46/kernel/futex.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/kernel/futex.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/futex.c linux-2.6.32.48/kernel/futex.c +--- linux-2.6.32.48/kernel/futex.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/futex.c 2011-11-12 12:46:47.000000000 -0500 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -67139,9 +67103,9 @@ diff -urNp linux-2.6.32.46/kernel/futex.c linux-2.6.32.46/kernel/futex.c if (curval == -EFAULT) futex_cmpxchg_enabled = 1; -diff -urNp linux-2.6.32.46/kernel/futex_compat.c linux-2.6.32.46/kernel/futex_compat.c ---- linux-2.6.32.46/kernel/futex_compat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/futex_compat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/futex_compat.c linux-2.6.32.48/kernel/futex_compat.c +--- linux-2.6.32.48/kernel/futex_compat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/futex_compat.c 2011-11-12 12:46:47.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -67179,9 +67143,9 @@ diff -urNp linux-2.6.32.46/kernel/futex_compat.c linux-2.6.32.46/kernel/futex_co head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.46/kernel/gcov/base.c linux-2.6.32.46/kernel/gcov/base.c ---- linux-2.6.32.46/kernel/gcov/base.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/gcov/base.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/gcov/base.c linux-2.6.32.48/kernel/gcov/base.c +--- linux-2.6.32.48/kernel/gcov/base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/gcov/base.c 2011-11-12 12:46:47.000000000 -0500 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -67203,9 +67167,9 @@ diff -urNp linux-2.6.32.46/kernel/gcov/base.c linux-2.6.32.46/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.46/kernel/hrtimer.c linux-2.6.32.46/kernel/hrtimer.c ---- linux-2.6.32.46/kernel/hrtimer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/hrtimer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/hrtimer.c linux-2.6.32.48/kernel/hrtimer.c +--- linux-2.6.32.48/kernel/hrtimer.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/hrtimer.c 2011-11-12 12:46:47.000000000 -0500 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -67215,9 +67179,9 @@ diff -urNp linux-2.6.32.46/kernel/hrtimer.c linux-2.6.32.46/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-2.6.32.46/kernel/kallsyms.c linux-2.6.32.46/kernel/kallsyms.c ---- linux-2.6.32.46/kernel/kallsyms.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/kallsyms.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/kallsyms.c linux-2.6.32.48/kernel/kallsyms.c +--- linux-2.6.32.48/kernel/kallsyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/kallsyms.c 2011-11-12 12:46:47.000000000 -0500 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -67320,9 +67284,9 @@ diff -urNp linux-2.6.32.46/kernel/kallsyms.c linux-2.6.32.46/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.46/kernel/kexec.c linux-2.6.32.46/kernel/kexec.c ---- linux-2.6.32.46/kernel/kexec.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/kexec.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/kexec.c linux-2.6.32.48/kernel/kexec.c +--- linux-2.6.32.48/kernel/kexec.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/kexec.c 2011-11-12 12:46:47.000000000 -0500 @@ -1028,7 +1028,8 @@ asmlinkage long compat_sys_kexec_load(un unsigned long flags) { @@ -67333,9 +67297,9 @@ diff -urNp linux-2.6.32.46/kernel/kexec.c linux-2.6.32.46/kernel/kexec.c unsigned long i, result; /* Don't allow clients that don't understand the native -diff -urNp linux-2.6.32.46/kernel/kgdb.c linux-2.6.32.46/kernel/kgdb.c ---- linux-2.6.32.46/kernel/kgdb.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/kernel/kgdb.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/kgdb.c linux-2.6.32.48/kernel/kgdb.c +--- linux-2.6.32.48/kernel/kgdb.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/kgdb.c 2011-11-12 12:46:47.000000000 -0500 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -67415,9 +67379,9 @@ diff -urNp linux-2.6.32.46/kernel/kgdb.c linux-2.6.32.46/kernel/kgdb.c } EXPORT_SYMBOL_GPL(kgdb_breakpoint); -diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c ---- linux-2.6.32.46/kernel/kmod.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/kmod.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/kmod.c linux-2.6.32.48/kernel/kmod.c +--- linux-2.6.32.48/kernel/kmod.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/kmod.c 2011-11-12 12:46:47.000000000 -0500 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -67462,7 +67426,7 @@ diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -@@ -121,6 +132,48 @@ int __request_module(bool wait, const ch +@@ -123,6 +134,48 @@ int __request_module(bool wait, const ch atomic_dec(&kmod_concurrent); return ret; } @@ -67511,7 +67475,7 @@ diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ -@@ -226,7 +279,7 @@ static int wait_for_helper(void *data) +@@ -228,7 +281,7 @@ static int wait_for_helper(void *data) * * Thus the __user pointer cast is valid here. */ @@ -67520,9 +67484,9 @@ diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c /* * If ret is 0, either ____call_usermodehelper failed and the -diff -urNp linux-2.6.32.46/kernel/kprobes.c linux-2.6.32.46/kernel/kprobes.c ---- linux-2.6.32.46/kernel/kprobes.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/kprobes.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/kprobes.c linux-2.6.32.48/kernel/kprobes.c +--- linux-2.6.32.48/kernel/kprobes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/kprobes.c 2011-11-12 12:46:47.000000000 -0500 @@ -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. @@ -67559,9 +67523,9 @@ diff -urNp linux-2.6.32.46/kernel/kprobes.c linux-2.6.32.46/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-2.6.32.46/kernel/lockdep.c linux-2.6.32.46/kernel/lockdep.c ---- linux-2.6.32.46/kernel/lockdep.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/kernel/lockdep.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/lockdep.c linux-2.6.32.48/kernel/lockdep.c +--- linux-2.6.32.48/kernel/lockdep.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/lockdep.c 2011-11-12 12:46:47.000000000 -0500 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t /* * Various lockdep statistics: @@ -67635,9 +67599,9 @@ diff -urNp linux-2.6.32.46/kernel/lockdep.c linux-2.6.32.46/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-2.6.32.46/kernel/lockdep_internals.h linux-2.6.32.46/kernel/lockdep_internals.h ---- linux-2.6.32.46/kernel/lockdep_internals.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/lockdep_internals.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/lockdep_internals.h linux-2.6.32.48/kernel/lockdep_internals.h +--- linux-2.6.32.48/kernel/lockdep_internals.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/lockdep_internals.h 2011-11-12 12:46:47.000000000 -0500 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_ /* * Various lockdep statistics: @@ -67685,9 +67649,9 @@ diff -urNp linux-2.6.32.46/kernel/lockdep_internals.h linux-2.6.32.46/kernel/loc #else # define debug_atomic_inc(ptr) do { } while (0) # define debug_atomic_dec(ptr) do { } while (0) -diff -urNp linux-2.6.32.46/kernel/lockdep_proc.c linux-2.6.32.46/kernel/lockdep_proc.c ---- linux-2.6.32.46/kernel/lockdep_proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/lockdep_proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/lockdep_proc.c linux-2.6.32.48/kernel/lockdep_proc.c +--- linux-2.6.32.48/kernel/lockdep_proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/lockdep_proc.c 2011-11-12 12:46:47.000000000 -0500 @@ -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) @@ -67697,9 +67661,9 @@ diff -urNp linux-2.6.32.46/kernel/lockdep_proc.c linux-2.6.32.46/kernel/lockdep_ const char *name = class->name; if (!name) { -diff -urNp linux-2.6.32.46/kernel/module.c linux-2.6.32.46/kernel/module.c ---- linux-2.6.32.46/kernel/module.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/module.c 2011-04-29 18:52:40.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/module.c linux-2.6.32.48/kernel/module.c +--- linux-2.6.32.48/kernel/module.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/module.c 2011-11-12 12:46:47.000000000 -0500 @@ -55,6 +55,7 @@ #include <linux/async.h> #include <linux/percpu.h> @@ -68340,9 +68304,9 @@ diff -urNp linux-2.6.32.46/kernel/module.c linux-2.6.32.46/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c ---- linux-2.6.32.46/kernel/mutex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/mutex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/mutex.c linux-2.6.32.48/kernel/mutex.c +--- linux-2.6.32.48/kernel/mutex.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/mutex.c 2011-11-12 12:46:47.000000000 -0500 @@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, */ @@ -68380,9 +68344,9 @@ diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c mutex_set_owner(lock); /* set it to 0 if there are no waiters left: */ -diff -urNp linux-2.6.32.46/kernel/mutex-debug.c linux-2.6.32.46/kernel/mutex-debug.c ---- linux-2.6.32.46/kernel/mutex-debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/mutex-debug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/mutex-debug.c linux-2.6.32.48/kernel/mutex-debug.c +--- linux-2.6.32.48/kernel/mutex-debug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/mutex-debug.c 2011-11-12 12:46:47.000000000 -0500 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } @@ -68420,9 +68384,9 @@ diff -urNp linux-2.6.32.46/kernel/mutex-debug.c linux-2.6.32.46/kernel/mutex-deb DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } -diff -urNp linux-2.6.32.46/kernel/mutex-debug.h linux-2.6.32.46/kernel/mutex-debug.h ---- linux-2.6.32.46/kernel/mutex-debug.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/mutex-debug.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/mutex-debug.h linux-2.6.32.48/kernel/mutex-debug.h +--- linux-2.6.32.48/kernel/mutex-debug.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/mutex-debug.h 2011-11-12 12:46:47.000000000 -0500 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -68443,9 +68407,9 @@ diff -urNp linux-2.6.32.46/kernel/mutex-debug.h linux-2.6.32.46/kernel/mutex-deb } static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.32.46/kernel/mutex.h linux-2.6.32.46/kernel/mutex.h ---- linux-2.6.32.46/kernel/mutex.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/mutex.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/mutex.h linux-2.6.32.48/kernel/mutex.h +--- linux-2.6.32.48/kernel/mutex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/mutex.h 2011-11-12 12:46:47.000000000 -0500 @@ -19,7 +19,7 @@ #ifdef CONFIG_SMP static inline void mutex_set_owner(struct mutex *lock) @@ -68455,9 +68419,9 @@ diff -urNp linux-2.6.32.46/kernel/mutex.h linux-2.6.32.46/kernel/mutex.h } static inline void mutex_clear_owner(struct mutex *lock) -diff -urNp linux-2.6.32.46/kernel/panic.c linux-2.6.32.46/kernel/panic.c ---- linux-2.6.32.46/kernel/panic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/panic.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/panic.c linux-2.6.32.48/kernel/panic.c +--- linux-2.6.32.48/kernel/panic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/panic.c 2011-11-12 12:46:47.000000000 -0500 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c const char *board; @@ -68477,9 +68441,9 @@ diff -urNp linux-2.6.32.46/kernel/panic.c linux-2.6.32.46/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.46/kernel/params.c linux-2.6.32.46/kernel/params.c ---- linux-2.6.32.46/kernel/params.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/params.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/params.c linux-2.6.32.48/kernel/params.c +--- linux-2.6.32.48/kernel/params.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/params.c 2011-11-12 12:46:47.000000000 -0500 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -68498,9 +68462,9 @@ diff -urNp linux-2.6.32.46/kernel/params.c linux-2.6.32.46/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.46/kernel/perf_event.c linux-2.6.32.46/kernel/perf_event.c ---- linux-2.6.32.46/kernel/perf_event.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/kernel/perf_event.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/perf_event.c linux-2.6.32.48/kernel/perf_event.c +--- linux-2.6.32.48/kernel/perf_event.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/perf_event.c 2011-11-12 12:46:47.000000000 -0500 @@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostl */ int sysctl_perf_event_sample_rate __read_mostly = 100000; @@ -68721,9 +68685,9 @@ diff -urNp linux-2.6.32.46/kernel/perf_event.c linux-2.6.32.46/kernel/perf_event &parent_event->child_total_time_running); /* -diff -urNp linux-2.6.32.46/kernel/pid.c linux-2.6.32.46/kernel/pid.c ---- linux-2.6.32.46/kernel/pid.c 2011-04-22 19:16:29.000000000 -0400 -+++ linux-2.6.32.46/kernel/pid.c 2011-08-21 19:11:29.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/pid.c linux-2.6.32.48/kernel/pid.c +--- linux-2.6.32.48/kernel/pid.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/pid.c 2011-11-12 12:46:47.000000000 -0500 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -68769,9 +68733,9 @@ diff -urNp linux-2.6.32.46/kernel/pid.c linux-2.6.32.46/kernel/pid.c struct pid *get_task_pid(struct task_struct *task, enum pid_type type) { struct pid *pid; -diff -urNp linux-2.6.32.46/kernel/posix-cpu-timers.c linux-2.6.32.46/kernel/posix-cpu-timers.c ---- linux-2.6.32.46/kernel/posix-cpu-timers.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/posix-cpu-timers.c 2011-08-06 09:33:44.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/posix-cpu-timers.c linux-2.6.32.48/kernel/posix-cpu-timers.c +--- linux-2.6.32.48/kernel/posix-cpu-timers.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/posix-cpu-timers.c 2011-11-12 12:46:47.000000000 -0500 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -68798,9 +68762,9 @@ diff -urNp linux-2.6.32.46/kernel/posix-cpu-timers.c linux-2.6.32.46/kernel/posi .clock_getres = thread_cpu_clock_getres, .clock_get = thread_cpu_clock_get, .clock_set = do_posix_clock_nosettime, -diff -urNp linux-2.6.32.46/kernel/posix-timers.c linux-2.6.32.46/kernel/posix-timers.c ---- linux-2.6.32.46/kernel/posix-timers.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/posix-timers.c 2011-08-23 20:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/posix-timers.c linux-2.6.32.48/kernel/posix-timers.c +--- linux-2.6.32.48/kernel/posix-timers.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/posix-timers.c 2011-11-12 12:46:47.000000000 -0500 @@ -42,6 +42,7 @@ #include <linux/compiler.h> #include <linux/idr.h> @@ -68919,9 +68883,9 @@ diff -urNp linux-2.6.32.46/kernel/posix-timers.c linux-2.6.32.46/kernel/posix-ti return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp)); } -diff -urNp linux-2.6.32.46/kernel/power/hibernate.c linux-2.6.32.46/kernel/power/hibernate.c ---- linux-2.6.32.46/kernel/power/hibernate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/power/hibernate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/power/hibernate.c linux-2.6.32.48/kernel/power/hibernate.c +--- linux-2.6.32.48/kernel/power/hibernate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/power/hibernate.c 2011-11-12 12:46:47.000000000 -0500 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -68939,9 +68903,9 @@ diff -urNp linux-2.6.32.46/kernel/power/hibernate.c linux-2.6.32.46/kernel/power { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.46/kernel/power/poweroff.c linux-2.6.32.46/kernel/power/poweroff.c ---- linux-2.6.32.46/kernel/power/poweroff.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/power/poweroff.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/power/poweroff.c linux-2.6.32.48/kernel/power/poweroff.c +--- linux-2.6.32.48/kernel/power/poweroff.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/power/poweroff.c 2011-11-12 12:46:47.000000000 -0500 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -68951,9 +68915,9 @@ diff -urNp linux-2.6.32.46/kernel/power/poweroff.c linux-2.6.32.46/kernel/power/ { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.46/kernel/power/process.c linux-2.6.32.46/kernel/power/process.c ---- linux-2.6.32.46/kernel/power/process.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/power/process.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/power/process.c linux-2.6.32.48/kernel/power/process.c +--- linux-2.6.32.48/kernel/power/process.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/power/process.c 2011-11-12 12:46:47.000000000 -0500 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -68993,9 +68957,9 @@ diff -urNp linux-2.6.32.46/kernel/power/process.c linux-2.6.32.46/kernel/power/p do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.46/kernel/power/suspend.c linux-2.6.32.46/kernel/power/suspend.c ---- linux-2.6.32.46/kernel/power/suspend.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/power/suspend.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/power/suspend.c linux-2.6.32.48/kernel/power/suspend.c +--- linux-2.6.32.48/kernel/power/suspend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/power/suspend.c 2011-11-12 12:46:47.000000000 -0500 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -69012,9 +68976,9 @@ diff -urNp linux-2.6.32.46/kernel/power/suspend.c linux-2.6.32.46/kernel/power/s { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.46/kernel/printk.c linux-2.6.32.46/kernel/printk.c ---- linux-2.6.32.46/kernel/printk.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/printk.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/printk.c linux-2.6.32.48/kernel/printk.c +--- linux-2.6.32.48/kernel/printk.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/printk.c 2011-11-12 12:46:47.000000000 -0500 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -69027,9 +68991,9 @@ diff -urNp linux-2.6.32.46/kernel/printk.c linux-2.6.32.46/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.46/kernel/profile.c linux-2.6.32.46/kernel/profile.c ---- linux-2.6.32.46/kernel/profile.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/profile.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/profile.c linux-2.6.32.48/kernel/profile.c +--- linux-2.6.32.48/kernel/profile.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/profile.c 2011-11-12 12:46:47.000000000 -0500 @@ -39,7 +39,7 @@ struct profile_hit { /* Oprofile timer tick hook */ static int (*timer_hook)(struct pt_regs *) __read_mostly; @@ -69087,9 +69051,9 @@ diff -urNp linux-2.6.32.46/kernel/profile.c linux-2.6.32.46/kernel/profile.c return count; } -diff -urNp linux-2.6.32.46/kernel/ptrace.c linux-2.6.32.46/kernel/ptrace.c ---- linux-2.6.32.46/kernel/ptrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/ptrace.c 2011-05-22 23:02:06.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/ptrace.c linux-2.6.32.48/kernel/ptrace.c +--- linux-2.6.32.48/kernel/ptrace.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/ptrace.c 2011-11-12 12:46:47.000000000 -0500 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -69271,9 +69235,9 @@ diff -urNp linux-2.6.32.46/kernel/ptrace.c linux-2.6.32.46/kernel/ptrace.c goto out_put_task_struct; } -diff -urNp linux-2.6.32.46/kernel/rcutorture.c linux-2.6.32.46/kernel/rcutorture.c ---- linux-2.6.32.46/kernel/rcutorture.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/rcutorture.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/rcutorture.c linux-2.6.32.48/kernel/rcutorture.c +--- linux-2.6.32.48/kernel/rcutorture.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/rcutorture.c 2011-11-12 12:46:47.000000000 -0500 @@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_ { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = @@ -69423,9 +69387,9 @@ diff -urNp linux-2.6.32.46/kernel/rcutorture.c linux-2.6.32.46/kernel/rcutorture for_each_possible_cpu(cpu) { for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; -diff -urNp linux-2.6.32.46/kernel/rcutree.c linux-2.6.32.46/kernel/rcutree.c ---- linux-2.6.32.46/kernel/rcutree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/rcutree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/rcutree.c linux-2.6.32.48/kernel/rcutree.c +--- linux-2.6.32.48/kernel/rcutree.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/rcutree.c 2011-11-12 12:46:47.000000000 -0500 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state /* * Do softirq processing for the current CPU. @@ -69435,9 +69399,9 @@ diff -urNp linux-2.6.32.46/kernel/rcutree.c linux-2.6.32.46/kernel/rcutree.c { /* * Memory references from any prior RCU read-side critical sections -diff -urNp linux-2.6.32.46/kernel/rcutree_plugin.h linux-2.6.32.46/kernel/rcutree_plugin.h ---- linux-2.6.32.46/kernel/rcutree_plugin.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/rcutree_plugin.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/rcutree_plugin.h linux-2.6.32.48/kernel/rcutree_plugin.h +--- linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/rcutree_plugin.h 2011-11-12 12:46:47.000000000 -0500 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi */ void __rcu_read_lock(void) @@ -69456,9 +69420,9 @@ diff -urNp linux-2.6.32.46/kernel/rcutree_plugin.h linux-2.6.32.46/kernel/rcutre unlikely(ACCESS_ONCE(t->rcu_read_unlock_special))) rcu_read_unlock_special(t); } -diff -urNp linux-2.6.32.46/kernel/relay.c linux-2.6.32.46/kernel/relay.c ---- linux-2.6.32.46/kernel/relay.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/relay.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/relay.c linux-2.6.32.48/kernel/relay.c +--- linux-2.6.32.48/kernel/relay.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/relay.c 2011-11-12 12:46:47.000000000 -0500 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi unsigned int flags, int *nonpad_ret) @@ -69478,9 +69442,9 @@ diff -urNp linux-2.6.32.46/kernel/relay.c linux-2.6.32.46/kernel/relay.c if (rbuf->subbufs_produced == rbuf->subbufs_consumed) return 0; -diff -urNp linux-2.6.32.46/kernel/resource.c linux-2.6.32.46/kernel/resource.c ---- linux-2.6.32.46/kernel/resource.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/resource.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/resource.c linux-2.6.32.48/kernel/resource.c +--- linux-2.6.32.48/kernel/resource.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/resource.c 2011-11-12 12:46:47.000000000 -0500 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -69500,9 +69464,9 @@ diff -urNp linux-2.6.32.46/kernel/resource.c linux-2.6.32.46/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c ---- linux-2.6.32.46/kernel/rtmutex.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/rtmutex.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/rtmutex.c linux-2.6.32.48/kernel/rtmutex.c +--- linux-2.6.32.48/kernel/rtmutex.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/rtmutex.c 2011-11-12 12:46:47.000000000 -0500 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt */ spin_lock_irqsave(&pendowner->pi_lock, flags); @@ -69512,9 +69476,9 @@ diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c WARN_ON(pendowner->pi_blocked_on != waiter); WARN_ON(pendowner->pi_blocked_on->lock != lock); -diff -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmutex-tester.c ---- linux-2.6.32.46/kernel/rtmutex-tester.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/rtmutex-tester.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/rtmutex-tester.c linux-2.6.32.48/kernel/rtmutex-tester.c +--- linux-2.6.32.48/kernel/rtmutex-tester.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/rtmutex-tester.c 2011-11-12 12:46:47.000000000 -0500 @@ -21,7 +21,7 @@ #define MAX_RT_TEST_MUTEXES 8 @@ -69605,9 +69569,9 @@ diff -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmute return; case RTTEST_LOCKBKL: -diff -urNp linux-2.6.32.46/kernel/sched.c linux-2.6.32.46/kernel/sched.c ---- linux-2.6.32.46/kernel/sched.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/sched.c 2011-08-21 19:29:25.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/sched.c linux-2.6.32.48/kernel/sched.c +--- linux-2.6.32.48/kernel/sched.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/sched.c 2011-11-12 12:46:47.000000000 -0500 @@ -2764,9 +2764,10 @@ void wake_up_new_task(struct task_struct { unsigned long flags; @@ -69697,9 +69661,9 @@ diff -urNp linux-2.6.32.46/kernel/sched.c linux-2.6.32.46/kernel/sched.c if (cpu != group_first_cpu(sd->groups)) return; -diff -urNp linux-2.6.32.46/kernel/signal.c linux-2.6.32.46/kernel/signal.c ---- linux-2.6.32.46/kernel/signal.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/kernel/signal.c 2011-08-16 21:15:58.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/signal.c linux-2.6.32.48/kernel/signal.c +--- linux-2.6.32.48/kernel/signal.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/signal.c 2011-11-12 12:46:47.000000000 -0500 @@ -41,12 +41,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -69832,9 +69796,9 @@ diff -urNp linux-2.6.32.46/kernel/signal.c linux-2.6.32.46/kernel/signal.c if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) { error = check_kill_permission(sig, info, p); /* -diff -urNp linux-2.6.32.46/kernel/smp.c linux-2.6.32.46/kernel/smp.c ---- linux-2.6.32.46/kernel/smp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/smp.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/smp.c linux-2.6.32.48/kernel/smp.c +--- linux-2.6.32.48/kernel/smp.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/smp.c 2011-11-12 12:46:47.000000000 -0500 @@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -69862,9 +69826,9 @@ diff -urNp linux-2.6.32.46/kernel/smp.c linux-2.6.32.46/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.46/kernel/softirq.c linux-2.6.32.46/kernel/softirq.c ---- linux-2.6.32.46/kernel/softirq.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/softirq.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/softirq.c linux-2.6.32.48/kernel/softirq.c +--- linux-2.6.32.48/kernel/softirq.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/softirq.c 2011-11-12 12:46:47.000000000 -0500 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -69924,9 +69888,9 @@ diff -urNp linux-2.6.32.46/kernel/softirq.c linux-2.6.32.46/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-2.6.32.46/kernel/sys.c linux-2.6.32.46/kernel/sys.c ---- linux-2.6.32.46/kernel/sys.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/sys.c 2011-08-11 19:51:54.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/sys.c linux-2.6.32.48/kernel/sys.c +--- linux-2.6.32.48/kernel/sys.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/sys.c 2011-11-12 12:46:47.000000000 -0500 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -70086,9 +70050,9 @@ diff -urNp linux-2.6.32.46/kernel/sys.c linux-2.6.32.46/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.46/kernel/sysctl.c linux-2.6.32.46/kernel/sysctl.c ---- linux-2.6.32.46/kernel/sysctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/sysctl.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/sysctl.c linux-2.6.32.48/kernel/sysctl.c +--- linux-2.6.32.48/kernel/sysctl.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/sysctl.c 2011-11-12 12:46:47.000000000 -0500 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -70320,9 +70284,9 @@ diff -urNp linux-2.6.32.46/kernel/sysctl.c linux-2.6.32.46/kernel/sysctl.c +EXPORT_SYMBOL(sysctl_string_modpriv); EXPORT_SYMBOL(sysctl_data); EXPORT_SYMBOL(unregister_sysctl_table); -diff -urNp linux-2.6.32.46/kernel/sysctl_check.c linux-2.6.32.46/kernel/sysctl_check.c ---- linux-2.6.32.46/kernel/sysctl_check.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/sysctl_check.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/sysctl_check.c linux-2.6.32.48/kernel/sysctl_check.c +--- linux-2.6.32.48/kernel/sysctl_check.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/sysctl_check.c 2011-11-12 12:46:47.000000000 -0500 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n } else { if ((table->strategy == sysctl_data) || @@ -70336,9 +70300,9 @@ diff -urNp linux-2.6.32.46/kernel/sysctl_check.c linux-2.6.32.46/kernel/sysctl_c (table->proc_handler == proc_dointvec) || (table->proc_handler == proc_dointvec_minmax) || (table->proc_handler == proc_dointvec_jiffies) || -diff -urNp linux-2.6.32.46/kernel/taskstats.c linux-2.6.32.46/kernel/taskstats.c ---- linux-2.6.32.46/kernel/taskstats.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/kernel/taskstats.c 2011-07-13 17:23:19.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/taskstats.c linux-2.6.32.48/kernel/taskstats.c +--- linux-2.6.32.48/kernel/taskstats.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/taskstats.c 2011-11-12 12:46:47.000000000 -0500 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -70362,9 +70326,9 @@ diff -urNp linux-2.6.32.46/kernel/taskstats.c linux-2.6.32.46/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.46/kernel/time/tick-broadcast.c linux-2.6.32.46/kernel/time/tick-broadcast.c ---- linux-2.6.32.46/kernel/time/tick-broadcast.c 2011-05-23 16:56:59.000000000 -0400 -+++ linux-2.6.32.46/kernel/time/tick-broadcast.c 2011-05-23 16:57:13.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/time/tick-broadcast.c linux-2.6.32.48/kernel/time/tick-broadcast.c +--- linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/time/tick-broadcast.c 2011-11-12 12:46:47.000000000 -0500 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -70374,9 +70338,9 @@ diff -urNp linux-2.6.32.46/kernel/time/tick-broadcast.c linux-2.6.32.46/kernel/t cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.46/kernel/time/timekeeping.c linux-2.6.32.46/kernel/time/timekeeping.c ---- linux-2.6.32.46/kernel/time/timekeeping.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/kernel/time/timekeeping.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/time/timekeeping.c linux-2.6.32.48/kernel/time/timekeeping.c +--- linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/time/timekeeping.c 2011-11-12 12:46:47.000000000 -0500 @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/mm.h> @@ -70403,9 +70367,9 @@ diff -urNp linux-2.6.32.46/kernel/time/timekeeping.c linux-2.6.32.46/kernel/time write_seqlock_irqsave(&xtime_lock, flags); timekeeping_forward_now(); -diff -urNp linux-2.6.32.46/kernel/time/timer_list.c linux-2.6.32.46/kernel/time/timer_list.c ---- linux-2.6.32.46/kernel/time/timer_list.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/time/timer_list.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/time/timer_list.c linux-2.6.32.48/kernel/time/timer_list.c +--- linux-2.6.32.48/kernel/time/timer_list.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/time/timer_list.c 2011-11-12 12:46:47.000000000 -0500 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, static void print_name_offset(struct seq_file *m, void *sym) @@ -70447,9 +70411,9 @@ diff -urNp linux-2.6.32.46/kernel/time/timer_list.c linux-2.6.32.46/kernel/time/ if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.32.46/kernel/time/timer_stats.c linux-2.6.32.46/kernel/time/timer_stats.c ---- linux-2.6.32.46/kernel/time/timer_stats.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/time/timer_stats.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/time/timer_stats.c linux-2.6.32.48/kernel/time/timer_stats.c +--- linux-2.6.32.48/kernel/time/timer_stats.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/time/timer_stats.c 2011-11-12 12:46:47.000000000 -0500 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop; static unsigned long nr_entries; static struct entry entries[MAX_ENTRIES]; @@ -70518,9 +70482,9 @@ diff -urNp linux-2.6.32.46/kernel/time/timer_stats.c linux-2.6.32.46/kernel/time if (!pe) return -ENOMEM; return 0; -diff -urNp linux-2.6.32.46/kernel/time.c linux-2.6.32.46/kernel/time.c ---- linux-2.6.32.46/kernel/time.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/time.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/time.c linux-2.6.32.48/kernel/time.c +--- linux-2.6.32.48/kernel/time.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/time.c 2011-11-12 12:46:47.000000000 -0500 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec return error; @@ -70551,9 +70515,9 @@ diff -urNp linux-2.6.32.46/kernel/time.c linux-2.6.32.46/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.46/kernel/timer.c linux-2.6.32.46/kernel/timer.c ---- linux-2.6.32.46/kernel/timer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/timer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/timer.c linux-2.6.32.48/kernel/timer.c +--- linux-2.6.32.48/kernel/timer.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/timer.c 2011-11-12 12:46:47.000000000 -0500 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -70563,9 +70527,9 @@ diff -urNp linux-2.6.32.46/kernel/timer.c linux-2.6.32.46/kernel/timer.c { struct tvec_base *base = __get_cpu_var(tvec_bases); -diff -urNp linux-2.6.32.46/kernel/trace/blktrace.c linux-2.6.32.46/kernel/trace/blktrace.c ---- linux-2.6.32.46/kernel/trace/blktrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/blktrace.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/blktrace.c linux-2.6.32.48/kernel/trace/blktrace.c +--- linux-2.6.32.48/kernel/trace/blktrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/blktrace.c 2011-11-12 12:46:47.000000000 -0500 @@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct f struct blk_trace *bt = filp->private_data; char buf[16]; @@ -70593,9 +70557,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/blktrace.c linux-2.6.32.46/kernel/trace/ ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, -diff -urNp linux-2.6.32.46/kernel/trace/ftrace.c linux-2.6.32.46/kernel/trace/ftrace.c ---- linux-2.6.32.46/kernel/trace/ftrace.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/ftrace.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/ftrace.c linux-2.6.32.48/kernel/trace/ftrace.c +--- linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/ftrace.c 2011-11-12 12:46:47.000000000 -0500 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -70617,9 +70581,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/ftrace.c linux-2.6.32.46/kernel/trace/ft } /* -diff -urNp linux-2.6.32.46/kernel/trace/ring_buffer.c linux-2.6.32.46/kernel/trace/ring_buffer.c ---- linux-2.6.32.46/kernel/trace/ring_buffer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/ring_buffer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/ring_buffer.c linux-2.6.32.48/kernel/trace/ring_buffer.c +--- linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/ring_buffer.c 2011-11-12 12:46:47.000000000 -0500 @@ -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. @@ -70629,9 +70593,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/ring_buffer.c linux-2.6.32.46/kernel/tra rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, struct buffer_page *page, struct list_head *list) { -diff -urNp linux-2.6.32.46/kernel/trace/trace.c linux-2.6.32.46/kernel/trace/trace.c ---- linux-2.6.32.46/kernel/trace/trace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace.c linux-2.6.32.48/kernel/trace/trace.c +--- linux-2.6.32.48/kernel/trace/trace.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace.c 2011-11-12 12:46:47.000000000 -0500 @@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe( size_t rem; unsigned int i; @@ -70674,9 +70638,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace.c linux-2.6.32.46/kernel/trace/tra static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.46/kernel/trace/trace_events.c linux-2.6.32.46/kernel/trace/trace_events.c ---- linux-2.6.32.46/kernel/trace/trace_events.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace_events.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace_events.c linux-2.6.32.48/kernel/trace/trace_events.c +--- linux-2.6.32.48/kernel/trace/trace_events.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace_events.c 2011-11-12 12:46:47.000000000 -0500 @@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -70727,9 +70691,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace_events.c linux-2.6.32.46/kernel/tr } } -diff -urNp linux-2.6.32.46/kernel/trace/trace_mmiotrace.c linux-2.6.32.46/kernel/trace/trace_mmiotrace.c ---- linux-2.6.32.46/kernel/trace/trace_mmiotrace.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace_mmiotrace.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace_mmiotrace.c linux-2.6.32.48/kernel/trace/trace_mmiotrace.c +--- linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace_mmiotrace.c 2011-11-12 12:46:47.000000000 -0500 @@ -23,7 +23,7 @@ struct header_iter { static struct trace_array *mmio_trace_array; static bool overrun_detected; @@ -70766,9 +70730,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace_mmiotrace.c linux-2.6.32.46/kernel return; } entry = ring_buffer_event_data(event); -diff -urNp linux-2.6.32.46/kernel/trace/trace_output.c linux-2.6.32.46/kernel/trace/trace_output.c ---- linux-2.6.32.46/kernel/trace/trace_output.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace_output.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace_output.c linux-2.6.32.48/kernel/trace/trace_output.c +--- linux-2.6.32.48/kernel/trace/trace_output.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace_output.c 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -70778,9 +70742,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace_output.c linux-2.6.32.46/kernel/tr if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.46/kernel/trace/trace_stack.c linux-2.6.32.46/kernel/trace/trace_stack.c ---- linux-2.6.32.46/kernel/trace/trace_stack.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace_stack.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace_stack.c linux-2.6.32.48/kernel/trace/trace_stack.c +--- linux-2.6.32.48/kernel/trace/trace_stack.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace_stack.c 2011-11-12 12:46:47.000000000 -0500 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -70790,9 +70754,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace_stack.c linux-2.6.32.46/kernel/tra return; local_irq_save(flags); -diff -urNp linux-2.6.32.46/kernel/trace/trace_workqueue.c linux-2.6.32.46/kernel/trace/trace_workqueue.c ---- linux-2.6.32.46/kernel/trace/trace_workqueue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/trace/trace_workqueue.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/trace/trace_workqueue.c linux-2.6.32.48/kernel/trace/trace_workqueue.c +--- linux-2.6.32.48/kernel/trace/trace_workqueue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/kernel/trace/trace_workqueue.c 2011-11-12 12:46:47.000000000 -0500 @@ -21,7 +21,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -70820,9 +70784,9 @@ diff -urNp linux-2.6.32.46/kernel/trace/trace_workqueue.c linux-2.6.32.46/kernel tsk->comm); put_task_struct(tsk); } -diff -urNp linux-2.6.32.46/kernel/user.c linux-2.6.32.46/kernel/user.c ---- linux-2.6.32.46/kernel/user.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/kernel/user.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/kernel/user.c linux-2.6.32.48/kernel/user.c +--- linux-2.6.32.48/kernel/user.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/kernel/user.c 2011-11-12 12:46:47.000000000 -0500 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use spin_lock_irq(&uidhash_lock); up = uid_hash_find(uid, hashent); @@ -70831,9 +70795,9 @@ diff -urNp linux-2.6.32.46/kernel/user.c linux-2.6.32.46/kernel/user.c key_put(new->uid_keyring); key_put(new->session_keyring); kmem_cache_free(uid_cachep, new); -diff -urNp linux-2.6.32.46/lib/bitmap.c linux-2.6.32.46/lib/bitmap.c ---- linux-2.6.32.46/lib/bitmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/bitmap.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/bitmap.c linux-2.6.32.48/lib/bitmap.c +--- linux-2.6.32.48/lib/bitmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/bitmap.c 2011-11-12 12:46:47.000000000 -0500 @@ -341,7 +341,7 @@ int __bitmap_parse(const char *buf, unsi { int c, old_c, totaldigits, ndigits, nchunks, nbits; @@ -70852,9 +70816,9 @@ diff -urNp linux-2.6.32.46/lib/bitmap.c linux-2.6.32.46/lib/bitmap.c } EXPORT_SYMBOL(bitmap_parse_user); -diff -urNp linux-2.6.32.46/lib/bug.c linux-2.6.32.46/lib/bug.c ---- linux-2.6.32.46/lib/bug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/bug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/bug.c linux-2.6.32.48/lib/bug.c +--- linux-2.6.32.48/lib/bug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/bug.c 2011-11-12 12:46:47.000000000 -0500 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -70864,9 +70828,9 @@ diff -urNp linux-2.6.32.46/lib/bug.c linux-2.6.32.46/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.46/lib/debugobjects.c linux-2.6.32.46/lib/debugobjects.c ---- linux-2.6.32.46/lib/debugobjects.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/lib/debugobjects.c 2011-07-13 17:23:19.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/debugobjects.c linux-2.6.32.48/lib/debugobjects.c +--- linux-2.6.32.48/lib/debugobjects.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/lib/debugobjects.c 2011-11-12 12:46:47.000000000 -0500 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -70876,9 +70840,9 @@ diff -urNp linux-2.6.32.46/lib/debugobjects.c linux-2.6.32.46/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.46/lib/devres.c linux-2.6.32.46/lib/devres.c ---- linux-2.6.32.46/lib/devres.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/devres.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/devres.c linux-2.6.32.48/lib/devres.c +--- linux-2.6.32.48/lib/devres.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/devres.c 2011-11-12 12:46:47.000000000 -0500 @@ -80,7 +80,7 @@ void devm_iounmap(struct device *dev, vo { iounmap(addr); @@ -70897,9 +70861,9 @@ diff -urNp linux-2.6.32.46/lib/devres.c linux-2.6.32.46/lib/devres.c } EXPORT_SYMBOL(devm_ioport_unmap); -diff -urNp linux-2.6.32.46/lib/dma-debug.c linux-2.6.32.46/lib/dma-debug.c ---- linux-2.6.32.46/lib/dma-debug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/dma-debug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/dma-debug.c linux-2.6.32.48/lib/dma-debug.c +--- linux-2.6.32.48/lib/dma-debug.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/lib/dma-debug.c 2011-11-12 12:46:47.000000000 -0500 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -70909,9 +70873,9 @@ diff -urNp linux-2.6.32.46/lib/dma-debug.c linux-2.6.32.46/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-2.6.32.46/lib/idr.c linux-2.6.32.46/lib/idr.c ---- linux-2.6.32.46/lib/idr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/idr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/idr.c linux-2.6.32.48/lib/idr.c +--- linux-2.6.32.48/lib/idr.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/lib/idr.c 2011-11-12 12:46:47.000000000 -0500 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; @@ -70921,9 +70885,9 @@ diff -urNp linux-2.6.32.46/lib/idr.c linux-2.6.32.46/lib/idr.c *starting_id = id; return IDR_NEED_TO_GROW; } -diff -urNp linux-2.6.32.46/lib/inflate.c linux-2.6.32.46/lib/inflate.c ---- linux-2.6.32.46/lib/inflate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/inflate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/inflate.c linux-2.6.32.48/lib/inflate.c +--- linux-2.6.32.48/lib/inflate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/inflate.c 2011-11-12 12:46:47.000000000 -0500 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -70933,9 +70897,9 @@ diff -urNp linux-2.6.32.46/lib/inflate.c linux-2.6.32.46/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug ---- linux-2.6.32.46/lib/Kconfig.debug 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/Kconfig.debug 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/Kconfig.debug linux-2.6.32.48/lib/Kconfig.debug +--- linux-2.6.32.48/lib/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/Kconfig.debug 2011-11-12 12:46:47.000000000 -0500 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -70945,9 +70909,9 @@ diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.32.46/lib/kobject.c linux-2.6.32.46/lib/kobject.c ---- linux-2.6.32.46/lib/kobject.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/kobject.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/kobject.c linux-2.6.32.48/lib/kobject.c +--- linux-2.6.32.48/lib/kobject.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/kobject.c 2011-11-12 12:46:47.000000000 -0500 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -70975,9 +70939,9 @@ diff -urNp linux-2.6.32.46/lib/kobject.c linux-2.6.32.46/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.46/lib/kobject_uevent.c linux-2.6.32.46/lib/kobject_uevent.c ---- linux-2.6.32.46/lib/kobject_uevent.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/kobject_uevent.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/kobject_uevent.c linux-2.6.32.48/lib/kobject_uevent.c +--- linux-2.6.32.48/lib/kobject_uevent.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/lib/kobject_uevent.c 2011-11-12 12:46:47.000000000 -0500 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -70987,9 +70951,9 @@ diff -urNp linux-2.6.32.46/lib/kobject_uevent.c linux-2.6.32.46/lib/kobject_ueve u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.46/lib/kref.c linux-2.6.32.46/lib/kref.c ---- linux-2.6.32.46/lib/kref.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/kref.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/kref.c linux-2.6.32.48/lib/kref.c +--- linux-2.6.32.48/lib/kref.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/kref.c 2011-11-12 12:46:47.000000000 -0500 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -70999,9 +70963,9 @@ diff -urNp linux-2.6.32.46/lib/kref.c linux-2.6.32.46/lib/kref.c WARN_ON(release == (void (*)(struct kref *))kfree); if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-2.6.32.46/lib/parser.c linux-2.6.32.46/lib/parser.c ---- linux-2.6.32.46/lib/parser.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/parser.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/parser.c linux-2.6.32.48/lib/parser.c +--- linux-2.6.32.48/lib/parser.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/parser.c 2011-11-12 12:46:47.000000000 -0500 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -71011,9 +70975,9 @@ diff -urNp linux-2.6.32.46/lib/parser.c linux-2.6.32.46/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.46/lib/radix-tree.c linux-2.6.32.46/lib/radix-tree.c ---- linux-2.6.32.46/lib/radix-tree.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/radix-tree.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/radix-tree.c linux-2.6.32.48/lib/radix-tree.c +--- linux-2.6.32.48/lib/radix-tree.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/radix-tree.c 2011-11-12 12:46:47.000000000 -0500 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -71023,9 +70987,9 @@ diff -urNp linux-2.6.32.46/lib/radix-tree.c linux-2.6.32.46/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.46/lib/random32.c linux-2.6.32.46/lib/random32.c ---- linux-2.6.32.46/lib/random32.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/random32.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/random32.c linux-2.6.32.48/lib/random32.c +--- linux-2.6.32.48/lib/random32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/random32.c 2011-11-12 12:46:47.000000000 -0500 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -71035,9 +70999,9 @@ diff -urNp linux-2.6.32.46/lib/random32.c linux-2.6.32.46/lib/random32.c } /** -diff -urNp linux-2.6.32.46/lib/vsprintf.c linux-2.6.32.46/lib/vsprintf.c ---- linux-2.6.32.46/lib/vsprintf.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/lib/vsprintf.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/lib/vsprintf.c linux-2.6.32.48/lib/vsprintf.c +--- linux-2.6.32.48/lib/vsprintf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/lib/vsprintf.c 2011-11-12 12:46:47.000000000 -0500 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -71138,14 +71102,14 @@ diff -urNp linux-2.6.32.46/lib/vsprintf.c linux-2.6.32.46/lib/vsprintf.c break; } -diff -urNp linux-2.6.32.46/localversion-grsec linux-2.6.32.46/localversion-grsec ---- linux-2.6.32.46/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/localversion-grsec 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/localversion-grsec linux-2.6.32.48/localversion-grsec +--- linux-2.6.32.48/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/localversion-grsec 2011-11-12 12:46:47.000000000 -0500 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile ---- linux-2.6.32.46/Makefile 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/Makefile 2011-10-08 08:14:40.000000000 -0400 +diff -urNp linux-2.6.32.48/Makefile linux-2.6.32.48/Makefile +--- linux-2.6.32.48/Makefile 2011-11-12 12:44:28.000000000 -0500 ++++ linux-2.6.32.48/Makefile 2011-11-12 12:46:47.000000000 -0500 @@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -71362,9 +71326,9 @@ diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) -diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-dev.c ---- linux-2.6.32.46/mm/backing-dev.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/backing-dev.c 2011-08-11 19:48:17.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/backing-dev.c linux-2.6.32.48/mm/backing-dev.c +--- linux-2.6.32.48/mm/backing-dev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/backing-dev.c 2011-11-12 12:46:47.000000000 -0500 @@ -272,7 +272,7 @@ static void bdi_task_init(struct backing list_add_tail_rcu(&wb->list, &bdi->wb_list); spin_unlock(&bdi->wb_lock); @@ -71383,9 +71347,9 @@ diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-dev.c { if (!bdi_cap_writeback_dirty(bdi)) return; -diff -urNp linux-2.6.32.46/mm/filemap.c linux-2.6.32.46/mm/filemap.c ---- linux-2.6.32.46/mm/filemap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/filemap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/filemap.c linux-2.6.32.48/mm/filemap.c +--- linux-2.6.32.48/mm/filemap.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/filemap.c 2011-11-12 12:46:47.000000000 -0500 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -71403,9 +71367,9 @@ diff -urNp linux-2.6.32.46/mm/filemap.c linux-2.6.32.46/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.46/mm/fremap.c linux-2.6.32.46/mm/fremap.c ---- linux-2.6.32.46/mm/fremap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/fremap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/fremap.c linux-2.6.32.48/mm/fremap.c +--- linux-2.6.32.48/mm/fremap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/fremap.c 2011-11-12 12:46:47.000000000 -0500 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -71427,9 +71391,9 @@ diff -urNp linux-2.6.32.46/mm/fremap.c linux-2.6.32.46/mm/fremap.c munlock_vma_pages_range(vma, start, start + size); vma->vm_flags = saved_flags; } -diff -urNp linux-2.6.32.46/mm/highmem.c linux-2.6.32.46/mm/highmem.c ---- linux-2.6.32.46/mm/highmem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/highmem.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/highmem.c linux-2.6.32.48/mm/highmem.c +--- linux-2.6.32.48/mm/highmem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/highmem.c 2011-11-12 12:46:47.000000000 -0500 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -71455,9 +71419,9 @@ diff -urNp linux-2.6.32.46/mm/highmem.c linux-2.6.32.46/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.46/mm/hugetlb.c linux-2.6.32.46/mm/hugetlb.c ---- linux-2.6.32.46/mm/hugetlb.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/mm/hugetlb.c 2011-07-13 17:23:19.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/hugetlb.c linux-2.6.32.48/mm/hugetlb.c +--- linux-2.6.32.48/mm/hugetlb.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/hugetlb.c 2011-11-12 12:46:47.000000000 -0500 @@ -1933,6 +1933,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -71537,9 +71501,9 @@ diff -urNp linux-2.6.32.46/mm/hugetlb.c linux-2.6.32.46/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.32.46/mm/internal.h linux-2.6.32.46/mm/internal.h ---- linux-2.6.32.46/mm/internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/internal.h 2011-07-09 09:13:08.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/internal.h linux-2.6.32.48/mm/internal.h +--- linux-2.6.32.48/mm/internal.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/internal.h 2011-11-12 12:46:47.000000000 -0500 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page * in mm/page_alloc.c */ @@ -71548,9 +71512,9 @@ diff -urNp linux-2.6.32.46/mm/internal.h linux-2.6.32.46/mm/internal.h extern void prep_compound_page(struct page *page, unsigned long order); -diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig ---- linux-2.6.32.46/mm/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/Kconfig linux-2.6.32.48/mm/Kconfig +--- linux-2.6.32.48/mm/Kconfig 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/Kconfig 2011-11-12 12:46:47.000000000 -0500 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -71560,9 +71524,9 @@ diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.46/mm/kmemleak.c linux-2.6.32.46/mm/kmemleak.c ---- linux-2.6.32.46/mm/kmemleak.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/mm/kmemleak.c 2011-06-25 12:56:37.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/kmemleak.c linux-2.6.32.48/mm/kmemleak.c +--- linux-2.6.32.48/mm/kmemleak.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/kmemleak.c 2011-11-12 12:46:47.000000000 -0500 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se for (i = 0; i < object->trace_len; i++) { @@ -71572,9 +71536,9 @@ diff -urNp linux-2.6.32.46/mm/kmemleak.c linux-2.6.32.46/mm/kmemleak.c } } -diff -urNp linux-2.6.32.46/mm/maccess.c linux-2.6.32.46/mm/maccess.c ---- linux-2.6.32.46/mm/maccess.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/maccess.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/maccess.c linux-2.6.32.48/mm/maccess.c +--- linux-2.6.32.48/mm/maccess.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/maccess.c 2011-11-12 12:46:47.000000000 -0500 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -71610,9 +71574,9 @@ diff -urNp linux-2.6.32.46/mm/maccess.c linux-2.6.32.46/mm/maccess.c pagefault_enable(); set_fs(old_fs); -diff -urNp linux-2.6.32.46/mm/madvise.c linux-2.6.32.46/mm/madvise.c ---- linux-2.6.32.46/mm/madvise.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/madvise.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/madvise.c linux-2.6.32.48/mm/madvise.c +--- linux-2.6.32.48/mm/madvise.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/madvise.c 2011-11-12 12:46:47.000000000 -0500 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -71689,9 +71653,9 @@ diff -urNp linux-2.6.32.46/mm/madvise.c linux-2.6.32.46/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c ---- linux-2.6.32.46/mm/memory.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/mm/memory.c 2011-07-13 17:23:23.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/memory.c linux-2.6.32.48/mm/memory.c +--- linux-2.6.32.48/mm/memory.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/memory.c 2011-11-12 12:46:47.000000000 -0500 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct return; @@ -72221,9 +72185,9 @@ diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure.c ---- linux-2.6.32.46/mm/memory-failure.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/memory-failure.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/memory-failure.c linux-2.6.32.48/mm/memory-failure.c +--- linux-2.6.32.48/mm/memory-failure.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/memory-failure.c 2011-11-12 12:46:47.000000000 -0500 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -72251,9 +72215,9 @@ diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.46/mm/mempolicy.c linux-2.6.32.46/mm/mempolicy.c ---- linux-2.6.32.46/mm/mempolicy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/mempolicy.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/mempolicy.c linux-2.6.32.48/mm/mempolicy.c +--- linux-2.6.32.48/mm/mempolicy.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/mempolicy.c 2011-11-12 12:46:47.000000000 -0500 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -72334,9 +72298,9 @@ diff -urNp linux-2.6.32.46/mm/mempolicy.c linux-2.6.32.46/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.32.46/mm/migrate.c linux-2.6.32.46/mm/migrate.c ---- linux-2.6.32.46/mm/migrate.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/mm/migrate.c 2011-07-13 17:23:23.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/migrate.c linux-2.6.32.48/mm/migrate.c +--- linux-2.6.32.48/mm/migrate.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/migrate.c 2011-11-12 12:46:47.000000000 -0500 @@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struc unsigned long chunk_start; int err; @@ -72371,9 +72335,9 @@ diff -urNp linux-2.6.32.46/mm/migrate.c linux-2.6.32.46/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.46/mm/mlock.c linux-2.6.32.46/mm/mlock.c ---- linux-2.6.32.46/mm/mlock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/mlock.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/mlock.c linux-2.6.32.48/mm/mlock.c +--- linux-2.6.32.48/mm/mlock.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/mlock.c 2011-11-12 12:46:47.000000000 -0500 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -72484,9 +72448,9 @@ diff -urNp linux-2.6.32.46/mm/mlock.c linux-2.6.32.46/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c ---- linux-2.6.32.46/mm/mmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/mmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/mmap.c linux-2.6.32.48/mm/mmap.c +--- linux-2.6.32.48/mm/mmap.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/mmap.c 2011-11-12 12:55:30.000000000 -0500 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -73213,16 +73177,16 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c unsigned long size, grow; size = address - vma->vm_start; -@@ -1640,6 +1900,8 @@ int expand_upwards(struct vm_area_struct - if (!error) - vma->vm_end = address; +@@ -1643,6 +1903,8 @@ int expand_upwards(struct vm_area_struct + vma->vm_end = address; + } } + if (locknext) + anon_vma_unlock(vma->vm_next); anon_vma_unlock(vma); return error; } -@@ -1652,6 +1914,8 @@ static int expand_downwards(struct vm_ar +@@ -1655,6 +1917,8 @@ static int expand_downwards(struct vm_ar unsigned long address) { int error; @@ -73231,7 +73195,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c /* * We must make sure the anon_vma is allocated -@@ -1665,6 +1929,15 @@ static int expand_downwards(struct vm_ar +@@ -1668,6 +1932,15 @@ static int expand_downwards(struct vm_ar if (error) return error; @@ -73247,7 +73211,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c anon_vma_lock(vma); /* -@@ -1674,9 +1947,17 @@ static int expand_downwards(struct vm_ar +@@ -1677,9 +1950,17 @@ static int expand_downwards(struct vm_ar */ /* Somebody else might have raced and expanded it already */ @@ -73266,19 +73230,21 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -1684,9 +1965,20 @@ static int expand_downwards(struct vm_ar - if (!error) { - vma->vm_start = address; - vma->vm_pgoff -= grow; -+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags); +@@ -1689,10 +1970,22 @@ static int expand_downwards(struct vm_ar + if (!error) { + vma->vm_start = address; + vma->vm_pgoff -= grow; ++ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags); + +#ifdef CONFIG_PAX_SEGMEXEC -+ if (vma_m) { -+ vma_m->vm_start -= grow << PAGE_SHIFT; -+ vma_m->vm_pgoff -= grow; -+ } ++ if (vma_m) { ++ vma_m->vm_start -= grow << PAGE_SHIFT; ++ vma_m->vm_pgoff -= grow; ++ } +#endif + ++ + } } } anon_vma_unlock(vma); @@ -73287,7 +73253,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return error; } -@@ -1762,6 +2054,13 @@ static void remove_vma_list(struct mm_st +@@ -1768,6 +2061,13 @@ static void remove_vma_list(struct mm_st do { long nrpages = vma_pages(vma); @@ -73301,7 +73267,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma); -@@ -1807,6 +2106,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1813,6 +2113,16 @@ detach_vmas_to_be_unmapped(struct mm_str insertion_point = (prev ? &prev->vm_next : &mm->mmap); vma->vm_prev = NULL; do { @@ -73318,7 +73284,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1834,10 +2143,25 @@ int split_vma(struct mm_struct * mm, str +@@ -1840,10 +2150,25 @@ int split_vma(struct mm_struct * mm, str struct mempolicy *pol; struct vm_area_struct *new; @@ -73344,7 +73310,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c if (mm->map_count >= sysctl_max_map_count) return -ENOMEM; -@@ -1845,6 +2169,16 @@ int split_vma(struct mm_struct * mm, str +@@ -1851,6 +2176,16 @@ int split_vma(struct mm_struct * mm, str if (!new) return -ENOMEM; @@ -73361,7 +73327,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c /* most fields are the same, copy all, and then fixup */ *new = *vma; -@@ -1855,8 +2189,29 @@ int split_vma(struct mm_struct * mm, str +@@ -1861,8 +2196,29 @@ int split_vma(struct mm_struct * mm, str new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); } @@ -73391,7 +73357,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c kmem_cache_free(vm_area_cachep, new); return PTR_ERR(pol); } -@@ -1877,6 +2232,28 @@ int split_vma(struct mm_struct * mm, str +@@ -1883,6 +2239,28 @@ int split_vma(struct mm_struct * mm, str else vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); @@ -73420,7 +73386,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return 0; } -@@ -1885,11 +2262,30 @@ int split_vma(struct mm_struct * mm, str +@@ -1891,11 +2269,30 @@ int split_vma(struct mm_struct * mm, str * work. This now handles partial unmappings. * Jeremy Fitzhardinge <jeremy@goop.org> */ @@ -73451,7 +73417,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -1953,6 +2349,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -1959,6 +2356,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -73460,7 +73426,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return 0; } -@@ -1965,22 +2363,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -1971,22 +2370,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a profile_munmap(addr); @@ -73489,7 +73455,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/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 +2388,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2000,6 +2395,7 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -73497,7 +73463,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -2005,16 +2400,30 @@ unsigned long do_brk(unsigned long addr, +@@ -2011,16 +2407,30 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -73529,7 +73495,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; -@@ -2031,22 +2440,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2037,22 +2447,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -73556,7 +73522,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2060,7 +2469,7 @@ unsigned long do_brk(unsigned long addr, +@@ -2066,7 +2476,7 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -73565,7 +73531,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return -ENOMEM; } -@@ -2072,11 +2481,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2078,11 +2488,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: @@ -73580,7 +73546,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return addr; } -@@ -2123,8 +2533,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2129,8 +2540,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. */ @@ -73592,7 +73558,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2138,6 +2550,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2144,6 +2557,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -73603,7 +73569,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/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 +2576,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2166,7 +2583,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; @@ -73626,7 +73592,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c return 0; } -@@ -2178,6 +2609,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2184,6 +2616,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -73635,7 +73601,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/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 +2654,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2227,6 +2661,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -73671,7 +73637,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2231,7 +2693,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2237,7 +2700,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; @@ -73680,7 +73646,7 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2301,6 +2763,22 @@ int install_special_mapping(struct mm_st +@@ -2307,6 +2770,22 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -73703,9 +73669,9 @@ diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.32.46/mm/mprotect.c linux-2.6.32.46/mm/mprotect.c ---- linux-2.6.32.46/mm/mprotect.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/mprotect.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/mprotect.c linux-2.6.32.48/mm/mprotect.c +--- linux-2.6.32.48/mm/mprotect.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/mprotect.c 2011-11-12 12:46:47.000000000 -0500 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -73928,9 +73894,9 @@ diff -urNp linux-2.6.32.46/mm/mprotect.c linux-2.6.32.46/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.46/mm/mremap.c linux-2.6.32.46/mm/mremap.c ---- linux-2.6.32.46/mm/mremap.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/mm/mremap.c 2011-04-17 17:03:58.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/mremap.c linux-2.6.32.48/mm/mremap.c +--- linux-2.6.32.48/mm/mremap.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/mremap.c 2011-11-12 12:46:47.000000000 -0500 @@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -74035,9 +74001,9 @@ diff -urNp linux-2.6.32.46/mm/mremap.c linux-2.6.32.46/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.46/mm/nommu.c linux-2.6.32.46/mm/nommu.c ---- linux-2.6.32.46/mm/nommu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/nommu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/nommu.c linux-2.6.32.48/mm/nommu.c +--- linux-2.6.32.48/mm/nommu.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/nommu.c 2011-11-12 12:46:47.000000000 -0500 @@ -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; @@ -74062,9 +74028,9 @@ diff -urNp linux-2.6.32.46/mm/nommu.c linux-2.6.32.46/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.46/mm/page_alloc.c linux-2.6.32.46/mm/page_alloc.c ---- linux-2.6.32.46/mm/page_alloc.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/mm/page_alloc.c 2011-07-09 09:13:08.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/page_alloc.c linux-2.6.32.48/mm/page_alloc.c +--- linux-2.6.32.48/mm/page_alloc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/page_alloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -289,7 +289,7 @@ out: * This usage means that zero-order pages may not be compound. */ @@ -74139,9 +74105,9 @@ diff -urNp linux-2.6.32.46/mm/page_alloc.c linux-2.6.32.46/mm/page_alloc.c struct zone *zone, unsigned long zonesize) {} #endif /* CONFIG_SPARSEMEM */ -diff -urNp linux-2.6.32.46/mm/percpu.c linux-2.6.32.46/mm/percpu.c ---- linux-2.6.32.46/mm/percpu.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/percpu.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/percpu.c linux-2.6.32.48/mm/percpu.c +--- linux-2.6.32.48/mm/percpu.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/percpu.c 2011-11-12 12:46:47.000000000 -0500 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -74151,9 +74117,9 @@ diff -urNp linux-2.6.32.46/mm/percpu.c linux-2.6.32.46/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-2.6.32.46/mm/rmap.c linux-2.6.32.46/mm/rmap.c ---- linux-2.6.32.46/mm/rmap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/rmap.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/rmap.c linux-2.6.32.48/mm/rmap.c +--- linux-2.6.32.48/mm/rmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/rmap.c 2011-11-12 12:46:47.000000000 -0500 @@ -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); @@ -74172,9 +74138,9 @@ diff -urNp linux-2.6.32.46/mm/rmap.c linux-2.6.32.46/mm/rmap.c vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.32.46/mm/shmem.c linux-2.6.32.46/mm/shmem.c ---- linux-2.6.32.46/mm/shmem.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/shmem.c 2011-05-18 20:09:37.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/shmem.c linux-2.6.32.48/mm/shmem.c +--- linux-2.6.32.48/mm/shmem.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/shmem.c 2011-11-12 12:46:47.000000000 -0500 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -74221,9 +74187,9 @@ diff -urNp linux-2.6.32.46/mm/shmem.c linux-2.6.32.46/mm/shmem.c if (!sbinfo) return -ENOMEM; -diff -urNp linux-2.6.32.46/mm/slab.c linux-2.6.32.46/mm/slab.c ---- linux-2.6.32.46/mm/slab.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/slab.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/slab.c linux-2.6.32.48/mm/slab.c +--- linux-2.6.32.48/mm/slab.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/slab.c 2011-11-12 12:46:47.000000000 -0500 @@ -174,7 +174,7 @@ /* Legal flag mask for kmem_cache_create(). */ @@ -74386,9 +74352,9 @@ diff -urNp linux-2.6.32.46/mm/slab.c linux-2.6.32.46/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.32.46/mm/slob.c linux-2.6.32.46/mm/slob.c ---- linux-2.6.32.46/mm/slob.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/slob.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/slob.c linux-2.6.32.48/mm/slob.c +--- linux-2.6.32.48/mm/slob.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/slob.c 2011-11-12 12:46:47.000000000 -0500 @@ -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 @@ -74738,9 +74704,9 @@ diff -urNp linux-2.6.32.46/mm/slob.c linux-2.6.32.46/mm/slob.c } EXPORT_SYMBOL(kmem_cache_free); -diff -urNp linux-2.6.32.46/mm/slub.c linux-2.6.32.46/mm/slub.c ---- linux-2.6.32.46/mm/slub.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/slub.c 2011-09-25 22:23:01.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/slub.c linux-2.6.32.48/mm/slub.c +--- linux-2.6.32.48/mm/slub.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/slub.c 2011-11-12 12:46:47.000000000 -0500 @@ -201,7 +201,7 @@ struct track { enum track_item { TRACK_ALLOC, TRACK_FREE }; @@ -74992,9 +74958,9 @@ diff -urNp linux-2.6.32.46/mm/slub.c linux-2.6.32.46/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.32.46/mm/swap.c linux-2.6.32.46/mm/swap.c ---- linux-2.6.32.46/mm/swap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/swap.c 2011-07-09 09:15:19.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/swap.c linux-2.6.32.48/mm/swap.c +--- linux-2.6.32.48/mm/swap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/mm/swap.c 2011-11-12 12:46:47.000000000 -0500 @@ -30,6 +30,7 @@ #include <linux/notifier.h> #include <linux/backing-dev.h> @@ -75012,9 +74978,9 @@ diff -urNp linux-2.6.32.46/mm/swap.c linux-2.6.32.46/mm/swap.c (*dtor)(page); } } -diff -urNp linux-2.6.32.46/mm/util.c linux-2.6.32.46/mm/util.c ---- linux-2.6.32.46/mm/util.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/util.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/util.c linux-2.6.32.48/mm/util.c +--- linux-2.6.32.48/mm/util.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/util.c 2011-11-12 12:46:47.000000000 -0500 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -75028,9 +74994,9 @@ diff -urNp linux-2.6.32.46/mm/util.c linux-2.6.32.46/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.46/mm/vmalloc.c linux-2.6.32.46/mm/vmalloc.c ---- linux-2.6.32.46/mm/vmalloc.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/mm/vmalloc.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/vmalloc.c linux-2.6.32.48/mm/vmalloc.c +--- linux-2.6.32.48/mm/vmalloc.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/vmalloc.c 2011-11-12 12:46:47.000000000 -0500 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -75267,9 +75233,9 @@ diff -urNp linux-2.6.32.46/mm/vmalloc.c linux-2.6.32.46/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; -diff -urNp linux-2.6.32.46/mm/vmstat.c linux-2.6.32.46/mm/vmstat.c ---- linux-2.6.32.46/mm/vmstat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/mm/vmstat.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/mm/vmstat.c linux-2.6.32.48/mm/vmstat.c +--- linux-2.6.32.48/mm/vmstat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/mm/vmstat.c 2011-11-12 12:46:47.000000000 -0500 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -75322,9 +75288,9 @@ diff -urNp linux-2.6.32.46/mm/vmstat.c linux-2.6.32.46/mm/vmstat.c #endif return 0; } -diff -urNp linux-2.6.32.46/net/8021q/vlan.c linux-2.6.32.46/net/8021q/vlan.c ---- linux-2.6.32.46/net/8021q/vlan.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/8021q/vlan.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/8021q/vlan.c linux-2.6.32.48/net/8021q/vlan.c +--- linux-2.6.32.48/net/8021q/vlan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/8021q/vlan.c 2011-11-12 12:46:47.000000000 -0500 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -75335,9 +75301,9 @@ diff -urNp linux-2.6.32.46/net/8021q/vlan.c linux-2.6.32.46/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-2.6.32.46/net/9p/trans_fd.c linux-2.6.32.46/net/9p/trans_fd.c ---- linux-2.6.32.46/net/9p/trans_fd.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/9p/trans_fd.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/net/9p/trans_fd.c linux-2.6.32.48/net/9p/trans_fd.c +--- linux-2.6.32.48/net/9p/trans_fd.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/9p/trans_fd.c 2011-11-12 12:46:47.000000000 -0500 @@ -419,7 +419,7 @@ static int p9_fd_write(struct p9_client oldfs = get_fs(); set_fs(get_ds()); @@ -75347,9 +75313,9 @@ diff -urNp linux-2.6.32.46/net/9p/trans_fd.c linux-2.6.32.46/net/9p/trans_fd.c set_fs(oldfs); if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) -diff -urNp linux-2.6.32.46/net/atm/atm_misc.c linux-2.6.32.46/net/atm/atm_misc.c ---- linux-2.6.32.46/net/atm/atm_misc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/atm_misc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/atm_misc.c linux-2.6.32.48/net/atm/atm_misc.c +--- linux-2.6.32.48/net/atm/atm_misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/atm_misc.c 2011-11-12 12:46:47.000000000 -0500 @@ -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; @@ -75386,9 +75352,9 @@ diff -urNp linux-2.6.32.46/net/atm/atm_misc.c linux-2.6.32.46/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.46/net/atm/lec.h linux-2.6.32.46/net/atm/lec.h ---- linux-2.6.32.46/net/atm/lec.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/lec.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/lec.h linux-2.6.32.48/net/atm/lec.h +--- linux-2.6.32.48/net/atm/lec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/lec.h 2011-11-12 12:46:47.000000000 -0500 @@ -48,7 +48,7 @@ struct lane2_ops { const u8 *tlvs, u32 sizeoftlvs); void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr, @@ -75398,9 +75364,9 @@ diff -urNp linux-2.6.32.46/net/atm/lec.h linux-2.6.32.46/net/atm/lec.h /* * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType -diff -urNp linux-2.6.32.46/net/atm/mpc.h linux-2.6.32.46/net/atm/mpc.h ---- linux-2.6.32.46/net/atm/mpc.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/mpc.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/mpc.h linux-2.6.32.48/net/atm/mpc.h +--- linux-2.6.32.48/net/atm/mpc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/mpc.h 2011-11-12 12:46:47.000000000 -0500 @@ -33,7 +33,7 @@ struct mpoa_client { struct mpc_parameters parameters; /* parameters for this client */ @@ -75410,9 +75376,9 @@ diff -urNp linux-2.6.32.46/net/atm/mpc.h linux-2.6.32.46/net/atm/mpc.h }; -diff -urNp linux-2.6.32.46/net/atm/mpoa_caches.c linux-2.6.32.46/net/atm/mpoa_caches.c ---- linux-2.6.32.46/net/atm/mpoa_caches.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/mpoa_caches.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/mpoa_caches.c linux-2.6.32.48/net/atm/mpoa_caches.c +--- linux-2.6.32.48/net/atm/mpoa_caches.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/mpoa_caches.c 2011-11-12 12:46:47.000000000 -0500 @@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_cl struct timeval now; struct k_message msg; @@ -75422,9 +75388,9 @@ diff -urNp linux-2.6.32.46/net/atm/mpoa_caches.c linux-2.6.32.46/net/atm/mpoa_ca do_gettimeofday(&now); write_lock_irq(&client->egress_lock); -diff -urNp linux-2.6.32.46/net/atm/proc.c linux-2.6.32.46/net/atm/proc.c ---- linux-2.6.32.46/net/atm/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/proc.c linux-2.6.32.48/net/atm/proc.c +--- linux-2.6.32.48/net/atm/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/proc.c 2011-11-12 12:46:47.000000000 -0500 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -75463,9 +75429,9 @@ diff -urNp linux-2.6.32.46/net/atm/proc.c linux-2.6.32.46/net/atm/proc.c else seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, vcc->vci); -diff -urNp linux-2.6.32.46/net/atm/resources.c linux-2.6.32.46/net/atm/resources.c ---- linux-2.6.32.46/net/atm/resources.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/atm/resources.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/atm/resources.c linux-2.6.32.48/net/atm/resources.c +--- linux-2.6.32.48/net/atm/resources.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/atm/resources.c 2011-11-12 12:46:47.000000000 -0500 @@ -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) @@ -75484,41 +75450,9 @@ diff -urNp linux-2.6.32.46/net/atm/resources.c linux-2.6.32.46/net/atm/resources __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.46/net/bluetooth/l2cap.c linux-2.6.32.46/net/bluetooth/l2cap.c ---- linux-2.6.32.46/net/bluetooth/l2cap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/bluetooth/l2cap.c 2011-06-25 14:36:21.000000000 -0400 -@@ -1885,7 +1885,7 @@ static int l2cap_sock_getsockopt_old(str - err = -ENOTCONN; - break; - } -- -+ memset(&cinfo, 0, sizeof(cinfo)); - cinfo.hci_handle = l2cap_pi(sk)->conn->hcon->handle; - memcpy(cinfo.dev_class, l2cap_pi(sk)->conn->hcon->dev_class, 3); - -@@ -2719,7 +2719,7 @@ static inline int l2cap_config_req(struc - - /* Reject if config buffer is too small. */ - len = cmd_len - sizeof(*req); -- if (l2cap_pi(sk)->conf_len + len > sizeof(l2cap_pi(sk)->conf_req)) { -+ if (len < 0 || l2cap_pi(sk)->conf_len + len > sizeof(l2cap_pi(sk)->conf_req)) { - l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, - l2cap_build_conf_rsp(sk, rsp, - L2CAP_CONF_REJECT, flags), rsp); -diff -urNp linux-2.6.32.46/net/bluetooth/rfcomm/sock.c linux-2.6.32.46/net/bluetooth/rfcomm/sock.c ---- linux-2.6.32.46/net/bluetooth/rfcomm/sock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/bluetooth/rfcomm/sock.c 2011-06-12 06:35:00.000000000 -0400 -@@ -878,6 +878,7 @@ static int rfcomm_sock_getsockopt_old(st - - l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; - -+ memset(&cinfo, 0, sizeof(cinfo)); - cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle; - memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3); - -diff -urNp linux-2.6.32.46/net/bridge/br_private.h linux-2.6.32.46/net/bridge/br_private.h ---- linux-2.6.32.46/net/bridge/br_private.h 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/net/bridge/br_private.h 2011-08-09 18:34:01.000000000 -0400 +diff -urNp linux-2.6.32.48/net/bridge/br_private.h linux-2.6.32.48/net/bridge/br_private.h +--- linux-2.6.32.48/net/bridge/br_private.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/bridge/br_private.h 2011-11-12 12:46:51.000000000 -0500 @@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -75528,9 +75462,9 @@ diff -urNp linux-2.6.32.46/net/bridge/br_private.h linux-2.6.32.46/net/bridge/br extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.46/net/bridge/br_stp_if.c linux-2.6.32.46/net/bridge/br_stp_if.c ---- linux-2.6.32.46/net/bridge/br_stp_if.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/bridge/br_stp_if.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/bridge/br_stp_if.c linux-2.6.32.48/net/bridge/br_stp_if.c +--- linux-2.6.32.48/net/bridge/br_stp_if.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/bridge/br_stp_if.c 2011-11-12 12:46:51.000000000 -0500 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -75540,9 +75474,9 @@ diff -urNp linux-2.6.32.46/net/bridge/br_stp_if.c linux-2.6.32.46/net/bridge/br_ printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.46/net/bridge/br_sysfs_if.c linux-2.6.32.46/net/bridge/br_sysfs_if.c ---- linux-2.6.32.46/net/bridge/br_sysfs_if.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/bridge/br_sysfs_if.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/bridge/br_sysfs_if.c linux-2.6.32.48/net/bridge/br_sysfs_if.c +--- linux-2.6.32.48/net/bridge/br_sysfs_if.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/bridge/br_sysfs_if.c 2011-11-12 12:46:51.000000000 -0500 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -75552,9 +75486,9 @@ diff -urNp linux-2.6.32.46/net/bridge/br_sysfs_if.c linux-2.6.32.46/net/bridge/b .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.46/net/bridge/netfilter/ebtables.c linux-2.6.32.46/net/bridge/netfilter/ebtables.c ---- linux-2.6.32.46/net/bridge/netfilter/ebtables.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/net/bridge/netfilter/ebtables.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/bridge/netfilter/ebtables.c linux-2.6.32.48/net/bridge/netfilter/ebtables.c +--- linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/bridge/netfilter/ebtables.c 2011-11-12 12:46:51.000000000 -0500 @@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struc unsigned int entries_size, nentries; char *entries; @@ -75564,9 +75498,9 @@ diff -urNp linux-2.6.32.46/net/bridge/netfilter/ebtables.c linux-2.6.32.46/net/b if (cmd == EBT_SO_GET_ENTRIES) { entries_size = t->private->entries_size; nentries = t->private->nentries; -diff -urNp linux-2.6.32.46/net/can/bcm.c linux-2.6.32.46/net/can/bcm.c ---- linux-2.6.32.46/net/can/bcm.c 2011-05-10 22:12:01.000000000 -0400 -+++ linux-2.6.32.46/net/can/bcm.c 2011-05-10 22:12:34.000000000 -0400 +diff -urNp linux-2.6.32.48/net/can/bcm.c linux-2.6.32.48/net/can/bcm.c +--- linux-2.6.32.48/net/can/bcm.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/can/bcm.c 2011-11-12 12:46:51.000000000 -0500 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file struct bcm_sock *bo = bcm_sk(sk); struct bcm_op *op; @@ -75583,9 +75517,9 @@ diff -urNp linux-2.6.32.46/net/can/bcm.c linux-2.6.32.46/net/can/bcm.c seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs); seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex)); seq_printf(m, " <<<\n"); -diff -urNp linux-2.6.32.46/net/compat.c linux-2.6.32.46/net/compat.c ---- linux-2.6.32.46/net/compat.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/compat.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/net/compat.c linux-2.6.32.48/net/compat.c +--- linux-2.6.32.48/net/compat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/compat.c 2011-11-12 12:46:51.000000000 -0500 @@ -69,9 +69,9 @@ int get_compat_msghdr(struct msghdr *kms __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) @@ -75686,9 +75620,9 @@ diff -urNp linux-2.6.32.46/net/compat.c linux-2.6.32.46/net/compat.c struct group_filter __user *kgf; u32 interface, fmode, numsrc; -diff -urNp linux-2.6.32.46/net/core/dev.c linux-2.6.32.46/net/core/dev.c ---- linux-2.6.32.46/net/core/dev.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/net/core/dev.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/dev.c linux-2.6.32.48/net/core/dev.c +--- linux-2.6.32.48/net/core/dev.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/dev.c 2011-11-12 12:46:51.000000000 -0500 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module = request_module("netdev-%s", name); @@ -75731,9 +75665,9 @@ diff -urNp linux-2.6.32.46/net/core/dev.c linux-2.6.32.46/net/core/dev.c { struct list_head *list = &__get_cpu_var(softnet_data).poll_list; unsigned long time_limit = jiffies + 2; -diff -urNp linux-2.6.32.46/net/core/flow.c linux-2.6.32.46/net/core/flow.c ---- linux-2.6.32.46/net/core/flow.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/core/flow.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/flow.c linux-2.6.32.48/net/core/flow.c +--- linux-2.6.32.48/net/core/flow.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/core/flow.c 2011-11-12 12:46:51.000000000 -0500 @@ -35,11 +35,11 @@ struct flow_cache_entry { atomic_t *object_ref; }; @@ -75793,9 +75727,9 @@ diff -urNp linux-2.6.32.46/net/core/flow.c linux-2.6.32.46/net/core/flow.c if (!fle->object || fle->genid == genid) continue; -diff -urNp linux-2.6.32.46/net/core/rtnetlink.c linux-2.6.32.46/net/core/rtnetlink.c ---- linux-2.6.32.46/net/core/rtnetlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/core/rtnetlink.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/rtnetlink.c linux-2.6.32.48/net/core/rtnetlink.c +--- linux-2.6.32.48/net/core/rtnetlink.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/rtnetlink.c 2011-11-12 12:46:51.000000000 -0500 @@ -57,7 +57,7 @@ struct rtnl_link { rtnl_doit_func doit; @@ -75805,10 +75739,10 @@ diff -urNp linux-2.6.32.46/net/core/rtnetlink.c linux-2.6.32.46/net/core/rtnetli static DEFINE_MUTEX(rtnl_mutex); -diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c ---- linux-2.6.32.46/net/core/scm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/core/scm.c 2011-10-06 09:37:14.000000000 -0400 -@@ -190,7 +190,7 @@ error: +diff -urNp linux-2.6.32.48/net/core/scm.c linux-2.6.32.48/net/core/scm.c +--- linux-2.6.32.48/net/core/scm.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/scm.c 2011-11-12 12:46:51.000000000 -0500 +@@ -191,7 +191,7 @@ error: int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) { struct cmsghdr __user *cm @@ -75817,7 +75751,7 @@ diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c struct cmsghdr cmhdr; int cmlen = CMSG_LEN(len); int err; -@@ -213,7 +213,7 @@ int put_cmsg(struct msghdr * msg, int le +@@ -214,7 +214,7 @@ int put_cmsg(struct msghdr * msg, int le err = -EFAULT; if (copy_to_user(cm, &cmhdr, sizeof cmhdr)) goto out; @@ -75826,7 +75760,7 @@ diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c goto out; cmlen = CMSG_SPACE(len); if (msg->msg_controllen < cmlen) -@@ -228,7 +228,7 @@ out: +@@ -229,7 +229,7 @@ out: void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) { struct cmsghdr __user *cm @@ -75835,7 +75769,7 @@ diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c int fdmax = 0; int fdnum = scm->fp->count; -@@ -248,7 +248,7 @@ void scm_detach_fds(struct msghdr *msg, +@@ -249,7 +249,7 @@ void scm_detach_fds(struct msghdr *msg, if (fdnum < fdmax) fdmax = fdnum; @@ -75844,9 +75778,9 @@ diff -urNp linux-2.6.32.46/net/core/scm.c linux-2.6.32.46/net/core/scm.c i++, cmfptr++) { int new_fd; -diff -urNp linux-2.6.32.46/net/core/secure_seq.c linux-2.6.32.46/net/core/secure_seq.c ---- linux-2.6.32.46/net/core/secure_seq.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/core/secure_seq.c 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/secure_seq.c linux-2.6.32.48/net/core/secure_seq.c +--- linux-2.6.32.48/net/core/secure_seq.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/secure_seq.c 2011-11-12 12:46:51.000000000 -0500 @@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be3 EXPORT_SYMBOL(secure_tcpv6_sequence_number); @@ -75864,9 +75798,9 @@ diff -urNp linux-2.6.32.46/net/core/secure_seq.c linux-2.6.32.46/net/core/secure return hash[0]; } #endif -diff -urNp linux-2.6.32.46/net/core/skbuff.c linux-2.6.32.46/net/core/skbuff.c ---- linux-2.6.32.46/net/core/skbuff.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/core/skbuff.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/skbuff.c linux-2.6.32.48/net/core/skbuff.c +--- linux-2.6.32.48/net/core/skbuff.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/skbuff.c 2011-11-12 12:46:51.000000000 -0500 @@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb, struct sk_buff *frag_iter; struct sock *sk = skb->sk; @@ -75876,9 +75810,9 @@ diff -urNp linux-2.6.32.46/net/core/skbuff.c linux-2.6.32.46/net/core/skbuff.c /* * __skb_splice_bits() only fails if the output has no room left, * so no point in going over the frag_list for the error case. -diff -urNp linux-2.6.32.46/net/core/sock.c linux-2.6.32.46/net/core/sock.c ---- linux-2.6.32.46/net/core/sock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/core/sock.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/net/core/sock.c linux-2.6.32.48/net/core/sock.c +--- linux-2.6.32.48/net/core/sock.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/core/sock.c 2011-11-12 12:46:51.000000000 -0500 @@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock, break; @@ -75905,9 +75839,9 @@ diff -urNp linux-2.6.32.46/net/core/sock.c linux-2.6.32.46/net/core/sock.c } EXPORT_SYMBOL(sock_init_data); -diff -urNp linux-2.6.32.46/net/decnet/sysctl_net_decnet.c linux-2.6.32.46/net/decnet/sysctl_net_decnet.c ---- linux-2.6.32.46/net/decnet/sysctl_net_decnet.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/decnet/sysctl_net_decnet.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/decnet/sysctl_net_decnet.c linux-2.6.32.48/net/decnet/sysctl_net_decnet.c +--- linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/decnet/sysctl_net_decnet.c 2011-11-12 12:46:51.000000000 -0500 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -75926,9 +75860,9 @@ diff -urNp linux-2.6.32.46/net/decnet/sysctl_net_decnet.c linux-2.6.32.46/net/de return -EFAULT; *lenp = len; -diff -urNp linux-2.6.32.46/net/econet/Kconfig linux-2.6.32.46/net/econet/Kconfig ---- linux-2.6.32.46/net/econet/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/econet/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/econet/Kconfig linux-2.6.32.48/net/econet/Kconfig +--- linux-2.6.32.48/net/econet/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/econet/Kconfig 2011-11-12 12:46:51.000000000 -0500 @@ -4,7 +4,7 @@ config ECONET @@ -75938,9 +75872,9 @@ diff -urNp linux-2.6.32.46/net/econet/Kconfig linux-2.6.32.46/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-2.6.32.46/net/ieee802154/dgram.c linux-2.6.32.46/net/ieee802154/dgram.c ---- linux-2.6.32.46/net/ieee802154/dgram.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ieee802154/dgram.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ieee802154/dgram.c linux-2.6.32.48/net/ieee802154/dgram.c +--- linux-2.6.32.48/net/ieee802154/dgram.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ieee802154/dgram.c 2011-11-12 12:46:51.000000000 -0500 @@ -318,7 +318,7 @@ out: static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb) { @@ -75950,9 +75884,9 @@ diff -urNp linux-2.6.32.46/net/ieee802154/dgram.c linux-2.6.32.46/net/ieee802154 kfree_skb(skb); return NET_RX_DROP; } -diff -urNp linux-2.6.32.46/net/ieee802154/raw.c linux-2.6.32.46/net/ieee802154/raw.c ---- linux-2.6.32.46/net/ieee802154/raw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ieee802154/raw.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ieee802154/raw.c linux-2.6.32.48/net/ieee802154/raw.c +--- linux-2.6.32.48/net/ieee802154/raw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ieee802154/raw.c 2011-11-12 12:46:51.000000000 -0500 @@ -206,7 +206,7 @@ out: static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) { @@ -75962,9 +75896,9 @@ diff -urNp linux-2.6.32.46/net/ieee802154/raw.c linux-2.6.32.46/net/ieee802154/r kfree_skb(skb); return NET_RX_DROP; } -diff -urNp linux-2.6.32.46/net/ipv4/inet_diag.c linux-2.6.32.46/net/ipv4/inet_diag.c ---- linux-2.6.32.46/net/ipv4/inet_diag.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/inet_diag.c 2011-06-20 19:31:13.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/inet_diag.c linux-2.6.32.48/net/ipv4/inet_diag.c +--- linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/inet_diag.c 2011-11-12 12:46:51.000000000 -0500 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans = 0; @@ -76025,9 +75959,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/inet_diag.c linux-2.6.32.46/net/ipv4/inet_di tmo = req->expires - jiffies; if (tmo < 0) -diff -urNp linux-2.6.32.46/net/ipv4/inet_hashtables.c linux-2.6.32.46/net/ipv4/inet_hashtables.c ---- linux-2.6.32.46/net/ipv4/inet_hashtables.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/inet_hashtables.c 2011-08-16 20:42:30.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/inet_hashtables.c linux-2.6.32.48/net/ipv4/inet_hashtables.c +--- linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/inet_hashtables.c 2011-11-12 12:46:51.000000000 -0500 @@ -18,12 +18,15 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -76053,9 +75987,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/inet_hashtables.c linux-2.6.32.46/net/ipv4/i if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.46/net/ipv4/inetpeer.c linux-2.6.32.46/net/ipv4/inetpeer.c ---- linux-2.6.32.46/net/ipv4/inetpeer.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/inetpeer.c 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/inetpeer.c linux-2.6.32.48/net/ipv4/inetpeer.c +--- linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/inetpeer.c 2011-11-12 12:46:51.000000000 -0500 @@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 da struct inet_peer *p, *n; struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr; @@ -76074,9 +76008,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/inetpeer.c linux-2.6.32.46/net/ipv4/inetpeer n->ip_id_count = secure_ip_id(daddr); n->tcp_ts_stamp = 0; -diff -urNp linux-2.6.32.46/net/ipv4/ipconfig.c linux-2.6.32.46/net/ipv4/ipconfig.c ---- linux-2.6.32.46/net/ipv4/ipconfig.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/ipconfig.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/ipconfig.c linux-2.6.32.48/net/ipv4/ipconfig.c +--- linux-2.6.32.48/net/ipv4/ipconfig.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/ipconfig.c 2011-11-12 12:46:51.000000000 -0500 @@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsig mm_segment_t oldfs = get_fs(); @@ -76104,9 +76038,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/ipconfig.c linux-2.6.32.46/net/ipv4/ipconfig set_fs(oldfs); return res; } -diff -urNp linux-2.6.32.46/net/ipv4/ip_fragment.c linux-2.6.32.46/net/ipv4/ip_fragment.c ---- linux-2.6.32.46/net/ipv4/ip_fragment.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/ip_fragment.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/ip_fragment.c linux-2.6.32.48/net/ipv4/ip_fragment.c +--- linux-2.6.32.48/net/ipv4/ip_fragment.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/ip_fragment.c 2011-11-12 12:46:51.000000000 -0500 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct return 0; @@ -76116,9 +76050,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/ip_fragment.c linux-2.6.32.46/net/ipv4/ip_fr qp->rid = end; rc = qp->q.fragments && (end - start) > max; -diff -urNp linux-2.6.32.46/net/ipv4/ip_sockglue.c linux-2.6.32.46/net/ipv4/ip_sockglue.c ---- linux-2.6.32.46/net/ipv4/ip_sockglue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/ip_sockglue.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/ip_sockglue.c linux-2.6.32.48/net/ipv4/ip_sockglue.c +--- linux-2.6.32.48/net/ipv4/ip_sockglue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/ip_sockglue.c 2011-11-12 12:46:51.000000000 -0500 @@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock int val; int len; @@ -76137,9 +76071,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/ip_sockglue.c linux-2.6.32.46/net/ipv4/ip_so msg.msg_controllen = len; msg.msg_flags = 0; -diff -urNp linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c ---- linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c 2011-04-17 17:04:18.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c +--- linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/netfilter/arp_tables.c 2011-11-12 12:46:51.000000000 -0500 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi private = &tmp; } @@ -76148,9 +76082,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c linux-2.6.32.46/net/i info.valid_hooks = t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c ---- linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c 2011-08-21 18:42:53.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c +--- linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/netfilter/ip_queue.c 2011-11-12 12:46:51.000000000 -0500 @@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, st if (v->data_len < sizeof(*user_iph)) @@ -76171,9 +76105,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c linux-2.6.32.46/net/ipv struct nlmsghdr *nlh; skblen = skb->len; -diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c ---- linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c 2011-04-17 17:04:18.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/netfilter/ip_tables.c 2011-11-12 12:46:51.000000000 -0500 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi private = &tmp; } @@ -76182,9 +76116,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c linux-2.6.32.46/net/ip info.valid_hooks = t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-12 12:46:51.000000000 -0500 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -76194,9 +76128,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.4 if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.46/net/ipv4/raw.c linux-2.6.32.46/net/ipv4/raw.c ---- linux-2.6.32.46/net/ipv4/raw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/raw.c 2011-08-14 11:46:51.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/raw.c linux-2.6.32.48/net/ipv4/raw.c +--- linux-2.6.32.48/net/ipv4/raw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/raw.c 2011-11-12 12:46:51.000000000 -0500 @@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk, /* Charge it to the socket. */ @@ -76267,9 +76201,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/raw.c linux-2.6.32.46/net/ipv4/raw.c } static int raw_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.46/net/ipv4/route.c linux-2.6.32.46/net/ipv4/route.c ---- linux-2.6.32.46/net/ipv4/route.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/route.c 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/route.c linux-2.6.32.48/net/ipv4/route.c +--- linux-2.6.32.48/net/ipv4/route.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/route.c 2011-11-12 12:46:51.000000000 -0500 @@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be3 static inline int rt_genid(struct net *net) @@ -76297,9 +76231,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/route.c linux-2.6.32.46/net/ipv4/route.c (int) ((num_physpages ^ (num_physpages>>8)) ^ (jiffies ^ (jiffies >> 7)))); -diff -urNp linux-2.6.32.46/net/ipv4/tcp.c linux-2.6.32.46/net/ipv4/tcp.c ---- linux-2.6.32.46/net/ipv4/tcp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp.c linux-2.6.32.48/net/ipv4/tcp.c +--- linux-2.6.32.48/net/ipv4/tcp.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp.c 2011-11-12 12:46:51.000000000 -0500 @@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock int val; int err = 0; @@ -76318,9 +76252,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp.c linux-2.6.32.46/net/ipv4/tcp.c if (get_user(len, optlen)) return -EFAULT; -diff -urNp linux-2.6.32.46/net/ipv4/tcp_ipv4.c linux-2.6.32.46/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.46/net/ipv4/tcp_ipv4.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp_ipv4.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp_ipv4.c linux-2.6.32.48/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp_ipv4.c 2011-11-12 12:46:51.000000000 -0500 @@ -85,6 +85,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; @@ -76416,9 +76350,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp_ipv4.c linux-2.6.32.46/net/ipv4/tcp_ipv4 } #define TMPSZ 150 -diff -urNp linux-2.6.32.46/net/ipv4/tcp_minisocks.c linux-2.6.32.46/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.46/net/ipv4/tcp_minisocks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp_minisocks.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp_minisocks.c linux-2.6.32.48/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp_minisocks.c 2011-11-12 12:46:51.000000000 -0500 @@ -26,6 +26,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -76441,9 +76375,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp_minisocks.c linux-2.6.32.46/net/ipv4/tcp if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-2.6.32.46/net/ipv4/tcp_output.c linux-2.6.32.46/net/ipv4/tcp_output.c ---- linux-2.6.32.46/net/ipv4/tcp_output.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp_output.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp_output.c linux-2.6.32.48/net/ipv4/tcp_output.c +--- linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp_output.c 2011-11-12 12:46:51.000000000 -0500 @@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct s __u8 *md5_hash_location; int mss; @@ -76453,9 +76387,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp_output.c linux-2.6.32.46/net/ipv4/tcp_ou skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC); if (skb == NULL) return NULL; -diff -urNp linux-2.6.32.46/net/ipv4/tcp_probe.c linux-2.6.32.46/net/ipv4/tcp_probe.c ---- linux-2.6.32.46/net/ipv4/tcp_probe.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp_probe.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp_probe.c linux-2.6.32.48/net/ipv4/tcp_probe.c +--- linux-2.6.32.48/net/ipv4/tcp_probe.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp_probe.c 2011-11-12 12:46:51.000000000 -0500 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -76465,9 +76399,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp_probe.c linux-2.6.32.46/net/ipv4/tcp_pro return -EFAULT; cnt += width; } -diff -urNp linux-2.6.32.46/net/ipv4/tcp_timer.c linux-2.6.32.46/net/ipv4/tcp_timer.c ---- linux-2.6.32.46/net/ipv4/tcp_timer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/tcp_timer.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/tcp_timer.c linux-2.6.32.48/net/ipv4/tcp_timer.c +--- linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/tcp_timer.c 2011-11-12 12:46:51.000000000 -0500 @@ -21,6 +21,10 @@ #include <linux/module.h> #include <net/tcp.h> @@ -76493,9 +76427,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/tcp_timer.c linux-2.6.32.46/net/ipv4/tcp_tim if (retransmits_timed_out(sk, retry_until)) { /* Has it gone just too far? */ tcp_write_err(sk); -diff -urNp linux-2.6.32.46/net/ipv4/udp.c linux-2.6.32.46/net/ipv4/udp.c ---- linux-2.6.32.46/net/ipv4/udp.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/net/ipv4/udp.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv4/udp.c linux-2.6.32.48/net/ipv4/udp.c +--- linux-2.6.32.48/net/ipv4/udp.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv4/udp.c 2011-11-12 12:46:51.000000000 -0500 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -76590,9 +76524,9 @@ diff -urNp linux-2.6.32.46/net/ipv4/udp.c linux-2.6.32.46/net/ipv4/udp.c } int udp4_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.46/net/ipv6/addrconf.c linux-2.6.32.46/net/ipv6/addrconf.c ---- linux-2.6.32.46/net/ipv6/addrconf.c 2011-05-10 22:12:02.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/addrconf.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/addrconf.c linux-2.6.32.48/net/ipv6/addrconf.c +--- linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/addrconf.c 2011-11-12 12:46:51.000000000 -0500 @@ -2053,7 +2053,7 @@ int addrconf_set_dstaddr(struct net *net p.iph.ihl = 5; p.iph.protocol = IPPROTO_IPV6; @@ -76602,9 +76536,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/addrconf.c linux-2.6.32.46/net/ipv6/addrconf if (ops->ndo_do_ioctl) { mm_segment_t oldfs = get_fs(); -diff -urNp linux-2.6.32.46/net/ipv6/inet6_connection_sock.c linux-2.6.32.46/net/ipv6/inet6_connection_sock.c ---- linux-2.6.32.46/net/ipv6/inet6_connection_sock.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/inet6_connection_sock.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/inet6_connection_sock.c linux-2.6.32.48/net/ipv6/inet6_connection_sock.c +--- linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/inet6_connection_sock.c 2011-11-12 12:46:51.000000000 -0500 @@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock * #ifdef CONFIG_XFRM { @@ -76623,9 +76557,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/inet6_connection_sock.c linux-2.6.32.46/net/ sk->sk_dst_cache = NULL; dst_release(dst); dst = NULL; -diff -urNp linux-2.6.32.46/net/ipv6/inet6_hashtables.c linux-2.6.32.46/net/ipv6/inet6_hashtables.c ---- linux-2.6.32.46/net/ipv6/inet6_hashtables.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/inet6_hashtables.c 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/inet6_hashtables.c linux-2.6.32.48/net/ipv6/inet6_hashtables.c +--- linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/inet6_hashtables.c 2011-11-12 12:46:51.000000000 -0500 @@ -119,7 +119,7 @@ out: } EXPORT_SYMBOL(__inet6_lookup_established); @@ -76635,30 +76569,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/inet6_hashtables.c linux-2.6.32.46/net/ipv6/ const unsigned short hnum, const struct in6_addr *daddr, const int dif) -diff -urNp linux-2.6.32.46/net/ipv6/ip6_tunnel.c linux-2.6.32.46/net/ipv6/ip6_tunnel.c ---- linux-2.6.32.46/net/ipv6/ip6_tunnel.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/ip6_tunnel.c 2011-08-24 18:52:25.000000000 -0400 -@@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void) - { - int err; - -- err = register_pernet_device(&ip6_tnl_net_ops); -+ err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops); - if (err < 0) - goto out_pernet; - -@@ -1487,7 +1487,7 @@ static int __init ip6_tunnel_init(void) - out_ip6ip6: - xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET); - out_ip4ip6: -- unregister_pernet_device(&ip6_tnl_net_ops); -+ unregister_pernet_gen_device(ip6_tnl_net_id, &ip6_tnl_net_ops); - out_pernet: - return err; - } -diff -urNp linux-2.6.32.46/net/ipv6/ipv6_sockglue.c linux-2.6.32.46/net/ipv6/ipv6_sockglue.c ---- linux-2.6.32.46/net/ipv6/ipv6_sockglue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/ipv6_sockglue.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/ipv6_sockglue.c linux-2.6.32.48/net/ipv6/ipv6_sockglue.c +--- linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/ipv6_sockglue.c 2011-11-12 12:46:53.000000000 -0500 @@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct soc int val, valbool; int retv = -ENOPROTOOPT; @@ -76686,9 +76599,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/ipv6_sockglue.c linux-2.6.32.46/net/ipv6/ipv msg.msg_controllen = len; msg.msg_flags = 0; -diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c ---- linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c 2011-08-21 18:43:32.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c +--- linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/netfilter/ip6_queue.c 2011-11-12 12:46:53.000000000 -0500 @@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, st if (v->data_len < sizeof(*user_iph)) @@ -76709,9 +76622,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.46/net/ip struct nlmsghdr *nlh; skblen = skb->len; -diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c ---- linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:00:52.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c 2011-04-17 17:04:18.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c +--- linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/netfilter/ip6_tables.c 2011-11-12 12:46:53.000000000 -0500 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi private = &tmp; } @@ -76720,9 +76633,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.46/net/i info.valid_hooks = t->valid_hooks; memcpy(info.hook_entry, private->hook_entry, sizeof(info.hook_entry)); -diff -urNp linux-2.6.32.46/net/ipv6/raw.c linux-2.6.32.46/net/ipv6/raw.c ---- linux-2.6.32.46/net/ipv6/raw.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/raw.c 2011-08-14 11:48:20.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/raw.c linux-2.6.32.48/net/ipv6/raw.c +--- linux-2.6.32.48/net/ipv6/raw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/raw.c 2011-11-12 12:46:53.000000000 -0500 @@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct s { if ((raw6_sk(sk)->checksum || sk->sk_filter) && @@ -76837,9 +76750,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/raw.c linux-2.6.32.46/net/ipv6/raw.c } static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.46/net/ipv6/tcp_ipv6.c linux-2.6.32.46/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.46/net/ipv6/tcp_ipv6.c 2011-08-16 20:37:25.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/tcp_ipv6.c 2011-08-07 19:48:09.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/tcp_ipv6.c linux-2.6.32.48/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/tcp_ipv6.c 2011-11-12 12:46:53.000000000 -0500 @@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -76939,9 +76852,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/tcp_ipv6.c linux-2.6.32.46/net/ipv6/tcp_ipv6 } static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.46/net/ipv6/udp.c linux-2.6.32.46/net/ipv6/udp.c ---- linux-2.6.32.46/net/ipv6/udp.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/net/ipv6/udp.c 2011-07-13 17:23:27.000000000 -0400 +diff -urNp linux-2.6.32.48/net/ipv6/udp.c linux-2.6.32.48/net/ipv6/udp.c +--- linux-2.6.32.48/net/ipv6/udp.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/ipv6/udp.c 2011-11-12 12:46:53.000000000 -0500 @@ -49,6 +49,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -76988,9 +76901,9 @@ diff -urNp linux-2.6.32.46/net/ipv6/udp.c linux-2.6.32.46/net/ipv6/udp.c } int udp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/irda/ircomm/ircomm_tty.c 2011-11-12 12:46:53.000000000 -0500 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -77113,9 +77026,9 @@ diff -urNp linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c linux-2.6.32.46/net/irda seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.32.46/net/iucv/af_iucv.c linux-2.6.32.46/net/iucv/af_iucv.c ---- linux-2.6.32.46/net/iucv/af_iucv.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/iucv/af_iucv.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/iucv/af_iucv.c linux-2.6.32.48/net/iucv/af_iucv.c +--- linux-2.6.32.48/net/iucv/af_iucv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/iucv/af_iucv.c 2011-11-12 12:46:53.000000000 -0500 @@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct soc write_lock_bh(&iucv_sk_list.lock); @@ -77129,9 +77042,9 @@ diff -urNp linux-2.6.32.46/net/iucv/af_iucv.c linux-2.6.32.46/net/iucv/af_iucv.c } write_unlock_bh(&iucv_sk_list.lock); -diff -urNp linux-2.6.32.46/net/key/af_key.c linux-2.6.32.46/net/key/af_key.c ---- linux-2.6.32.46/net/key/af_key.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/key/af_key.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/key/af_key.c linux-2.6.32.48/net/key/af_key.c +--- linux-2.6.32.48/net/key/af_key.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/key/af_key.c 2011-11-12 12:46:53.000000000 -0500 @@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_kmaddress k; @@ -77153,9 +77066,9 @@ diff -urNp linux-2.6.32.46/net/key/af_key.c linux-2.6.32.46/net/key/af_key.c atomic_read(&s->sk_refcnt), sk_rmem_alloc_get(s), sk_wmem_alloc_get(s), -diff -urNp linux-2.6.32.46/net/lapb/lapb_iface.c linux-2.6.32.46/net/lapb/lapb_iface.c ---- linux-2.6.32.46/net/lapb/lapb_iface.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/lapb/lapb_iface.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/net/lapb/lapb_iface.c linux-2.6.32.48/net/lapb/lapb_iface.c +--- linux-2.6.32.48/net/lapb/lapb_iface.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/lapb/lapb_iface.c 2011-11-12 12:46:53.000000000 -0500 @@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev goto out; @@ -77219,9 +77132,9 @@ diff -urNp linux-2.6.32.46/net/lapb/lapb_iface.c linux-2.6.32.46/net/lapb/lapb_i used = 1; } -diff -urNp linux-2.6.32.46/net/mac80211/cfg.c linux-2.6.32.46/net/mac80211/cfg.c ---- linux-2.6.32.46/net/mac80211/cfg.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/cfg.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/cfg.c linux-2.6.32.48/net/mac80211/cfg.c +--- linux-2.6.32.48/net/mac80211/cfg.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/cfg.c 2011-11-12 12:46:53.000000000 -0500 @@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st return err; } @@ -77231,9 +77144,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/cfg.c linux-2.6.32.46/net/mac80211/cfg.c .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, .change_virtual_intf = ieee80211_change_iface, -diff -urNp linux-2.6.32.46/net/mac80211/cfg.h linux-2.6.32.46/net/mac80211/cfg.h ---- linux-2.6.32.46/net/mac80211/cfg.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/cfg.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/cfg.h linux-2.6.32.48/net/mac80211/cfg.h +--- linux-2.6.32.48/net/mac80211/cfg.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/cfg.h 2011-11-12 12:46:53.000000000 -0500 @@ -4,6 +4,6 @@ #ifndef __CFG_H #define __CFG_H @@ -77242,9 +77155,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/cfg.h linux-2.6.32.46/net/mac80211/cfg.h +extern const struct cfg80211_ops mac80211_config_ops; #endif /* __CFG_H */ -diff -urNp linux-2.6.32.46/net/mac80211/debugfs_key.c linux-2.6.32.46/net/mac80211/debugfs_key.c ---- linux-2.6.32.46/net/mac80211/debugfs_key.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/debugfs_key.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/debugfs_key.c linux-2.6.32.48/net/mac80211/debugfs_key.c +--- linux-2.6.32.48/net/mac80211/debugfs_key.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/debugfs_key.c 2011-11-12 12:46:53.000000000 -0500 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file size_t count, loff_t *ppos) { @@ -77260,9 +77173,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/debugfs_key.c linux-2.6.32.46/net/mac802 for (i = 0; i < key->conf.keylen; i++) p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]); -diff -urNp linux-2.6.32.46/net/mac80211/debugfs_sta.c linux-2.6.32.46/net/mac80211/debugfs_sta.c ---- linux-2.6.32.46/net/mac80211/debugfs_sta.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/debugfs_sta.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/debugfs_sta.c linux-2.6.32.48/net/mac80211/debugfs_sta.c +--- linux-2.6.32.48/net/mac80211/debugfs_sta.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/debugfs_sta.c 2011-11-12 12:46:53.000000000 -0500 @@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struc int i; struct sta_info *sta = file->private_data; @@ -77272,9 +77185,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/debugfs_sta.c linux-2.6.32.46/net/mac802 spin_lock_bh(&sta->lock); p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n", sta->ampdu_mlme.dialog_token_allocator + 1); -diff -urNp linux-2.6.32.46/net/mac80211/ieee80211_i.h linux-2.6.32.46/net/mac80211/ieee80211_i.h ---- linux-2.6.32.46/net/mac80211/ieee80211_i.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/ieee80211_i.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/ieee80211_i.h linux-2.6.32.48/net/mac80211/ieee80211_i.h +--- linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/ieee80211_i.h 2011-11-12 12:46:53.000000000 -0500 @@ -25,6 +25,7 @@ #include <linux/etherdevice.h> #include <net/cfg80211.h> @@ -77292,9 +77205,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/ieee80211_i.h linux-2.6.32.46/net/mac802 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; -diff -urNp linux-2.6.32.46/net/mac80211/iface.c linux-2.6.32.46/net/mac80211/iface.c ---- linux-2.6.32.46/net/mac80211/iface.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/iface.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/iface.c linux-2.6.32.48/net/mac80211/iface.c +--- linux-2.6.32.48/net/mac80211/iface.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/iface.c 2011-11-12 12:46:53.000000000 -0500 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -77349,9 +77262,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/iface.c linux-2.6.32.46/net/mac80211/ifa ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.46/net/mac80211/main.c linux-2.6.32.46/net/mac80211/main.c ---- linux-2.6.32.46/net/mac80211/main.c 2011-05-10 22:12:02.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/main.c 2011-05-10 22:12:34.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/main.c linux-2.6.32.48/net/mac80211/main.c +--- linux-2.6.32.48/net/mac80211/main.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/main.c 2011-11-12 12:46:53.000000000 -0500 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -77361,9 +77274,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/main.c linux-2.6.32.46/net/mac80211/main ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.46/net/mac80211/mlme.c linux-2.6.32.46/net/mac80211/mlme.c ---- linux-2.6.32.46/net/mac80211/mlme.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/mlme.c 2011-08-09 18:34:01.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/mlme.c linux-2.6.32.48/net/mac80211/mlme.c +--- linux-2.6.32.48/net/mac80211/mlme.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/mlme.c 2011-11-12 12:46:53.000000000 -0500 @@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee bool have_higher_than_11mbit = false, newsta = false; u16 ap_ht_cap_flags; @@ -77373,9 +77286,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/mlme.c linux-2.6.32.46/net/mac80211/mlme /* * AssocResp and ReassocResp have identical structure, so process both * of them in this function. -diff -urNp linux-2.6.32.46/net/mac80211/pm.c linux-2.6.32.46/net/mac80211/pm.c ---- linux-2.6.32.46/net/mac80211/pm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/pm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/pm.c linux-2.6.32.48/net/mac80211/pm.c +--- linux-2.6.32.48/net/mac80211/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/pm.c 2011-11-12 12:46:53.000000000 -0500 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -77385,9 +77298,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/pm.c linux-2.6.32.46/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.46/net/mac80211/rate.c linux-2.6.32.46/net/mac80211/rate.c ---- linux-2.6.32.46/net/mac80211/rate.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/rate.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/rate.c linux-2.6.32.48/net/mac80211/rate.c +--- linux-2.6.32.48/net/mac80211/rate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/rate.c 2011-11-12 12:46:53.000000000 -0500 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -77397,9 +77310,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/rate.c linux-2.6.32.46/net/mac80211/rate return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.46/net/mac80211/tx.c linux-2.6.32.46/net/mac80211/tx.c ---- linux-2.6.32.46/net/mac80211/tx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/tx.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/tx.c linux-2.6.32.48/net/mac80211/tx.c +--- linux-2.6.32.48/net/mac80211/tx.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/tx.c 2011-11-12 12:46:53.000000000 -0500 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct return cpu_to_le16(dur); } @@ -77409,9 +77322,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/tx.c linux-2.6.32.46/net/mac80211/tx.c struct net_device *dev) { return local == wdev_priv(dev->ieee80211_ptr); -diff -urNp linux-2.6.32.46/net/mac80211/util.c linux-2.6.32.46/net/mac80211/util.c ---- linux-2.6.32.46/net/mac80211/util.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/mac80211/util.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/mac80211/util.c linux-2.6.32.48/net/mac80211/util.c +--- linux-2.6.32.48/net/mac80211/util.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/mac80211/util.c 2011-11-12 12:46:53.000000000 -0500 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -77421,9 +77334,9 @@ diff -urNp linux-2.6.32.46/net/mac80211/util.c linux-2.6.32.46/net/mac80211/util /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c 2011-05-17 19:26:34.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_app.c 2011-11-12 12:46:53.000000000 -0500 @@ -564,7 +564,7 @@ static const struct file_operations ip_v .open = ip_vs_app_open, .read = seq_read, @@ -77433,9 +77346,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.46/net/ne }; #endif -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c 2011-05-17 19:26:34.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:46:53.000000000 -0500 @@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s /* if the connection is not template and is created * by sync, preserve the activity flag. @@ -77485,9 +77398,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.46/net/n if (i > 8 || i < 0) return 0; if (!todrop_rate[i]) return 0; -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_core.c 2011-11-12 12:46:53.000000000 -0500 @@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *sv ret = cp->packet_xmit(skb, cp, pp); /* do not touch skb anymore */ @@ -77506,9 +77419,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.46/net/n if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) && (((cp->protocol != IPPROTO_TCP || -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c 2011-05-17 19:26:34.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:46:53.000000000 -0500 @@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service ip_vs_rs_hash(dest); write_unlock_bh(&__ip_vs_rs_lock); @@ -77581,9 +77494,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.46/net/ne NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)); NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold); NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold); -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_sync.c 2011-11-12 12:46:53.000000000 -0500 @@ -438,7 +438,7 @@ static void ip_vs_process_message(const if (opt) @@ -77593,9 +77506,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.46/net/n cp->state = state; cp->old_state = cp->state; /* -diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-12 12:46:53.000000000 -0500 @@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str else rc = NF_ACCEPT; @@ -77614,9 +77527,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.46/net/n goto out; } -diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/Kconfig ---- linux-2.6.32.46/net/netfilter/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/Kconfig linux-2.6.32.48/net/netfilter/Kconfig +--- linux-2.6.32.48/net/netfilter/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/Kconfig 2011-11-12 12:46:53.000000000 -0500 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP To compile it as a module, choose M here. If unsure, say N. @@ -77634,9 +77547,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/K config NETFILTER_XT_MATCH_HASHLIMIT tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) -diff -urNp linux-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/Makefile ---- linux-2.6.32.46/net/netfilter/Makefile 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/Makefile 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/Makefile linux-2.6.32.48/net/netfilter/Makefile +--- linux-2.6.32.48/net/netfilter/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/Makefile 2011-11-12 12:46:53.000000000 -0500 @@ -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 @@ -77645,9 +77558,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o -diff -urNp linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c ---- linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c +--- linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/nf_conntrack_netlink.c 2011-11-12 12:46:53.000000000 -0500 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt static int ctnetlink_parse_tuple(const struct nlattr * const cda[], @@ -77657,9 +77570,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.46/ { struct nlattr *tb[CTA_TUPLE_MAX+1]; int err; -diff -urNp linux-2.6.32.46/net/netfilter/nfnetlink_log.c linux-2.6.32.46/net/netfilter/nfnetlink_log.c ---- linux-2.6.32.46/net/netfilter/nfnetlink_log.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netfilter/nfnetlink_log.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/nfnetlink_log.c linux-2.6.32.48/net/netfilter/nfnetlink_log.c +--- linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/nfnetlink_log.c 2011-11-12 12:46:53.000000000 -0500 @@ -68,7 +68,7 @@ struct nfulnl_instance { }; @@ -77678,9 +77591,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/nfnetlink_log.c linux-2.6.32.46/net/net if (data_len) { struct nlattr *nla; -diff -urNp linux-2.6.32.46/net/netfilter/xt_gradm.c linux-2.6.32.46/net/netfilter/xt_gradm.c ---- linux-2.6.32.46/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/net/netfilter/xt_gradm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netfilter/xt_gradm.c linux-2.6.32.48/net/netfilter/xt_gradm.c +--- linux-2.6.32.48/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/net/netfilter/xt_gradm.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -77733,9 +77646,9 @@ diff -urNp linux-2.6.32.46/net/netfilter/xt_gradm.c linux-2.6.32.46/net/netfilte +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-2.6.32.46/net/netlink/af_netlink.c linux-2.6.32.46/net/netlink/af_netlink.c ---- linux-2.6.32.46/net/netlink/af_netlink.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netlink/af_netlink.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netlink/af_netlink.c linux-2.6.32.48/net/netlink/af_netlink.c +--- linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/netlink/af_netlink.c 2011-11-12 12:46:53.000000000 -0500 @@ -733,7 +733,7 @@ static void netlink_overrun(struct sock sk->sk_error_report(sk); } @@ -77770,9 +77683,9 @@ diff -urNp linux-2.6.32.46/net/netlink/af_netlink.c linux-2.6.32.46/net/netlink/ ); } -diff -urNp linux-2.6.32.46/net/netrom/af_netrom.c linux-2.6.32.46/net/netrom/af_netrom.c ---- linux-2.6.32.46/net/netrom/af_netrom.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/netrom/af_netrom.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/netrom/af_netrom.c linux-2.6.32.48/net/netrom/af_netrom.c +--- linux-2.6.32.48/net/netrom/af_netrom.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/netrom/af_netrom.c 2011-11-12 12:46:53.000000000 -0500 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc struct sock *sk = sock->sk; struct nr_sock *nr = nr_sk(sk); @@ -77789,9 +77702,9 @@ diff -urNp linux-2.6.32.46/net/netrom/af_netrom.c linux-2.6.32.46/net/netrom/af_ sax->fsa_ax25.sax25_call = nr->source_addr; *uaddr_len = sizeof(struct sockaddr_ax25); } -diff -urNp linux-2.6.32.46/net/packet/af_packet.c linux-2.6.32.46/net/packet/af_packet.c ---- linux-2.6.32.46/net/packet/af_packet.c 2011-07-13 17:23:04.000000000 -0400 -+++ linux-2.6.32.46/net/packet/af_packet.c 2011-07-13 17:23:27.000000000 -0400 +diff -urNp linux-2.6.32.48/net/packet/af_packet.c linux-2.6.32.48/net/packet/af_packet.c +--- linux-2.6.32.48/net/packet/af_packet.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/packet/af_packet.c 2011-11-12 12:46:53.000000000 -0500 @@ -2429,7 +2429,11 @@ static int packet_seq_show(struct seq_fi seq_printf(seq, @@ -77804,9 +77717,9 @@ diff -urNp linux-2.6.32.46/net/packet/af_packet.c linux-2.6.32.46/net/packet/af_ atomic_read(&s->sk_refcnt), s->sk_type, ntohs(po->num), -diff -urNp linux-2.6.32.46/net/phonet/af_phonet.c linux-2.6.32.46/net/phonet/af_phonet.c ---- linux-2.6.32.46/net/phonet/af_phonet.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/phonet/af_phonet.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/phonet/af_phonet.c linux-2.6.32.48/net/phonet/af_phonet.c +--- linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/phonet/af_phonet.c 2011-11-12 12:46:53.000000000 -0500 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -77825,9 +77738,9 @@ diff -urNp linux-2.6.32.46/net/phonet/af_phonet.c linux-2.6.32.46/net/phonet/af_ return -EINVAL; err = proto_register(pp->prot, 1); -diff -urNp linux-2.6.32.46/net/phonet/datagram.c linux-2.6.32.46/net/phonet/datagram.c ---- linux-2.6.32.46/net/phonet/datagram.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/phonet/datagram.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/phonet/datagram.c linux-2.6.32.48/net/phonet/datagram.c +--- linux-2.6.32.48/net/phonet/datagram.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/phonet/datagram.c 2011-11-12 12:46:53.000000000 -0500 @@ -162,7 +162,7 @@ static int pn_backlog_rcv(struct sock *s if (err < 0) { kfree_skb(skb); @@ -77837,9 +77750,9 @@ diff -urNp linux-2.6.32.46/net/phonet/datagram.c linux-2.6.32.46/net/phonet/data } return err ? NET_RX_DROP : NET_RX_SUCCESS; } -diff -urNp linux-2.6.32.46/net/phonet/pep.c linux-2.6.32.46/net/phonet/pep.c ---- linux-2.6.32.46/net/phonet/pep.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/phonet/pep.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/phonet/pep.c linux-2.6.32.48/net/phonet/pep.c +--- linux-2.6.32.48/net/phonet/pep.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/phonet/pep.c 2011-11-12 12:46:53.000000000 -0500 @@ -348,7 +348,7 @@ static int pipe_do_rcv(struct sock *sk, case PNS_PEP_CTRL_REQ: @@ -77864,9 +77777,9 @@ diff -urNp linux-2.6.32.46/net/phonet/pep.c linux-2.6.32.46/net/phonet/pep.c err = -ENOBUFS; break; } -diff -urNp linux-2.6.32.46/net/phonet/socket.c linux-2.6.32.46/net/phonet/socket.c ---- linux-2.6.32.46/net/phonet/socket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/phonet/socket.c 2011-05-04 17:57:07.000000000 -0400 +diff -urNp linux-2.6.32.48/net/phonet/socket.c linux-2.6.32.48/net/phonet/socket.c +--- linux-2.6.32.48/net/phonet/socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/phonet/socket.c 2011-11-12 12:46:53.000000000 -0500 @@ -482,8 +482,13 @@ static int pn_sock_seq_show(struct seq_f sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -77883,9 +77796,9 @@ diff -urNp linux-2.6.32.46/net/phonet/socket.c linux-2.6.32.46/net/phonet/socket } seq_printf(seq, "%*s\n", 127 - len, ""); return 0; -diff -urNp linux-2.6.32.46/net/rds/cong.c linux-2.6.32.46/net/rds/cong.c ---- linux-2.6.32.46/net/rds/cong.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rds/cong.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rds/cong.c linux-2.6.32.48/net/rds/cong.c +--- linux-2.6.32.48/net/rds/cong.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rds/cong.c 2011-11-12 12:46:53.000000000 -0500 @@ -77,7 +77,7 @@ * finds that the saved generation number is smaller than the global generation * number, it wakes up the process. @@ -77913,9 +77826,9 @@ diff -urNp linux-2.6.32.46/net/rds/cong.c linux-2.6.32.46/net/rds/cong.c if (likely(*recent == gen)) return 0; -diff -urNp linux-2.6.32.46/net/rds/iw_rdma.c linux-2.6.32.46/net/rds/iw_rdma.c ---- linux-2.6.32.46/net/rds/iw_rdma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rds/iw_rdma.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rds/iw_rdma.c linux-2.6.32.48/net/rds/iw_rdma.c +--- linux-2.6.32.48/net/rds/iw_rdma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rds/iw_rdma.c 2011-11-12 12:46:53.000000000 -0500 @@ -181,6 +181,8 @@ int rds_iw_update_cm_id(struct rds_iw_de struct rdma_cm_id *pcm_id; int rc; @@ -77925,9 +77838,9 @@ diff -urNp linux-2.6.32.46/net/rds/iw_rdma.c linux-2.6.32.46/net/rds/iw_rdma.c src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr; -diff -urNp linux-2.6.32.46/net/rds/Kconfig linux-2.6.32.46/net/rds/Kconfig ---- linux-2.6.32.46/net/rds/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rds/Kconfig 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rds/Kconfig linux-2.6.32.48/net/rds/Kconfig +--- linux-2.6.32.48/net/rds/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rds/Kconfig 2011-11-12 12:46:53.000000000 -0500 @@ -1,7 +1,7 @@ config RDS @@ -77937,9 +77850,9 @@ diff -urNp linux-2.6.32.46/net/rds/Kconfig linux-2.6.32.46/net/rds/Kconfig ---help--- The RDS (Reliable Datagram Sockets) protocol provides reliable, sequenced delivery of datagrams over Infiniband, iWARP, -diff -urNp linux-2.6.32.46/net/rds/tcp.c linux-2.6.32.46/net/rds/tcp.c ---- linux-2.6.32.46/net/rds/tcp.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rds/tcp.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rds/tcp.c linux-2.6.32.48/net/rds/tcp.c +--- linux-2.6.32.48/net/rds/tcp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rds/tcp.c 2011-11-12 12:46:53.000000000 -0500 @@ -57,7 +57,7 @@ void rds_tcp_nonagle(struct socket *sock int val = 1; @@ -77949,9 +77862,9 @@ diff -urNp linux-2.6.32.46/net/rds/tcp.c linux-2.6.32.46/net/rds/tcp.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-2.6.32.46/net/rds/tcp_send.c linux-2.6.32.46/net/rds/tcp_send.c ---- linux-2.6.32.46/net/rds/tcp_send.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rds/tcp_send.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rds/tcp_send.c linux-2.6.32.48/net/rds/tcp_send.c +--- linux-2.6.32.48/net/rds/tcp_send.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rds/tcp_send.c 2011-11-12 12:46:53.000000000 -0500 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket * oldfs = get_fs(); @@ -77961,9 +77874,9 @@ diff -urNp linux-2.6.32.46/net/rds/tcp_send.c linux-2.6.32.46/net/rds/tcp_send.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-2.6.32.46/net/rxrpc/af_rxrpc.c linux-2.6.32.46/net/rxrpc/af_rxrpc.c ---- linux-2.6.32.46/net/rxrpc/af_rxrpc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/af_rxrpc.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/af_rxrpc.c linux-2.6.32.48/net/rxrpc/af_rxrpc.c +--- linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/af_rxrpc.c 2011-11-12 12:46:53.000000000 -0500 @@ -38,7 +38,7 @@ static const struct proto_ops rxrpc_rpc_ __be32 rxrpc_epoch; @@ -77973,9 +77886,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/af_rxrpc.c linux-2.6.32.46/net/rxrpc/af_rxr /* count of skbs currently in use */ atomic_t rxrpc_n_skbs; -diff -urNp linux-2.6.32.46/net/rxrpc/ar-ack.c linux-2.6.32.46/net/rxrpc/ar-ack.c ---- linux-2.6.32.46/net/rxrpc/ar-ack.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-ack.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-ack.c linux-2.6.32.48/net/rxrpc/ar-ack.c +--- linux-2.6.32.48/net/rxrpc/ar-ack.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-ack.c 2011-11-12 12:46:53.000000000 -0500 @@ -174,7 +174,7 @@ static void rxrpc_resend(struct rxrpc_ca _enter("{%d,%d,%d,%d},", @@ -78048,9 +77961,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-ack.c linux-2.6.32.46/net/rxrpc/ar-ack.c _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial)); send_message_2: -diff -urNp linux-2.6.32.46/net/rxrpc/ar-call.c linux-2.6.32.46/net/rxrpc/ar-call.c ---- linux-2.6.32.46/net/rxrpc/ar-call.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-call.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-call.c linux-2.6.32.48/net/rxrpc/ar-call.c +--- linux-2.6.32.48/net/rxrpc/ar-call.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-call.c 2011-11-12 12:46:53.000000000 -0500 @@ -82,7 +82,7 @@ static struct rxrpc_call *rxrpc_alloc_ca spin_lock_init(&call->lock); rwlock_init(&call->state_lock); @@ -78060,9 +77973,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-call.c linux-2.6.32.46/net/rxrpc/ar-call call->state = RXRPC_CALL_CLIENT_SEND_REQUEST; memset(&call->sock_node, 0xed, sizeof(call->sock_node)); -diff -urNp linux-2.6.32.46/net/rxrpc/ar-connection.c linux-2.6.32.46/net/rxrpc/ar-connection.c ---- linux-2.6.32.46/net/rxrpc/ar-connection.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-connection.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-connection.c linux-2.6.32.48/net/rxrpc/ar-connection.c +--- linux-2.6.32.48/net/rxrpc/ar-connection.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-connection.c 2011-11-12 12:46:53.000000000 -0500 @@ -205,7 +205,7 @@ static struct rxrpc_connection *rxrpc_al rwlock_init(&conn->lock); spin_lock_init(&conn->state_lock); @@ -78072,9 +77985,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-connection.c linux-2.6.32.46/net/rxrpc/a conn->avail_calls = RXRPC_MAXCALLS; conn->size_align = 4; conn->header_size = sizeof(struct rxrpc_header); -diff -urNp linux-2.6.32.46/net/rxrpc/ar-connevent.c linux-2.6.32.46/net/rxrpc/ar-connevent.c ---- linux-2.6.32.46/net/rxrpc/ar-connevent.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-connevent.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-connevent.c linux-2.6.32.48/net/rxrpc/ar-connevent.c +--- linux-2.6.32.48/net/rxrpc/ar-connevent.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-connevent.c 2011-11-12 12:46:53.000000000 -0500 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct len = iov[0].iov_len + iov[1].iov_len; @@ -78084,9 +77997,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-connevent.c linux-2.6.32.46/net/rxrpc/ar _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -diff -urNp linux-2.6.32.46/net/rxrpc/ar-input.c linux-2.6.32.46/net/rxrpc/ar-input.c ---- linux-2.6.32.46/net/rxrpc/ar-input.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-input.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-input.c linux-2.6.32.48/net/rxrpc/ar-input.c +--- linux-2.6.32.48/net/rxrpc/ar-input.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-input.c 2011-11-12 12:46:53.000000000 -0500 @@ -339,9 +339,9 @@ void rxrpc_fast_process_packet(struct rx /* track the latest serial number on this connection for ACK packet * information */ @@ -78099,9 +78012,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-input.c linux-2.6.32.46/net/rxrpc/ar-inp serial); /* request ACK generation for any ACK or DATA packet that requests -diff -urNp linux-2.6.32.46/net/rxrpc/ar-internal.h linux-2.6.32.46/net/rxrpc/ar-internal.h ---- linux-2.6.32.46/net/rxrpc/ar-internal.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-internal.h 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-internal.h linux-2.6.32.48/net/rxrpc/ar-internal.h +--- linux-2.6.32.48/net/rxrpc/ar-internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-internal.h 2011-11-12 12:46:53.000000000 -0500 @@ -272,8 +272,8 @@ struct rxrpc_connection { int error; /* error code for local abort */ int debug_id; /* debug ID for printks */ @@ -78131,9 +78044,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-internal.h linux-2.6.32.46/net/rxrpc/ar- extern struct workqueue_struct *rxrpc_workqueue; /* -diff -urNp linux-2.6.32.46/net/rxrpc/ar-key.c linux-2.6.32.46/net/rxrpc/ar-key.c ---- linux-2.6.32.46/net/rxrpc/ar-key.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-key.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-key.c linux-2.6.32.48/net/rxrpc/ar-key.c +--- linux-2.6.32.48/net/rxrpc/ar-key.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-key.c 2011-11-12 12:46:53.000000000 -0500 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s return ret; @@ -78161,9 +78074,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-key.c linux-2.6.32.46/net/rxrpc/ar-key.c if (!token->kad) goto error_free; -diff -urNp linux-2.6.32.46/net/rxrpc/ar-local.c linux-2.6.32.46/net/rxrpc/ar-local.c ---- linux-2.6.32.46/net/rxrpc/ar-local.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-local.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-local.c linux-2.6.32.48/net/rxrpc/ar-local.c +--- linux-2.6.32.48/net/rxrpc/ar-local.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-local.c 2011-11-12 12:46:53.000000000 -0500 @@ -44,7 +44,7 @@ struct rxrpc_local *rxrpc_alloc_local(st spin_lock_init(&local->lock); rwlock_init(&local->services_lock); @@ -78173,9 +78086,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-local.c linux-2.6.32.46/net/rxrpc/ar-loc memcpy(&local->srx, srx, sizeof(*srx)); } -diff -urNp linux-2.6.32.46/net/rxrpc/ar-output.c linux-2.6.32.46/net/rxrpc/ar-output.c ---- linux-2.6.32.46/net/rxrpc/ar-output.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-output.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-output.c linux-2.6.32.48/net/rxrpc/ar-output.c +--- linux-2.6.32.48/net/rxrpc/ar-output.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-output.c 2011-11-12 12:46:53.000000000 -0500 @@ -680,9 +680,9 @@ static int rxrpc_send_data(struct kiocb sp->hdr.cid = call->cid; sp->hdr.callNumber = call->call_id; @@ -78188,9 +78101,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-output.c linux-2.6.32.46/net/rxrpc/ar-ou sp->hdr.type = RXRPC_PACKET_TYPE_DATA; sp->hdr.userStatus = 0; sp->hdr.securityIndex = conn->security_ix; -diff -urNp linux-2.6.32.46/net/rxrpc/ar-peer.c linux-2.6.32.46/net/rxrpc/ar-peer.c ---- linux-2.6.32.46/net/rxrpc/ar-peer.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-peer.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-peer.c linux-2.6.32.48/net/rxrpc/ar-peer.c +--- linux-2.6.32.48/net/rxrpc/ar-peer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-peer.c 2011-11-12 12:46:53.000000000 -0500 @@ -86,7 +86,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe INIT_LIST_HEAD(&peer->error_targets); spin_lock_init(&peer->lock); @@ -78200,9 +78113,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-peer.c linux-2.6.32.46/net/rxrpc/ar-peer memcpy(&peer->srx, srx, sizeof(*srx)); rxrpc_assess_MTU_size(peer); -diff -urNp linux-2.6.32.46/net/rxrpc/ar-proc.c linux-2.6.32.46/net/rxrpc/ar-proc.c ---- linux-2.6.32.46/net/rxrpc/ar-proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-proc.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-proc.c linux-2.6.32.48/net/rxrpc/ar-proc.c +--- linux-2.6.32.48/net/rxrpc/ar-proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-proc.c 2011-11-12 12:46:53.000000000 -0500 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str atomic_read(&conn->usage), rxrpc_conn_states[conn->state], @@ -78214,9 +78127,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-proc.c linux-2.6.32.46/net/rxrpc/ar-proc return 0; } -diff -urNp linux-2.6.32.46/net/rxrpc/ar-transport.c linux-2.6.32.46/net/rxrpc/ar-transport.c ---- linux-2.6.32.46/net/rxrpc/ar-transport.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/ar-transport.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/ar-transport.c linux-2.6.32.48/net/rxrpc/ar-transport.c +--- linux-2.6.32.48/net/rxrpc/ar-transport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/ar-transport.c 2011-11-12 12:46:53.000000000 -0500 @@ -46,7 +46,7 @@ static struct rxrpc_transport *rxrpc_all spin_lock_init(&trans->client_lock); rwlock_init(&trans->conn_lock); @@ -78226,9 +78139,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/ar-transport.c linux-2.6.32.46/net/rxrpc/ar if (peer->srx.transport.family == AF_INET) { switch (peer->srx.transport_type) { -diff -urNp linux-2.6.32.46/net/rxrpc/rxkad.c linux-2.6.32.46/net/rxrpc/rxkad.c ---- linux-2.6.32.46/net/rxrpc/rxkad.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/rxrpc/rxkad.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/rxrpc/rxkad.c linux-2.6.32.48/net/rxrpc/rxkad.c +--- linux-2.6.32.48/net/rxrpc/rxkad.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/rxrpc/rxkad.c 2011-11-12 12:46:53.000000000 -0500 @@ -210,6 +210,8 @@ static int rxkad_secure_packet_encrypt(c u16 check; int nsg; @@ -78265,9 +78178,9 @@ diff -urNp linux-2.6.32.46/net/rxrpc/rxkad.c linux-2.6.32.46/net/rxrpc/rxkad.c _proto("Tx RESPONSE %%%u", ntohl(hdr->serial)); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); -diff -urNp linux-2.6.32.46/net/sctp/proc.c linux-2.6.32.46/net/sctp/proc.c ---- linux-2.6.32.46/net/sctp/proc.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sctp/proc.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sctp/proc.c linux-2.6.32.48/net/sctp/proc.c +--- linux-2.6.32.48/net/sctp/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sctp/proc.c 2011-11-12 12:46:53.000000000 -0500 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_ sctp_for_each_hentry(epb, node, &head->chain) { ep = sctp_ep(epb); @@ -78296,9 +78209,9 @@ diff -urNp linux-2.6.32.46/net/sctp/proc.c linux-2.6.32.46/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-2.6.32.46/net/sctp/socket.c linux-2.6.32.46/net/sctp/socket.c ---- linux-2.6.32.46/net/sctp/socket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sctp/socket.c 2011-04-23 12:56:11.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sctp/socket.c linux-2.6.32.48/net/sctp/socket.c +--- linux-2.6.32.48/net/sctp/socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sctp/socket.c 2011-11-12 12:46:53.000000000 -0500 @@ -5802,7 +5802,6 @@ pp_found: */ int reuse = sk->sk_reuse; @@ -78307,9 +78220,9 @@ diff -urNp linux-2.6.32.46/net/sctp/socket.c linux-2.6.32.46/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.32.46/net/socket.c linux-2.6.32.46/net/socket.c ---- linux-2.6.32.46/net/socket.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/socket.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/socket.c linux-2.6.32.48/net/socket.c +--- linux-2.6.32.48/net/socket.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/socket.c 2011-11-12 12:46:53.000000000 -0500 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -78491,9 +78404,9 @@ diff -urNp linux-2.6.32.46/net/socket.c linux-2.6.32.46/net/socket.c uaddr_len = COMPAT_NAMELEN(msg); if (MSG_CMSG_COMPAT & flags) { err = verify_compat_iovec(&msg_sys, iov, -diff -urNp linux-2.6.32.46/net/sunrpc/sched.c linux-2.6.32.46/net/sunrpc/sched.c ---- linux-2.6.32.46/net/sunrpc/sched.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/net/sunrpc/sched.c 2011-08-09 18:34:01.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sunrpc/sched.c linux-2.6.32.48/net/sunrpc/sched.c +--- linux-2.6.32.48/net/sunrpc/sched.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/sunrpc/sched.c 2011-11-12 12:46:53.000000000 -0500 @@ -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) @@ -78507,9 +78420,9 @@ diff -urNp linux-2.6.32.46/net/sunrpc/sched.c linux-2.6.32.46/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-12 12:46:53.000000000 -0500 @@ -59,15 +59,15 @@ unsigned int svcrdma_max_req_size = RPCR static unsigned int min_max_inline = 4096; static unsigned int max_max_inline = 65536; @@ -78617,9 +78530,9 @@ diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.46/net/su .mode = 0644, .proc_handler = &read_reset_stat, }, -diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ---- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-12 12:46:53.000000000 -0500 @@ -495,7 +495,7 @@ next_sge: svc_rdma_put_context(ctxt, 0); goto out; @@ -78647,9 +78560,9 @@ diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32. /* Build up the XDR from the receive buffers. */ rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len); -diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c ---- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c +--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-12 12:46:53.000000000 -0500 @@ -328,7 +328,7 @@ static int send_write(struct svcxprt_rdm write_wr.wr.rdma.remote_addr = to; @@ -78659,9 +78572,9 @@ diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.46 if (svc_rdma_send(xprt, &write_wr)) goto err; return 0; -diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c ---- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c +--- linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-12 12:46:53.000000000 -0500 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rd return; @@ -78707,9 +78620,9 @@ diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32 /* See if we can opportunistically reap SQ WR to make room */ sq_cq_reap(xprt); -diff -urNp linux-2.6.32.46/net/sysctl_net.c linux-2.6.32.46/net/sysctl_net.c ---- linux-2.6.32.46/net/sysctl_net.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/sysctl_net.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/sysctl_net.c linux-2.6.32.48/net/sysctl_net.c +--- linux-2.6.32.48/net/sysctl_net.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/sysctl_net.c 2011-11-12 12:46:53.000000000 -0500 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -78719,9 +78632,9 @@ diff -urNp linux-2.6.32.46/net/sysctl_net.c linux-2.6.32.46/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.46/net/tipc/link.c linux-2.6.32.46/net/tipc/link.c ---- linux-2.6.32.46/net/tipc/link.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/tipc/link.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/tipc/link.c linux-2.6.32.48/net/tipc/link.c +--- linux-2.6.32.48/net/tipc/link.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/tipc/link.c 2011-11-12 12:46:53.000000000 -0500 @@ -1418,7 +1418,7 @@ again: if (!sect_rest) { @@ -78740,9 +78653,9 @@ diff -urNp linux-2.6.32.46/net/tipc/link.c linux-2.6.32.46/net/tipc/link.c sect_crs += sz; sect_rest -= sz; fragm_crs += sz; -diff -urNp linux-2.6.32.46/net/tipc/subscr.c linux-2.6.32.46/net/tipc/subscr.c ---- linux-2.6.32.46/net/tipc/subscr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/tipc/subscr.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/net/tipc/subscr.c linux-2.6.32.48/net/tipc/subscr.c +--- linux-2.6.32.48/net/tipc/subscr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/tipc/subscr.c 2011-11-12 12:46:53.000000000 -0500 @@ -104,7 +104,7 @@ static void subscr_send_event(struct sub { struct iovec msg_sect; @@ -78752,9 +78665,9 @@ diff -urNp linux-2.6.32.46/net/tipc/subscr.c linux-2.6.32.46/net/tipc/subscr.c msg_sect.iov_len = sizeof(struct tipc_event); sub->evt.event = htohl(event, sub->swap); -diff -urNp linux-2.6.32.46/net/unix/af_unix.c linux-2.6.32.46/net/unix/af_unix.c ---- linux-2.6.32.46/net/unix/af_unix.c 2011-05-10 22:12:02.000000000 -0400 -+++ linux-2.6.32.46/net/unix/af_unix.c 2011-07-18 18:17:33.000000000 -0400 +diff -urNp linux-2.6.32.48/net/unix/af_unix.c linux-2.6.32.48/net/unix/af_unix.c +--- linux-2.6.32.48/net/unix/af_unix.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/unix/af_unix.c 2011-11-12 12:46:53.000000000 -0500 @@ -745,6 +745,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -78813,9 +78726,9 @@ diff -urNp linux-2.6.32.46/net/unix/af_unix.c linux-2.6.32.46/net/unix/af_unix.c atomic_read(&s->sk_refcnt), 0, s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, -diff -urNp linux-2.6.32.46/net/wireless/core.h linux-2.6.32.46/net/wireless/core.h ---- linux-2.6.32.46/net/wireless/core.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/wireless/core.h 2011-08-23 21:22:38.000000000 -0400 +diff -urNp linux-2.6.32.48/net/wireless/core.h linux-2.6.32.48/net/wireless/core.h +--- linux-2.6.32.48/net/wireless/core.h 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/wireless/core.h 2011-11-12 12:46:53.000000000 -0500 @@ -27,7 +27,7 @@ struct cfg80211_registered_device { struct mutex mtx; @@ -78825,9 +78738,9 @@ diff -urNp linux-2.6.32.46/net/wireless/core.h linux-2.6.32.46/net/wireless/core struct rfkill *rfkill; struct work_struct rfkill_sync; -diff -urNp linux-2.6.32.46/net/wireless/wext.c linux-2.6.32.46/net/wireless/wext.c ---- linux-2.6.32.46/net/wireless/wext.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/wireless/wext.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/net/wireless/wext.c linux-2.6.32.48/net/wireless/wext.c +--- linux-2.6.32.48/net/wireless/wext.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/net/wireless/wext.c 2011-11-12 12:46:53.000000000 -0500 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc */ @@ -78861,9 +78774,9 @@ diff -urNp linux-2.6.32.46/net/wireless/wext.c linux-2.6.32.46/net/wireless/wext err = handler(dev, info, (union iwreq_data *) iwp, extra); iwp->length += essid_compat; -diff -urNp linux-2.6.32.46/net/xfrm/xfrm_policy.c linux-2.6.32.46/net/xfrm/xfrm_policy.c ---- linux-2.6.32.46/net/xfrm/xfrm_policy.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/xfrm/xfrm_policy.c 2011-05-04 17:56:20.000000000 -0400 +diff -urNp linux-2.6.32.48/net/xfrm/xfrm_policy.c linux-2.6.32.48/net/xfrm/xfrm_policy.c +--- linux-2.6.32.48/net/xfrm/xfrm_policy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/xfrm/xfrm_policy.c 2011-11-12 12:46:53.000000000 -0500 @@ -586,7 +586,7 @@ int xfrm_policy_insert(int dir, struct x hlist_add_head(&policy->bydst, chain); xfrm_pol_hold(policy); @@ -78954,9 +78867,9 @@ diff -urNp linux-2.6.32.46/net/xfrm/xfrm_policy.c linux-2.6.32.46/net/xfrm/xfrm_ xfrm_pols_put(pols, npols); goto restart; } -diff -urNp linux-2.6.32.46/net/xfrm/xfrm_user.c linux-2.6.32.46/net/xfrm/xfrm_user.c ---- linux-2.6.32.46/net/xfrm/xfrm_user.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/net/xfrm/xfrm_user.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/net/xfrm/xfrm_user.c linux-2.6.32.48/net/xfrm/xfrm_user.c +--- linux-2.6.32.48/net/xfrm/xfrm_user.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/net/xfrm/xfrm_user.c 2011-11-12 12:46:53.000000000 -0500 @@ -1169,6 +1169,8 @@ static int copy_to_user_tmpl(struct xfrm struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH]; int i; @@ -78975,9 +78888,9 @@ diff -urNp linux-2.6.32.46/net/xfrm/xfrm_user.c linux-2.6.32.46/net/xfrm/xfrm_us if (attrs[XFRMA_MIGRATE] == NULL) return -EINVAL; -diff -urNp linux-2.6.32.46/samples/kobject/kset-example.c linux-2.6.32.46/samples/kobject/kset-example.c ---- linux-2.6.32.46/samples/kobject/kset-example.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/samples/kobject/kset-example.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/samples/kobject/kset-example.c linux-2.6.32.48/samples/kobject/kset-example.c +--- linux-2.6.32.48/samples/kobject/kset-example.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/samples/kobject/kset-example.c 2011-11-12 12:46:53.000000000 -0500 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -78987,9 +78900,9 @@ diff -urNp linux-2.6.32.46/samples/kobject/kset-example.c linux-2.6.32.46/sample .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.46/scripts/basic/fixdep.c linux-2.6.32.46/scripts/basic/fixdep.c ---- linux-2.6.32.46/scripts/basic/fixdep.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/basic/fixdep.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/basic/fixdep.c linux-2.6.32.48/scripts/basic/fixdep.c +--- linux-2.6.32.48/scripts/basic/fixdep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/basic/fixdep.c 2011-11-12 12:46:53.000000000 -0500 @@ -162,7 +162,7 @@ static void grow_config(int len) /* * Lookup a value in the configuration string. @@ -79029,15 +78942,15 @@ diff -urNp linux-2.6.32.46/scripts/basic/fixdep.c linux-2.6.32.46/scripts/basic/ if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.46/scripts/gcc-plugin.sh linux-2.6.32.46/scripts/gcc-plugin.sh ---- linux-2.6.32.46/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/scripts/gcc-plugin.sh 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/gcc-plugin.sh linux-2.6.32.48/scripts/gcc-plugin.sh +--- linux-2.6.32.48/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/scripts/gcc-plugin.sh 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,2 @@ +#!/bin/sh +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y" -diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/scripts/Makefile.build ---- linux-2.6.32.46/scripts/Makefile.build 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/Makefile.build 2011-08-23 20:45:11.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/Makefile.build linux-2.6.32.48/scripts/Makefile.build +--- linux-2.6.32.48/scripts/Makefile.build 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/Makefile.build 2011-11-12 12:46:53.000000000 -0500 @@ -59,7 +59,7 @@ endif endif @@ -79047,9 +78960,9 @@ diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/scripts/Makefi include scripts/Makefile.host endif -diff -urNp linux-2.6.32.46/scripts/Makefile.clean linux-2.6.32.46/scripts/Makefile.clean ---- linux-2.6.32.46/scripts/Makefile.clean 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/Makefile.clean 2011-06-04 20:47:19.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/Makefile.clean linux-2.6.32.48/scripts/Makefile.clean +--- linux-2.6.32.48/scripts/Makefile.clean 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/Makefile.clean 2011-11-12 12:46:53.000000000 -0500 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd __clean-files := $(extra-y) $(always) \ $(targets) $(clean-files) \ @@ -79060,9 +78973,9 @@ diff -urNp linux-2.6.32.46/scripts/Makefile.clean linux-2.6.32.46/scripts/Makefi # as clean-files is given relative to the current directory, this adds # a $(obj) prefix, except for absolute paths -diff -urNp linux-2.6.32.46/scripts/Makefile.host linux-2.6.32.46/scripts/Makefile.host ---- linux-2.6.32.46/scripts/Makefile.host 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/Makefile.host 2011-06-04 20:48:22.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/Makefile.host linux-2.6.32.48/scripts/Makefile.host +--- linux-2.6.32.48/scripts/Makefile.host 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/Makefile.host 2011-11-12 12:46:53.000000000 -0500 @@ -31,6 +31,7 @@ # Note: Shared libraries consisting of C++ files are not supported @@ -79079,9 +78992,9 @@ diff -urNp linux-2.6.32.46/scripts/Makefile.host linux-2.6.32.46/scripts/Makefil # Remove .so files from "xxx-objs" host-cobjs := $(filter-out %.so,$(host-cobjs)) -diff -urNp linux-2.6.32.46/scripts/mod/file2alias.c linux-2.6.32.46/scripts/mod/file2alias.c ---- linux-2.6.32.46/scripts/mod/file2alias.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/mod/file2alias.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/mod/file2alias.c linux-2.6.32.48/scripts/mod/file2alias.c +--- linux-2.6.32.48/scripts/mod/file2alias.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/mod/file2alias.c 2011-11-12 12:46:53.000000000 -0500 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -79145,9 +79058,9 @@ diff -urNp linux-2.6.32.46/scripts/mod/file2alias.c linux-2.6.32.46/scripts/mod/ sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.46/scripts/mod/modpost.c linux-2.6.32.46/scripts/mod/modpost.c ---- linux-2.6.32.46/scripts/mod/modpost.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/mod/modpost.c 2011-07-06 19:53:33.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/mod/modpost.c linux-2.6.32.48/scripts/mod/modpost.c +--- linux-2.6.32.48/scripts/mod/modpost.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/scripts/mod/modpost.c 2011-11-12 12:46:53.000000000 -0500 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -79224,9 +79137,9 @@ diff -urNp linux-2.6.32.46/scripts/mod/modpost.c linux-2.6.32.46/scripts/mod/mod goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.46/scripts/mod/modpost.h linux-2.6.32.46/scripts/mod/modpost.h ---- linux-2.6.32.46/scripts/mod/modpost.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/mod/modpost.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/mod/modpost.h linux-2.6.32.48/scripts/mod/modpost.h +--- linux-2.6.32.48/scripts/mod/modpost.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/mod/modpost.h 2011-11-12 12:46:53.000000000 -0500 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -79246,9 +79159,9 @@ diff -urNp linux-2.6.32.46/scripts/mod/modpost.h linux-2.6.32.46/scripts/mod/mod struct module { struct module *next; -diff -urNp linux-2.6.32.46/scripts/mod/sumversion.c linux-2.6.32.46/scripts/mod/sumversion.c ---- linux-2.6.32.46/scripts/mod/sumversion.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/mod/sumversion.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/mod/sumversion.c linux-2.6.32.48/scripts/mod/sumversion.c +--- linux-2.6.32.48/scripts/mod/sumversion.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/mod/sumversion.c 2011-11-12 12:46:53.000000000 -0500 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -79258,9 +79171,9 @@ diff -urNp linux-2.6.32.46/scripts/mod/sumversion.c linux-2.6.32.46/scripts/mod/ warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.46/scripts/package/mkspec linux-2.6.32.46/scripts/package/mkspec ---- linux-2.6.32.46/scripts/package/mkspec 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/package/mkspec 2011-07-19 18:19:12.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/package/mkspec linux-2.6.32.48/scripts/package/mkspec +--- linux-2.6.32.48/scripts/package/mkspec 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/package/mkspec 2011-11-12 12:46:53.000000000 -0500 @@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware' echo "%endif" @@ -79270,9 +79183,9 @@ diff -urNp linux-2.6.32.46/scripts/package/mkspec linux-2.6.32.46/scripts/packag echo "%ifarch ia64" echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE" echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/" -diff -urNp linux-2.6.32.46/scripts/pnmtologo.c linux-2.6.32.46/scripts/pnmtologo.c ---- linux-2.6.32.46/scripts/pnmtologo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/pnmtologo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/pnmtologo.c linux-2.6.32.48/scripts/pnmtologo.c +--- linux-2.6.32.48/scripts/pnmtologo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/pnmtologo.c 2011-11-12 12:46:53.000000000 -0500 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -79299,9 +79212,9 @@ diff -urNp linux-2.6.32.46/scripts/pnmtologo.c linux-2.6.32.46/scripts/pnmtologo logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.46/scripts/tags.sh linux-2.6.32.46/scripts/tags.sh ---- linux-2.6.32.46/scripts/tags.sh 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/scripts/tags.sh 2011-06-07 18:06:04.000000000 -0400 +diff -urNp linux-2.6.32.48/scripts/tags.sh linux-2.6.32.48/scripts/tags.sh +--- linux-2.6.32.48/scripts/tags.sh 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/scripts/tags.sh 2011-11-12 12:46:53.000000000 -0500 @@ -93,6 +93,11 @@ docscope() cscope -b -f cscope.out } @@ -79325,9 +79238,9 @@ diff -urNp linux-2.6.32.46/scripts/tags.sh linux-2.6.32.46/scripts/tags.sh "tags") rm -f tags xtags ctags -diff -urNp linux-2.6.32.46/security/capability.c linux-2.6.32.46/security/capability.c ---- linux-2.6.32.46/security/capability.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/capability.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/capability.c linux-2.6.32.48/security/capability.c +--- linux-2.6.32.48/security/capability.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/capability.c 2011-11-12 12:46:53.000000000 -0500 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls } #endif /* CONFIG_AUDIT */ @@ -79337,9 +79250,9 @@ diff -urNp linux-2.6.32.46/security/capability.c linux-2.6.32.46/security/capabi .name = "default", }; -diff -urNp linux-2.6.32.46/security/commoncap.c linux-2.6.32.46/security/commoncap.c ---- linux-2.6.32.46/security/commoncap.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/commoncap.c 2011-08-17 19:22:13.000000000 -0400 +diff -urNp linux-2.6.32.48/security/commoncap.c linux-2.6.32.48/security/commoncap.c +--- linux-2.6.32.48/security/commoncap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/commoncap.c 2011-11-12 12:46:53.000000000 -0500 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -79378,9 +79291,9 @@ diff -urNp linux-2.6.32.46/security/commoncap.c linux-2.6.32.46/security/commonc if (cred->uid != 0) { if (bprm->cap_effective) return 1; -diff -urNp linux-2.6.32.46/security/integrity/ima/ima_api.c linux-2.6.32.46/security/integrity/ima/ima_api.c ---- linux-2.6.32.46/security/integrity/ima/ima_api.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/integrity/ima/ima_api.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/integrity/ima/ima_api.c linux-2.6.32.48/security/integrity/ima/ima_api.c +--- linux-2.6.32.48/security/integrity/ima/ima_api.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/integrity/ima/ima_api.c 2011-11-12 12:46:53.000000000 -0500 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -79390,9 +79303,9 @@ diff -urNp linux-2.6.32.46/security/integrity/ima/ima_api.c linux-2.6.32.46/secu entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.46/security/integrity/ima/ima_fs.c linux-2.6.32.46/security/integrity/ima/ima_fs.c ---- linux-2.6.32.46/security/integrity/ima/ima_fs.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/integrity/ima/ima_fs.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/integrity/ima/ima_fs.c linux-2.6.32.48/security/integrity/ima/ima_fs.c +--- linux-2.6.32.48/security/integrity/ima/ima_fs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/integrity/ima/ima_fs.c 2011-11-12 12:46:53.000000000 -0500 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -79408,9 +79321,9 @@ diff -urNp linux-2.6.32.46/security/integrity/ima/ima_fs.c linux-2.6.32.46/secur return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.46/security/integrity/ima/ima.h linux-2.6.32.46/security/integrity/ima/ima.h ---- linux-2.6.32.46/security/integrity/ima/ima.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/integrity/ima/ima.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/integrity/ima/ima.h linux-2.6.32.48/security/integrity/ima/ima.h +--- linux-2.6.32.48/security/integrity/ima/ima.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/integrity/ima/ima.h 2011-11-12 12:46:53.000000000 -0500 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -79422,9 +79335,9 @@ diff -urNp linux-2.6.32.46/security/integrity/ima/ima.h linux-2.6.32.46/security struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.46/security/integrity/ima/ima_queue.c linux-2.6.32.46/security/integrity/ima/ima_queue.c ---- linux-2.6.32.46/security/integrity/ima/ima_queue.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/integrity/ima/ima_queue.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/integrity/ima/ima_queue.c linux-2.6.32.48/security/integrity/ima/ima_queue.c +--- linux-2.6.32.48/security/integrity/ima/ima_queue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/integrity/ima/ima_queue.c 2011-11-12 12:46:53.000000000 -0500 @@ -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); @@ -79434,9 +79347,9 @@ diff -urNp linux-2.6.32.46/security/integrity/ima/ima_queue.c linux-2.6.32.46/se key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.46/security/Kconfig linux-2.6.32.46/security/Kconfig ---- linux-2.6.32.46/security/Kconfig 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/Kconfig 2011-10-06 09:38:20.000000000 -0400 +diff -urNp linux-2.6.32.48/security/Kconfig linux-2.6.32.48/security/Kconfig +--- linux-2.6.32.48/security/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/Kconfig 2011-11-12 12:46:53.000000000 -0500 @@ -4,6 +4,559 @@ menu "Security options" @@ -80006,9 +79919,9 @@ diff -urNp linux-2.6.32.46/security/Kconfig linux-2.6.32.46/security/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-2.6.32.46/security/keys/keyring.c linux-2.6.32.46/security/keys/keyring.c ---- linux-2.6.32.46/security/keys/keyring.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/keys/keyring.c 2011-04-18 22:03:00.000000000 -0400 +diff -urNp linux-2.6.32.48/security/keys/keyring.c linux-2.6.32.48/security/keys/keyring.c +--- linux-2.6.32.48/security/keys/keyring.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/security/keys/keyring.c 2011-11-12 12:46:53.000000000 -0500 @@ -214,15 +214,15 @@ static long keyring_read(const struct ke ret = -EFAULT; @@ -80028,9 +79941,9 @@ diff -urNp linux-2.6.32.46/security/keys/keyring.c linux-2.6.32.46/security/keys goto error; buflen -= tmp; -diff -urNp linux-2.6.32.46/security/min_addr.c linux-2.6.32.46/security/min_addr.c ---- linux-2.6.32.46/security/min_addr.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/min_addr.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/min_addr.c linux-2.6.32.48/security/min_addr.c +--- linux-2.6.32.48/security/min_addr.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/security/min_addr.c 2011-11-12 12:46:53.000000000 -0500 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -80047,9 +79960,9 @@ diff -urNp linux-2.6.32.46/security/min_addr.c linux-2.6.32.46/security/min_addr } /* -diff -urNp linux-2.6.32.46/security/root_plug.c linux-2.6.32.46/security/root_plug.c ---- linux-2.6.32.46/security/root_plug.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/root_plug.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/root_plug.c linux-2.6.32.48/security/root_plug.c +--- linux-2.6.32.48/security/root_plug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/root_plug.c 2011-11-12 12:46:53.000000000 -0500 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security return 0; } @@ -80059,9 +79972,9 @@ diff -urNp linux-2.6.32.46/security/root_plug.c linux-2.6.32.46/security/root_pl .bprm_check_security = rootplug_bprm_check_security, }; -diff -urNp linux-2.6.32.46/security/security.c linux-2.6.32.46/security/security.c ---- linux-2.6.32.46/security/security.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/security.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/security.c linux-2.6.32.48/security/security.c +--- linux-2.6.32.48/security/security.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/security.c 2011-11-12 12:46:53.000000000 -0500 @@ -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); @@ -80080,9 +79993,9 @@ diff -urNp linux-2.6.32.46/security/security.c linux-2.6.32.46/security/security { if (verify(ops)) { printk(KERN_DEBUG "%s could not verify " -diff -urNp linux-2.6.32.46/security/selinux/hooks.c linux-2.6.32.46/security/selinux/hooks.c ---- linux-2.6.32.46/security/selinux/hooks.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/selinux/hooks.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/selinux/hooks.c linux-2.6.32.48/security/selinux/hooks.c +--- linux-2.6.32.48/security/selinux/hooks.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/security/selinux/hooks.c 2011-11-12 12:46:53.000000000 -0500 @@ -131,7 +131,7 @@ int selinux_enabled = 1; * Minimal support for a secondary security module, * just to allow the use of the capability module. @@ -80111,9 +80024,9 @@ diff -urNp linux-2.6.32.46/security/selinux/hooks.c linux-2.6.32.46/security/sel /* Unregister netfilter hooks. */ selinux_nf_ip_exit(); -diff -urNp linux-2.6.32.46/security/selinux/include/xfrm.h linux-2.6.32.46/security/selinux/include/xfrm.h ---- linux-2.6.32.46/security/selinux/include/xfrm.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/selinux/include/xfrm.h 2011-05-18 20:09:37.000000000 -0400 +diff -urNp linux-2.6.32.48/security/selinux/include/xfrm.h linux-2.6.32.48/security/selinux/include/xfrm.h +--- linux-2.6.32.48/security/selinux/include/xfrm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/selinux/include/xfrm.h 2011-11-12 12:46:53.000000000 -0500 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s static inline void selinux_xfrm_notify_policyload(void) @@ -80123,9 +80036,9 @@ diff -urNp linux-2.6.32.46/security/selinux/include/xfrm.h linux-2.6.32.46/secur } #else static inline int selinux_xfrm_enabled(void) -diff -urNp linux-2.6.32.46/security/selinux/ss/services.c linux-2.6.32.46/security/selinux/ss/services.c ---- linux-2.6.32.46/security/selinux/ss/services.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/selinux/ss/services.c 2011-05-16 21:46:57.000000000 -0400 +diff -urNp linux-2.6.32.48/security/selinux/ss/services.c linux-2.6.32.48/security/selinux/ss/services.c +--- linux-2.6.32.48/security/selinux/ss/services.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/selinux/ss/services.c 2011-11-12 12:46:53.000000000 -0500 @@ -1715,6 +1715,8 @@ int security_load_policy(void *data, siz int rc = 0; struct policy_file file = { data, len }, *fp = &file; @@ -80135,9 +80048,9 @@ diff -urNp linux-2.6.32.46/security/selinux/ss/services.c linux-2.6.32.46/securi if (!ss_initialized) { avtab_cache_init(); if (policydb_read(&policydb, fp)) { -diff -urNp linux-2.6.32.46/security/smack/smack_lsm.c linux-2.6.32.46/security/smack/smack_lsm.c ---- linux-2.6.32.46/security/smack/smack_lsm.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/smack/smack_lsm.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/smack/smack_lsm.c linux-2.6.32.48/security/smack/smack_lsm.c +--- linux-2.6.32.48/security/smack/smack_lsm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/smack/smack_lsm.c 2011-11-12 12:46:53.000000000 -0500 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct return 0; } @@ -80147,9 +80060,9 @@ diff -urNp linux-2.6.32.46/security/smack/smack_lsm.c linux-2.6.32.46/security/s .name = "smack", .ptrace_access_check = smack_ptrace_access_check, -diff -urNp linux-2.6.32.46/security/tomoyo/tomoyo.c linux-2.6.32.46/security/tomoyo/tomoyo.c ---- linux-2.6.32.46/security/tomoyo/tomoyo.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/security/tomoyo/tomoyo.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/security/tomoyo/tomoyo.c linux-2.6.32.48/security/tomoyo/tomoyo.c +--- linux-2.6.32.48/security/tomoyo/tomoyo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/security/tomoyo/tomoyo.c 2011-11-12 12:46:53.000000000 -0500 @@ -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. @@ -80159,9 +80072,9 @@ diff -urNp linux-2.6.32.46/security/tomoyo/tomoyo.c linux-2.6.32.46/security/tom .name = "tomoyo", .cred_alloc_blank = tomoyo_cred_alloc_blank, .cred_prepare = tomoyo_cred_prepare, -diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.c linux-2.6.32.46/sound/aoa/codecs/onyx.c ---- linux-2.6.32.46/sound/aoa/codecs/onyx.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/aoa/codecs/onyx.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.c linux-2.6.32.48/sound/aoa/codecs/onyx.c +--- linux-2.6.32.48/sound/aoa/codecs/onyx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/aoa/codecs/onyx.c 2011-11-12 12:46:53.000000000 -0500 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -80190,9 +80103,9 @@ diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.c linux-2.6.32.46/sound/aoa/cod onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.h linux-2.6.32.46/sound/aoa/codecs/onyx.h ---- linux-2.6.32.46/sound/aoa/codecs/onyx.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/aoa/codecs/onyx.h 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/aoa/codecs/onyx.h linux-2.6.32.48/sound/aoa/codecs/onyx.h +--- linux-2.6.32.48/sound/aoa/codecs/onyx.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/aoa/codecs/onyx.h 2011-11-12 12:46:53.000000000 -0500 @@ -11,6 +11,7 @@ #include <linux/i2c.h> #include <asm/pmac_low_i2c.h> @@ -80201,9 +80114,9 @@ diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.h linux-2.6.32.46/sound/aoa/cod /* PCM3052 register definitions */ -diff -urNp linux-2.6.32.46/sound/core/oss/pcm_oss.c linux-2.6.32.46/sound/core/oss/pcm_oss.c ---- linux-2.6.32.46/sound/core/oss/pcm_oss.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/core/oss/pcm_oss.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/core/oss/pcm_oss.c linux-2.6.32.48/sound/core/oss/pcm_oss.c +--- linux-2.6.32.48/sound/core/oss/pcm_oss.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/core/oss/pcm_oss.c 2011-11-12 12:46:53.000000000 -0500 @@ -1395,7 +1395,7 @@ static ssize_t snd_pcm_oss_write1(struct } } else { @@ -80222,9 +80135,9 @@ diff -urNp linux-2.6.32.46/sound/core/oss/pcm_oss.c linux-2.6.32.46/sound/core/o runtime->oss.period_bytes, 0); if (tmp <= 0) goto err; -diff -urNp linux-2.6.32.46/sound/core/pcm_compat.c linux-2.6.32.46/sound/core/pcm_compat.c ---- linux-2.6.32.46/sound/core/pcm_compat.c 2011-08-09 18:35:30.000000000 -0400 -+++ linux-2.6.32.46/sound/core/pcm_compat.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/core/pcm_compat.c linux-2.6.32.48/sound/core/pcm_compat.c +--- linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/core/pcm_compat.c 2011-11-12 12:46:53.000000000 -0500 @@ -30,7 +30,7 @@ static int snd_pcm_ioctl_delay_compat(st int err; @@ -80234,9 +80147,9 @@ diff -urNp linux-2.6.32.46/sound/core/pcm_compat.c linux-2.6.32.46/sound/core/pc snd_leave_user(fs); if (err < 0) return err; -diff -urNp linux-2.6.32.46/sound/core/pcm_native.c linux-2.6.32.46/sound/core/pcm_native.c ---- linux-2.6.32.46/sound/core/pcm_native.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/core/pcm_native.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/core/pcm_native.c linux-2.6.32.48/sound/core/pcm_native.c +--- linux-2.6.32.48/sound/core/pcm_native.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/core/pcm_native.c 2011-11-12 12:46:53.000000000 -0500 @@ -2747,11 +2747,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_ switch (substream->stream) { case SNDRV_PCM_STREAM_PLAYBACK: @@ -80251,9 +80164,9 @@ diff -urNp linux-2.6.32.46/sound/core/pcm_native.c linux-2.6.32.46/sound/core/pc break; default: result = -EINVAL; -diff -urNp linux-2.6.32.46/sound/core/seq/seq_device.c linux-2.6.32.46/sound/core/seq/seq_device.c ---- linux-2.6.32.46/sound/core/seq/seq_device.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/core/seq/seq_device.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/core/seq/seq_device.c linux-2.6.32.48/sound/core/seq/seq_device.c +--- linux-2.6.32.48/sound/core/seq/seq_device.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/core/seq/seq_device.c 2011-11-12 12:46:53.000000000 -0500 @@ -63,7 +63,7 @@ struct ops_list { int argsize; /* argument size */ @@ -80290,9 +80203,9 @@ diff -urNp linux-2.6.32.46/sound/core/seq/seq_device.c linux-2.6.32.46/sound/cor dev->status = SNDRV_SEQ_DEVICE_FREE; dev->driver_data = NULL; ops->num_init_devices--; -diff -urNp linux-2.6.32.46/sound/drivers/mts64.c linux-2.6.32.46/sound/drivers/mts64.c ---- linux-2.6.32.46/sound/drivers/mts64.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/drivers/mts64.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/drivers/mts64.c linux-2.6.32.48/sound/drivers/mts64.c +--- linux-2.6.32.48/sound/drivers/mts64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/drivers/mts64.c 2011-11-12 12:46:53.000000000 -0500 @@ -27,6 +27,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -80349,9 +80262,9 @@ diff -urNp linux-2.6.32.46/sound/drivers/mts64.c linux-2.6.32.46/sound/drivers/m return 0; } -diff -urNp linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c ---- linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c +--- linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/drivers/opl4/opl4_lib.c 2011-11-12 12:46:53.000000000 -0500 @@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ MODULE_DESCRIPTION("OPL4 driver"); MODULE_LICENSE("GPL"); @@ -80361,9 +80274,9 @@ diff -urNp linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c linux-2.6.32.46/sound/d { int timeout = 10; while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0) -diff -urNp linux-2.6.32.46/sound/drivers/portman2x4.c linux-2.6.32.46/sound/drivers/portman2x4.c ---- linux-2.6.32.46/sound/drivers/portman2x4.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/drivers/portman2x4.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/drivers/portman2x4.c linux-2.6.32.48/sound/drivers/portman2x4.c +--- linux-2.6.32.48/sound/drivers/portman2x4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/drivers/portman2x4.c 2011-11-12 12:46:53.000000000 -0500 @@ -46,6 +46,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -80381,9 +80294,9 @@ diff -urNp linux-2.6.32.46/sound/drivers/portman2x4.c linux-2.6.32.46/sound/driv int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.46/sound/isa/cmi8330.c linux-2.6.32.46/sound/isa/cmi8330.c ---- linux-2.6.32.46/sound/isa/cmi8330.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/isa/cmi8330.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/isa/cmi8330.c linux-2.6.32.48/sound/isa/cmi8330.c +--- linux-2.6.32.48/sound/isa/cmi8330.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/isa/cmi8330.c 2011-11-12 12:46:53.000000000 -0500 @@ -173,7 +173,7 @@ struct snd_cmi8330 { struct snd_pcm *pcm; @@ -80393,9 +80306,9 @@ diff -urNp linux-2.6.32.46/sound/isa/cmi8330.c linux-2.6.32.46/sound/isa/cmi8330 snd_pcm_open_callback_t open; void *private_data; /* sb or wss */ } streams[2]; -diff -urNp linux-2.6.32.46/sound/oss/sb_audio.c linux-2.6.32.46/sound/oss/sb_audio.c ---- linux-2.6.32.46/sound/oss/sb_audio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/oss/sb_audio.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/oss/sb_audio.c linux-2.6.32.48/sound/oss/sb_audio.c +--- linux-2.6.32.48/sound/oss/sb_audio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/oss/sb_audio.c 2011-11-12 12:46:53.000000000 -0500 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -80405,9 +80318,9 @@ diff -urNp linux-2.6.32.46/sound/oss/sb_audio.c linux-2.6.32.46/sound/oss/sb_aud if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-2.6.32.46/sound/oss/swarm_cs4297a.c linux-2.6.32.46/sound/oss/swarm_cs4297a.c ---- linux-2.6.32.46/sound/oss/swarm_cs4297a.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/oss/swarm_cs4297a.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/oss/swarm_cs4297a.c linux-2.6.32.48/sound/oss/swarm_cs4297a.c +--- linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/oss/swarm_cs4297a.c 2011-11-12 12:46:53.000000000 -0500 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -80442,9 +80355,9 @@ diff -urNp linux-2.6.32.46/sound/oss/swarm_cs4297a.c linux-2.6.32.46/sound/oss/s list_add(&s->list, &cs4297a_devs); -diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_codec.c linux-2.6.32.46/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.46/sound/pci/ac97/ac97_codec.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/ac97/ac97_codec.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_codec.c linux-2.6.32.48/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/ac97/ac97_codec.c 2011-11-12 12:46:53.000000000 -0500 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -80454,9 +80367,9 @@ diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_codec.c linux-2.6.32.46/sound/pci #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_patch.c linux-2.6.32.46/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.46/sound/pci/ac97/ac97_patch.c 2011-08-29 22:24:44.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/ac97/ac97_patch.c 2011-08-29 22:25:07.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/ac97/ac97_patch.c linux-2.6.32.48/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/ac97/ac97_patch.c 2011-11-12 12:46:53.000000000 -0500 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -80745,9 +80658,9 @@ diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_patch.c linux-2.6.32.46/sound/pci .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.46/sound/pci/hda/hda_codec.h linux-2.6.32.46/sound/pci/hda/hda_codec.h ---- linux-2.6.32.46/sound/pci/hda/hda_codec.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/hda/hda_codec.h 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/hda/hda_codec.h linux-2.6.32.48/sound/pci/hda/hda_codec.h +--- linux-2.6.32.48/sound/pci/hda/hda_codec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/hda/hda_codec.h 2011-11-12 12:46:53.000000000 -0500 @@ -580,7 +580,7 @@ struct hda_bus_ops { /* notify power-up/down from codec to controller */ void (*pm_notify)(struct hda_bus *bus); @@ -80783,9 +80696,9 @@ diff -urNp linux-2.6.32.46/sound/pci/hda/hda_codec.h linux-2.6.32.46/sound/pci/h /* PCM to create, set by patch_ops.build_pcms callback */ unsigned int num_pcms; -diff -urNp linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c ---- linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c +--- linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/hda/patch_atihdmi.c 2011-11-12 12:46:53.000000000 -0500 @@ -177,7 +177,7 @@ static int patch_atihdmi(struct hda_code */ spec->multiout.dig_out_nid = CVT_NID; @@ -80795,9 +80708,9 @@ diff -urNp linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c linux-2.6.32.46/sound/p return 0; } -diff -urNp linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c ---- linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c +--- linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/hda/patch_intelhdmi.c 2011-11-12 12:46:53.000000000 -0500 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str cp_ready); @@ -80822,9 +80735,9 @@ diff -urNp linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.46/sound snd_hda_eld_proc_new(codec, &spec->sink_eld); -diff -urNp linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c ---- linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c +--- linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/hda/patch_nvhdmi.c 2011-11-12 12:46:53.000000000 -0500 @@ -367,7 +367,7 @@ static int patch_nvhdmi_8ch(struct hda_c spec->multiout.max_channels = 8; spec->multiout.dig_out_nid = Nv_Master_Convert_nid; @@ -80843,9 +80756,9 @@ diff -urNp linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.46/sound/pc return 0; } -diff -urNp linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c ---- linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c 2011-06-25 12:55:35.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c +--- linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/hda/patch_sigmatel.c 2011-11-12 12:46:53.000000000 -0500 @@ -5220,7 +5220,7 @@ again: snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, num_dacs); @@ -80864,9 +80777,9 @@ diff -urNp linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c linux-2.6.32.46/sound/ spec->num_pins = STAC92HD71BXX_NUM_PINS; switch (codec->vendor_id) { case 0x111d76b6: -diff -urNp linux-2.6.32.46/sound/pci/ice1712/ice1712.h linux-2.6.32.46/sound/pci/ice1712/ice1712.h ---- linux-2.6.32.46/sound/pci/ice1712/ice1712.h 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/ice1712/ice1712.h 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/ice1712/ice1712.h linux-2.6.32.48/sound/pci/ice1712/ice1712.h +--- linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/ice1712/ice1712.h 2011-11-12 12:46:53.000000000 -0500 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private { unsigned int mask_flags; /* total mask bits */ struct snd_akm4xxx_ops { @@ -80885,9 +80798,9 @@ diff -urNp linux-2.6.32.46/sound/pci/ice1712/ice1712.h linux-2.6.32.46/sound/pci }; -diff -urNp linux-2.6.32.46/sound/pci/intel8x0m.c linux-2.6.32.46/sound/pci/intel8x0m.c ---- linux-2.6.32.46/sound/pci/intel8x0m.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/intel8x0m.c 2011-04-23 12:56:12.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/intel8x0m.c linux-2.6.32.48/sound/pci/intel8x0m.c +--- linux-2.6.32.48/sound/pci/intel8x0m.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/intel8x0m.c 2011-11-12 12:46:53.000000000 -0500 @@ -1264,7 +1264,7 @@ static struct shortname_table { { 0x5455, "ALi M5455" }, { 0x746d, "AMD AMD8111" }, @@ -80897,9 +80810,9 @@ diff -urNp linux-2.6.32.46/sound/pci/intel8x0m.c linux-2.6.32.46/sound/pci/intel }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c ---- linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c 2011-05-04 17:56:28.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c +--- linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/pci/ymfpci/ymfpci_main.c 2011-11-12 12:46:53.000000000 -0500 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0) break; @@ -80940,9 +80853,9 @@ diff -urNp linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.46/sound/ chip->card = card; chip->pci = pci; chip->irq = -1; -diff -urNp linux-2.6.32.46/sound/soc/soc-core.c linux-2.6.32.46/sound/soc/soc-core.c ---- linux-2.6.32.46/sound/soc/soc-core.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/soc/soc-core.c 2011-08-23 21:22:32.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/soc/soc-core.c linux-2.6.32.48/sound/soc/soc-core.c +--- linux-2.6.32.48/sound/soc/soc-core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/sound/soc/soc-core.c 2011-11-12 12:46:53.000000000 -0500 @@ -609,7 +609,7 @@ static int soc_pcm_trigger(struct snd_pc } @@ -80952,9 +80865,9 @@ diff -urNp linux-2.6.32.46/sound/soc/soc-core.c linux-2.6.32.46/sound/soc/soc-co .open = soc_pcm_open, .close = soc_codec_close, .hw_params = soc_pcm_hw_params, -diff -urNp linux-2.6.32.46/sound/usb/usbaudio.c linux-2.6.32.46/sound/usb/usbaudio.c ---- linux-2.6.32.46/sound/usb/usbaudio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/sound/usb/usbaudio.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/sound/usb/usbaudio.c linux-2.6.32.48/sound/usb/usbaudio.c +--- linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/sound/usb/usbaudio.c 2011-11-12 12:46:53.000000000 -0500 @@ -963,12 +963,12 @@ static int snd_usb_pcm_playback_trigger( switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -81016,9 +80929,9 @@ diff -urNp linux-2.6.32.46/sound/usb/usbaudio.c linux-2.6.32.46/sound/usb/usbaud break; } } -diff -urNp linux-2.6.32.46/tools/gcc/checker_plugin.c linux-2.6.32.46/tools/gcc/checker_plugin.c ---- linux-2.6.32.46/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/checker_plugin.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/checker_plugin.c linux-2.6.32.48/tools/gcc/checker_plugin.c +--- linux-2.6.32.48/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/checker_plugin.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,169 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -81189,9 +81102,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/checker_plugin.c linux-2.6.32.46/tools/gcc/ + + return 0; +} -diff -urNp linux-2.6.32.46/tools/gcc/constify_plugin.c linux-2.6.32.46/tools/gcc/constify_plugin.c ---- linux-2.6.32.46/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/constify_plugin.c 2011-08-30 18:19:52.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/constify_plugin.c linux-2.6.32.48/tools/gcc/constify_plugin.c +--- linux-2.6.32.48/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/constify_plugin.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,293 @@ +/* + * Copyright 2011 by Emese Revfy <re.emese@gmail.com> @@ -81486,9 +81399,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/constify_plugin.c linux-2.6.32.46/tools/gcc + + return 0; +} -diff -urNp linux-2.6.32.46/tools/gcc/kallocstat_plugin.c linux-2.6.32.46/tools/gcc/kallocstat_plugin.c ---- linux-2.6.32.46/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/kallocstat_plugin.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/kallocstat_plugin.c linux-2.6.32.48/tools/gcc/kallocstat_plugin.c +--- linux-2.6.32.48/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/kallocstat_plugin.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,165 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -81655,9 +81568,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/kallocstat_plugin.c linux-2.6.32.46/tools/g + + return 0; +} -diff -urNp linux-2.6.32.46/tools/gcc/kernexec_plugin.c linux-2.6.32.46/tools/gcc/kernexec_plugin.c ---- linux-2.6.32.46/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/kernexec_plugin.c 2011-10-06 09:37:16.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/kernexec_plugin.c linux-2.6.32.48/tools/gcc/kernexec_plugin.c +--- linux-2.6.32.48/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/kernexec_plugin.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,273 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -81932,9 +81845,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/kernexec_plugin.c linux-2.6.32.46/tools/gcc + + return 0; +} -diff -urNp linux-2.6.32.46/tools/gcc/Makefile linux-2.6.32.46/tools/gcc/Makefile ---- linux-2.6.32.46/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/Makefile 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/Makefile linux-2.6.32.48/tools/gcc/Makefile +--- linux-2.6.32.48/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/Makefile 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,21 @@ +#CC := gcc +#PLUGIN_SOURCE_FILES := pax_plugin.c @@ -81957,9 +81870,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/Makefile linux-2.6.32.46/tools/gcc/Makefile +kallocstat_plugin-objs := kallocstat_plugin.o +kernexec_plugin-objs := kernexec_plugin.o +checker_plugin-objs := checker_plugin.o -diff -urNp linux-2.6.32.46/tools/gcc/stackleak_plugin.c linux-2.6.32.46/tools/gcc/stackleak_plugin.c ---- linux-2.6.32.46/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.46/tools/gcc/stackleak_plugin.c 2011-10-06 09:37:14.000000000 -0400 +diff -urNp linux-2.6.32.48/tools/gcc/stackleak_plugin.c linux-2.6.32.48/tools/gcc/stackleak_plugin.c +--- linux-2.6.32.48/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.48/tools/gcc/stackleak_plugin.c 2011-11-12 12:46:53.000000000 -0500 @@ -0,0 +1,251 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -82212,9 +82125,9 @@ diff -urNp linux-2.6.32.46/tools/gcc/stackleak_plugin.c linux-2.6.32.46/tools/gc + + return 0; +} -diff -urNp linux-2.6.32.46/usr/gen_init_cpio.c linux-2.6.32.46/usr/gen_init_cpio.c ---- linux-2.6.32.46/usr/gen_init_cpio.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/usr/gen_init_cpio.c 2011-04-17 15:56:46.000000000 -0400 +diff -urNp linux-2.6.32.48/usr/gen_init_cpio.c linux-2.6.32.48/usr/gen_init_cpio.c +--- linux-2.6.32.48/usr/gen_init_cpio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32.48/usr/gen_init_cpio.c 2011-11-12 12:46:53.000000000 -0500 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -82237,9 +82150,9 @@ diff -urNp linux-2.6.32.46/usr/gen_init_cpio.c linux-2.6.32.46/usr/gen_init_cpio } else break; } -diff -urNp linux-2.6.32.46/virt/kvm/kvm_main.c linux-2.6.32.46/virt/kvm/kvm_main.c ---- linux-2.6.32.46/virt/kvm/kvm_main.c 2011-03-27 14:31:47.000000000 -0400 -+++ linux-2.6.32.46/virt/kvm/kvm_main.c 2011-08-05 20:33:55.000000000 -0400 +diff -urNp linux-2.6.32.48/virt/kvm/kvm_main.c linux-2.6.32.48/virt/kvm/kvm_main.c +--- linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-12 12:44:30.000000000 -0500 ++++ linux-2.6.32.48/virt/kvm/kvm_main.c 2011-11-12 12:46:53.000000000 -0500 @@ -2494,7 +2494,7 @@ asmlinkage void kvm_handle_fault_on_rebo if (kvm_rebooting) /* spin while reset goes on */ diff --git a/3.0.8/0000_README b/3.0.9/0000_README index 3d0a189..fdfc980 100644 --- a/3.0.8/0000_README +++ b/3.0.9/0000_README @@ -7,7 +7,11 @@ Patch: 1007_linux-3.0.8.patch From: http://www.kernel.org Desc: Linux 3.0.8 -Patch: 4420_grsecurity-2.2.2-3.0.8-201110250925.patch +Patch: 1008_linux-3.0.9.patch +From: http://www.kernel.org +Desc: Linux 3.0.9 + +Patch: 4420_grsecurity-2.2.2-3.0.9-201111121310.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.0.8/1007_linux-3.0.8.patch b/3.0.9/1007_linux-3.0.8.patch index 62a4bb6..62a4bb6 100644 --- a/3.0.8/1007_linux-3.0.8.patch +++ b/3.0.9/1007_linux-3.0.8.patch diff --git a/3.0.9/1008_linux-3.0.9.patch b/3.0.9/1008_linux-3.0.9.patch new file mode 100644 index 0000000..1679a52 --- /dev/null +++ b/3.0.9/1008_linux-3.0.9.patch @@ -0,0 +1,10991 @@ +diff --git a/Documentation/hwspinlock.txt b/Documentation/hwspinlock.txt +index 7dcd1a4..6996681 100644 +--- a/Documentation/hwspinlock.txt ++++ b/Documentation/hwspinlock.txt +@@ -39,23 +39,20 @@ independent, drivers. + in case an unused hwspinlock isn't available. Users of this + API will usually want to communicate the lock's id to the remote core + before it can be used to achieve synchronization. +- Can be called from an atomic context (this function will not sleep) but +- not from within interrupt context. ++ Should be called from a process context (might sleep). + + struct hwspinlock *hwspin_lock_request_specific(unsigned int id); + - assign a specific hwspinlock id and return its address, or NULL + if that hwspinlock is already in use. Usually board code will + be calling this function in order to reserve specific hwspinlock + ids for predefined purposes. +- Can be called from an atomic context (this function will not sleep) but +- not from within interrupt context. ++ Should be called from a process context (might sleep). + + int hwspin_lock_free(struct hwspinlock *hwlock); + - free a previously-assigned hwspinlock; returns 0 on success, or an + appropriate error code on failure (e.g. -EINVAL if the hwspinlock + is already free). +- Can be called from an atomic context (this function will not sleep) but +- not from within interrupt context. ++ Should be called from a process context (might sleep). + + int hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int timeout); + - lock a previously-assigned hwspinlock with a timeout limit (specified in +@@ -232,15 +229,14 @@ int hwspinlock_example2(void) + + int hwspin_lock_register(struct hwspinlock *hwlock); + - to be called from the underlying platform-specific implementation, in +- order to register a new hwspinlock instance. Can be called from an atomic +- context (this function will not sleep) but not from within interrupt +- context. Returns 0 on success, or appropriate error code on failure. ++ order to register a new hwspinlock instance. Should be called from ++ a process context (this function might sleep). ++ Returns 0 on success, or appropriate error code on failure. + + struct hwspinlock *hwspin_lock_unregister(unsigned int id); + - to be called from the underlying vendor-specific implementation, in order + to unregister an existing (and unused) hwspinlock instance. +- Can be called from an atomic context (will not sleep) but not from +- within interrupt context. ++ Should be called from a process context (this function might sleep). + Returns the address of hwspinlock on success, or NULL on error (e.g. + if the hwspinlock is sill in use). + +diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt +index b24875b..6ade987 100644 +--- a/Documentation/power/runtime_pm.txt ++++ b/Documentation/power/runtime_pm.txt +@@ -708,6 +708,16 @@ will behave normally, not taking the autosuspend delay into account. + Similarly, if the power.use_autosuspend field isn't set then the autosuspend + helper functions will behave just like the non-autosuspend counterparts. + ++Under some circumstances a driver or subsystem may want to prevent a device ++from autosuspending immediately, even though the usage counter is zero and the ++autosuspend delay time has expired. If the ->runtime_suspend() callback ++returns -EAGAIN or -EBUSY, and if the next autosuspend delay expiration time is ++in the future (as it normally would be if the callback invoked ++pm_runtime_mark_last_busy()), the PM core will automatically reschedule the ++autosuspend. The ->runtime_suspend() callback can't do this rescheduling ++itself because no suspend requests of any kind are accepted while the device is ++suspending (i.e., while the callback is running). ++ + The implementation is well suited for asynchronous use in interrupt contexts. + However such use inevitably involves races, because the PM core can't + synchronize ->runtime_suspend() callbacks with the arrival of I/O requests. +diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt +index e213f45..21fd05c 100644 +--- a/Documentation/stable_kernel_rules.txt ++++ b/Documentation/stable_kernel_rules.txt +@@ -24,10 +24,10 @@ Rules on what kind of patches are accepted, and which ones are not, into the + Procedure for submitting patches to the -stable tree: + + - Send the patch, after verifying that it follows the above rules, to +- stable@kernel.org. You must note the upstream commit ID in the changelog +- of your submission. ++ stable@vger.kernel.org. You must note the upstream commit ID in the ++ changelog of your submission. + - To have the patch automatically included in the stable tree, add the tag +- Cc: stable@kernel.org ++ Cc: stable@vger.kernel.org + in the sign-off area. Once the patch is merged it will be applied to + the stable tree without anything else needing to be done by the author + or subsystem maintainer. +@@ -35,10 +35,10 @@ Procedure for submitting patches to the -stable tree: + cherry-picked than this can be specified in the following format in + the sign-off area: + +- Cc: <stable@kernel.org> # .32.x: a1f84a3: sched: Check for idle +- Cc: <stable@kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle +- Cc: <stable@kernel.org> # .32.x: fd21073: sched: Fix affinity logic +- Cc: <stable@kernel.org> # .32.x ++ Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle ++ Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle ++ Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic ++ Cc: <stable@vger.kernel.org> # .32.x + Signed-off-by: Ingo Molnar <mingo@elte.hu> + + The tag sequence has the meaning of: +diff --git a/MAINTAINERS b/MAINTAINERS +index 187282d..34e2418 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -1221,7 +1221,7 @@ F: Documentation/aoe/ + F: drivers/block/aoe/ + + ATHEROS ATH GENERIC UTILITIES +-M: "Luis R. Rodriguez" <lrodriguez@atheros.com> ++M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> + L: linux-wireless@vger.kernel.org + S: Supported + F: drivers/net/wireless/ath/* +@@ -1229,7 +1229,7 @@ F: drivers/net/wireless/ath/* + ATHEROS ATH5K WIRELESS DRIVER + M: Jiri Slaby <jirislaby@gmail.com> + M: Nick Kossifidis <mickflemm@gmail.com> +-M: "Luis R. Rodriguez" <lrodriguez@atheros.com> ++M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> + M: Bob Copeland <me@bobcopeland.com> + L: linux-wireless@vger.kernel.org + L: ath5k-devel@lists.ath5k.org +@@ -1238,10 +1238,10 @@ S: Maintained + F: drivers/net/wireless/ath/ath5k/ + + ATHEROS ATH9K WIRELESS DRIVER +-M: "Luis R. Rodriguez" <lrodriguez@atheros.com> +-M: Jouni Malinen <jmalinen@atheros.com> +-M: Vasanthakumar Thiagarajan <vasanth@atheros.com> +-M: Senthil Balasubramanian <senthilkumar@atheros.com> ++M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> ++M: Jouni Malinen <jouni@qca.qualcomm.com> ++M: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> ++M: Senthil Balasubramanian <senthilb@qca.qualcomm.com> + L: linux-wireless@vger.kernel.org + L: ath9k-devel@lists.ath9k.org + W: http://wireless.kernel.org/en/users/Drivers/ath9k +@@ -1269,7 +1269,7 @@ F: drivers/input/misc/ati_remote2.c + ATLX ETHERNET DRIVERS + M: Jay Cliburn <jcliburn@gmail.com> + M: Chris Snook <chris.snook@gmail.com> +-M: Jie Yang <jie.yang@atheros.com> ++M: Jie Yang <yangjie@qca.qualcomm.com> + L: netdev@vger.kernel.org + W: http://sourceforge.net/projects/atl1 + W: http://atl1.sourceforge.net +diff --git a/Makefile b/Makefile +index 9f6e3cd..438c11a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 3 + PATCHLEVEL = 0 +-SUBLEVEL = 8 ++SUBLEVEL = 9 + EXTRAVERSION = + NAME = Sneaky Weasel + +diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c +index 1da23bb..8aa104a 100644 +--- a/arch/arm/mach-ux500/cpu.c ++++ b/arch/arm/mach-ux500/cpu.c +@@ -99,7 +99,27 @@ static void ux500_l2x0_inv_all(void) + ux500_cache_sync(); + } + +-static int ux500_l2x0_init(void) ++static int __init ux500_l2x0_unlock(void) ++{ ++ int i; ++ ++ /* ++ * Unlock Data and Instruction Lock if locked. Ux500 U-Boot versions ++ * apparently locks both caches before jumping to the kernel. The ++ * l2x0 core will not touch the unlock registers if the l2x0 is ++ * already enabled, so we do it right here instead. The PL310 has ++ * 8 sets of registers, one per possible CPU. ++ */ ++ for (i = 0; i < 8; i++) { ++ writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_D_BASE + ++ i * L2X0_LOCKDOWN_STRIDE); ++ writel_relaxed(0x0, l2x0_base + L2X0_LOCKDOWN_WAY_I_BASE + ++ i * L2X0_LOCKDOWN_STRIDE); ++ } ++ return 0; ++} ++ ++static int __init ux500_l2x0_init(void) + { + if (cpu_is_u5500()) + l2x0_base = __io_address(U5500_L2CC_BASE); +@@ -108,6 +128,9 @@ static int ux500_l2x0_init(void) + else + ux500_unknown_soc(); + ++ /* Unlock before init */ ++ ux500_l2x0_unlock(); ++ + /* 64KB way size, 8 way associativity, force WA */ + l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff); + +diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h +index ebbce33..4509956 100644 +--- a/arch/arm/plat-mxc/include/mach/iomux-v3.h ++++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h +@@ -89,11 +89,11 @@ typedef u64 iomux_v3_cfg_t; + #define PAD_CTL_HYS (1 << 8) + + #define PAD_CTL_PKE (1 << 7) +-#define PAD_CTL_PUE (1 << 6) +-#define PAD_CTL_PUS_100K_DOWN (0 << 4) +-#define PAD_CTL_PUS_47K_UP (1 << 4) +-#define PAD_CTL_PUS_100K_UP (2 << 4) +-#define PAD_CTL_PUS_22K_UP (3 << 4) ++#define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE) ++#define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE) ++#define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE) ++#define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE) ++#define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE) + + #define PAD_CTL_ODE (1 << 3) + +diff --git a/arch/powerpc/include/asm/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h +index 54a47ea..0c5fa31 100644 +--- a/arch/powerpc/include/asm/sparsemem.h ++++ b/arch/powerpc/include/asm/sparsemem.h +@@ -16,7 +16,7 @@ + #endif /* CONFIG_SPARSEMEM */ + + #ifdef CONFIG_MEMORY_HOTPLUG +-extern void create_section_mapping(unsigned long start, unsigned long end); ++extern int create_section_mapping(unsigned long start, unsigned long end); + extern int remove_section_mapping(unsigned long start, unsigned long end); + #ifdef CONFIG_NUMA + extern int hot_add_scn_to_nid(unsigned long scn_addr); +diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c +index fec1320..d7efdbf 100644 +--- a/arch/powerpc/mm/gup.c ++++ b/arch/powerpc/mm/gup.c +@@ -16,16 +16,6 @@ + + #ifdef __HAVE_ARCH_PTE_SPECIAL + +-static inline void get_huge_page_tail(struct page *page) +-{ +- /* +- * __split_huge_page_refcount() cannot run +- * from under us. +- */ +- VM_BUG_ON(atomic_read(&page->_count) < 0); +- atomic_inc(&page->_count); +-} +- + /* + * The performance critical leaf functions are made noinline otherwise gcc + * inlines everything into a single function which results in too much +@@ -57,8 +47,6 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, + put_page(page); + return 0; + } +- if (PageTail(page)) +- get_huge_page_tail(page); + pages[*nr] = page; + (*nr)++; + +diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c +index 26b2872..07f9e9f 100644 +--- a/arch/powerpc/mm/hash_utils_64.c ++++ b/arch/powerpc/mm/hash_utils_64.c +@@ -534,11 +534,11 @@ static unsigned long __init htab_get_table_size(void) + } + + #ifdef CONFIG_MEMORY_HOTPLUG +-void create_section_mapping(unsigned long start, unsigned long end) ++int create_section_mapping(unsigned long start, unsigned long end) + { +- BUG_ON(htab_bolt_mapping(start, end, __pa(start), ++ return htab_bolt_mapping(start, end, __pa(start), + pgprot_val(PAGE_KERNEL), mmu_linear_psize, +- mmu_kernel_ssize)); ++ mmu_kernel_ssize); + } + + int remove_section_mapping(unsigned long start, unsigned long end) +diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c +index 0b9a5c1..da5eb38 100644 +--- a/arch/powerpc/mm/hugetlbpage.c ++++ b/arch/powerpc/mm/hugetlbpage.c +@@ -390,7 +390,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add + { + unsigned long mask; + unsigned long pte_end; +- struct page *head, *page; ++ struct page *head, *page, *tail; + pte_t pte; + int refs; + +@@ -413,6 +413,7 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add + head = pte_page(pte); + + page = head + ((addr & (sz-1)) >> PAGE_SHIFT); ++ tail = page; + do { + VM_BUG_ON(compound_head(page) != head); + pages[*nr] = page; +@@ -428,10 +429,20 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add + + if (unlikely(pte_val(pte) != pte_val(*ptep))) { + /* Could be optimized better */ +- while (*nr) { +- put_page(page); +- (*nr)--; +- } ++ *nr -= refs; ++ while (refs--) ++ put_page(head); ++ return 0; ++ } ++ ++ /* ++ * Any tail page need their mapcount reference taken before we ++ * return. ++ */ ++ while (refs--) { ++ if (PageTail(tail)) ++ get_huge_page_tail(tail); ++ tail++; + } + + return 1; +diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c +index 29d4dde..278ec8e 100644 +--- a/arch/powerpc/mm/mem.c ++++ b/arch/powerpc/mm/mem.c +@@ -123,7 +123,8 @@ int arch_add_memory(int nid, u64 start, u64 size) + pgdata = NODE_DATA(nid); + + start = (unsigned long)__va(start); +- create_section_mapping(start, start + size); ++ if (create_section_mapping(start, start + size)) ++ return -EINVAL; + + /* this should work for most non-highmem platforms */ + zone = pgdata->node_zones; +diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c +index 3bafc3d..4ff587e 100644 +--- a/arch/powerpc/mm/mmu_context_hash64.c ++++ b/arch/powerpc/mm/mmu_context_hash64.c +@@ -136,8 +136,8 @@ int use_cop(unsigned long acop, struct mm_struct *mm) + if (!mm || !acop) + return -EINVAL; + +- /* We need to make sure mm_users doesn't change */ +- down_read(&mm->mmap_sem); ++ /* The page_table_lock ensures mm_users won't change under us */ ++ spin_lock(&mm->page_table_lock); + spin_lock(mm->context.cop_lockp); + + if (mm->context.cop_pid == COP_PID_NONE) { +@@ -164,7 +164,7 @@ int use_cop(unsigned long acop, struct mm_struct *mm) + + out: + spin_unlock(mm->context.cop_lockp); +- up_read(&mm->mmap_sem); ++ spin_unlock(&mm->page_table_lock); + + return ret; + } +@@ -185,8 +185,8 @@ void drop_cop(unsigned long acop, struct mm_struct *mm) + if (WARN_ON_ONCE(!mm)) + return; + +- /* We need to make sure mm_users doesn't change */ +- down_read(&mm->mmap_sem); ++ /* The page_table_lock ensures mm_users won't change under us */ ++ spin_lock(&mm->page_table_lock); + spin_lock(mm->context.cop_lockp); + + mm->context.acop &= ~acop; +@@ -213,7 +213,7 @@ void drop_cop(unsigned long acop, struct mm_struct *mm) + } + + spin_unlock(mm->context.cop_lockp); +- up_read(&mm->mmap_sem); ++ spin_unlock(&mm->page_table_lock); + } + EXPORT_SYMBOL_GPL(drop_cop); + +diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c +index 2164006..2c1ae7a 100644 +--- a/arch/powerpc/mm/numa.c ++++ b/arch/powerpc/mm/numa.c +@@ -1214,11 +1214,12 @@ int hot_add_node_scn_to_nid(unsigned long scn_addr) + break; + } + +- of_node_put(memory); + if (nid >= 0) + break; + } + ++ of_node_put(memory); ++ + return nid; + } + +diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c +index 57ceb92..82766e5 100644 +--- a/arch/powerpc/platforms/pseries/dlpar.c ++++ b/arch/powerpc/platforms/pseries/dlpar.c +@@ -112,6 +112,7 @@ void dlpar_free_cc_nodes(struct device_node *dn) + dlpar_free_one_cc_node(dn); + } + ++#define COMPLETE 0 + #define NEXT_SIBLING 1 + #define NEXT_CHILD 2 + #define NEXT_PROPERTY 3 +@@ -158,6 +159,9 @@ struct device_node *dlpar_configure_connector(u32 drc_index) + spin_unlock(&rtas_data_buf_lock); + + switch (rc) { ++ case COMPLETE: ++ break; ++ + case NEXT_SIBLING: + dn = dlpar_parse_cc_node(ccwa); + if (!dn) +diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c +index 46b55cf..3608704 100644 +--- a/arch/powerpc/platforms/pseries/eeh.c ++++ b/arch/powerpc/platforms/pseries/eeh.c +@@ -1338,7 +1338,7 @@ static const struct file_operations proc_eeh_operations = { + static int __init eeh_init_proc(void) + { + if (machine_is(pseries)) +- proc_create("ppc64/eeh", 0, NULL, &proc_eeh_operations); ++ proc_create("powerpc/eeh", 0, NULL, &proc_eeh_operations); + return 0; + } + __initcall(eeh_init_proc); +diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c +index ef86ad2..ae0e14b 100644 +--- a/arch/s390/kernel/ptrace.c ++++ b/arch/s390/kernel/ptrace.c +@@ -47,29 +47,31 @@ enum s390_regset { + + void update_per_regs(struct task_struct *task) + { +- static const struct per_regs per_single_step = { +- .control = PER_EVENT_IFETCH, +- .start = 0, +- .end = PSW_ADDR_INSN, +- }; + struct pt_regs *regs = task_pt_regs(task); + struct thread_struct *thread = &task->thread; +- const struct per_regs *new; +- struct per_regs old; +- +- /* TIF_SINGLE_STEP overrides the user specified PER registers. */ +- new = test_tsk_thread_flag(task, TIF_SINGLE_STEP) ? +- &per_single_step : &thread->per_user; ++ struct per_regs old, new; ++ ++ /* Copy user specified PER registers */ ++ new.control = thread->per_user.control; ++ new.start = thread->per_user.start; ++ new.end = thread->per_user.end; ++ ++ /* merge TIF_SINGLE_STEP into user specified PER registers. */ ++ if (test_tsk_thread_flag(task, TIF_SINGLE_STEP)) { ++ new.control |= PER_EVENT_IFETCH; ++ new.start = 0; ++ new.end = PSW_ADDR_INSN; ++ } + + /* Take care of the PER enablement bit in the PSW. */ +- if (!(new->control & PER_EVENT_MASK)) { ++ if (!(new.control & PER_EVENT_MASK)) { + regs->psw.mask &= ~PSW_MASK_PER; + return; + } + regs->psw.mask |= PSW_MASK_PER; + __ctl_store(old, 9, 11); +- if (memcmp(new, &old, sizeof(struct per_regs)) != 0) +- __ctl_load(*new, 9, 11); ++ if (memcmp(&new, &old, sizeof(struct per_regs)) != 0) ++ __ctl_load(new, 9, 11); + } + + void user_enable_single_step(struct task_struct *task) +diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c +index 67345ae..2ada634 100644 +--- a/arch/s390/kvm/kvm-s390.c ++++ b/arch/s390/kvm/kvm-s390.c +@@ -301,11 +301,17 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) + struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, + unsigned int id) + { +- struct kvm_vcpu *vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL); +- int rc = -ENOMEM; ++ struct kvm_vcpu *vcpu; ++ int rc = -EINVAL; ++ ++ if (id >= KVM_MAX_VCPUS) ++ goto out; ++ ++ rc = -ENOMEM; + ++ vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL); + if (!vcpu) +- goto out_nomem; ++ goto out; + + vcpu->arch.sie_block = (struct kvm_s390_sie_block *) + get_zeroed_page(GFP_KERNEL); +@@ -341,7 +347,7 @@ out_free_sie_block: + free_page((unsigned long)(vcpu->arch.sie_block)); + out_free_cpu: + kfree(vcpu); +-out_nomem: ++out: + return ERR_PTR(rc); + } + +diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c +index 45b405c..65cb06e 100644 +--- a/arch/s390/mm/gup.c ++++ b/arch/s390/mm/gup.c +@@ -52,7 +52,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, + unsigned long end, int write, struct page **pages, int *nr) + { + unsigned long mask, result; +- struct page *head, *page; ++ struct page *head, *page, *tail; + int refs; + + result = write ? 0 : _SEGMENT_ENTRY_RO; +@@ -64,6 +64,7 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, + refs = 0; + head = pmd_page(pmd); + page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT); ++ tail = page; + do { + VM_BUG_ON(compound_head(page) != head); + pages[*nr] = page; +@@ -81,6 +82,17 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr, + *nr -= refs; + while (refs--) + put_page(head); ++ return 0; ++ } ++ ++ /* ++ * Any tail page need their mapcount reference taken before we ++ * return. ++ */ ++ while (refs--) { ++ if (PageTail(tail)) ++ get_huge_page_tail(tail); ++ tail++; + } + + return 1; +diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c +index 37a23c22..458893f 100644 +--- a/arch/s390/mm/pgtable.c ++++ b/arch/s390/mm/pgtable.c +@@ -291,8 +291,9 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table) + + void __tlb_remove_table(void *_table) + { +- void *table = (void *)((unsigned long) _table & PAGE_MASK); +- unsigned type = (unsigned long) _table & ~PAGE_MASK; ++ const unsigned long mask = (FRAG_MASK << 4) | FRAG_MASK; ++ void *table = (void *)((unsigned long) _table & ~mask); ++ unsigned type = (unsigned long) _table & mask; + + if (type) + __page_table_free_rcu(table, type); +diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c +index 620f5b7..0491e40 100644 +--- a/arch/um/drivers/ubd_kern.c ++++ b/arch/um/drivers/ubd_kern.c +@@ -513,8 +513,37 @@ __uml_exitcall(kill_io_thread); + static inline int ubd_file_size(struct ubd *ubd_dev, __u64 *size_out) + { + char *file; ++ int fd; ++ int err; ++ ++ __u32 version; ++ __u32 align; ++ char *backing_file; ++ time_t mtime; ++ unsigned long long size; ++ int sector_size; ++ int bitmap_offset; ++ ++ if (ubd_dev->file && ubd_dev->cow.file) { ++ file = ubd_dev->cow.file; ++ ++ goto out; ++ } + +- file = ubd_dev->cow.file ? ubd_dev->cow.file : ubd_dev->file; ++ fd = os_open_file(ubd_dev->file, global_openflags, 0); ++ if (fd < 0) ++ return fd; ++ ++ err = read_cow_header(file_reader, &fd, &version, &backing_file, \ ++ &mtime, &size, §or_size, &align, &bitmap_offset); ++ os_close_file(fd); ++ ++ if(err == -EINVAL) ++ file = ubd_dev->file; ++ else ++ file = backing_file; ++ ++out: + return os_file_size(file, size_out); + } + +diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h +index 4a0b7c7..244ac77 100644 +--- a/arch/x86/include/asm/apic.h ++++ b/arch/x86/include/asm/apic.h +@@ -495,7 +495,7 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert) + return; + } + +-extern struct apic *generic_bigsmp_probe(void); ++extern void generic_bigsmp_probe(void); + + + #ifdef CONFIG_X86_LOCAL_APIC +diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h +index a291c40..5d62d65 100644 +--- a/arch/x86/include/asm/uv/uv_bau.h ++++ b/arch/x86/include/asm/uv/uv_bau.h +@@ -55,6 +55,7 @@ + #define UV_BAU_TUNABLES_DIR "sgi_uv" + #define UV_BAU_TUNABLES_FILE "bau_tunables" + #define WHITESPACE " \t\n" ++#define uv_mmask ((1UL << uv_hub_info->m_val) - 1) + #define uv_physnodeaddr(x) ((__pa((unsigned long)(x)) & uv_mmask)) + #define cpubit_isset(cpu, bau_local_cpumask) \ + test_bit((cpu), (bau_local_cpumask).bits) +diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h +index f26544a..54a13aa 100644 +--- a/arch/x86/include/asm/uv/uv_hub.h ++++ b/arch/x86/include/asm/uv/uv_hub.h +@@ -46,6 +46,13 @@ + * PNODE - the low N bits of the GNODE. The PNODE is the most useful variant + * of the nasid for socket usage. + * ++ * GPA - (global physical address) a socket physical address converted ++ * so that it can be used by the GRU as a global address. Socket ++ * physical addresses 1) need additional NASID (node) bits added ++ * to the high end of the address, and 2) unaliased if the ++ * partition does not have a physical address 0. In addition, on ++ * UV2 rev 1, GPAs need the gnode left shifted to bits 39 or 40. ++ * + * + * NumaLink Global Physical Address Format: + * +--------------------------------+---------------------+ +@@ -141,6 +148,8 @@ struct uv_hub_info_s { + unsigned int gnode_extra; + unsigned char hub_revision; + unsigned char apic_pnode_shift; ++ unsigned char m_shift; ++ unsigned char n_lshift; + unsigned long gnode_upper; + unsigned long lowmem_remap_top; + unsigned long lowmem_remap_base; +@@ -177,6 +186,16 @@ static inline int is_uv2_hub(void) + return uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE; + } + ++static inline int is_uv2_1_hub(void) ++{ ++ return uv_hub_info->hub_revision == UV2_HUB_REVISION_BASE; ++} ++ ++static inline int is_uv2_2_hub(void) ++{ ++ return uv_hub_info->hub_revision == UV2_HUB_REVISION_BASE + 1; ++} ++ + union uvh_apicid { + unsigned long v; + struct uvh_apicid_s { +@@ -276,7 +295,10 @@ static inline unsigned long uv_soc_phys_ram_to_gpa(unsigned long paddr) + { + if (paddr < uv_hub_info->lowmem_remap_top) + paddr |= uv_hub_info->lowmem_remap_base; +- return paddr | uv_hub_info->gnode_upper; ++ paddr |= uv_hub_info->gnode_upper; ++ paddr = ((paddr << uv_hub_info->m_shift) >> uv_hub_info->m_shift) | ++ ((paddr >> uv_hub_info->m_val) << uv_hub_info->n_lshift); ++ return paddr; + } + + +@@ -300,16 +322,19 @@ static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa) + unsigned long remap_base = uv_hub_info->lowmem_remap_base; + unsigned long remap_top = uv_hub_info->lowmem_remap_top; + ++ gpa = ((gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift) | ++ ((gpa >> uv_hub_info->n_lshift) << uv_hub_info->m_val); ++ gpa = gpa & uv_hub_info->gpa_mask; + if (paddr >= remap_base && paddr < remap_base + remap_top) + paddr -= remap_base; + return paddr; + } + + +-/* gnode -> pnode */ ++/* gpa -> pnode */ + static inline unsigned long uv_gpa_to_gnode(unsigned long gpa) + { +- return gpa >> uv_hub_info->m_val; ++ return gpa >> uv_hub_info->n_lshift; + } + + /* gpa -> pnode */ +@@ -320,6 +345,12 @@ static inline int uv_gpa_to_pnode(unsigned long gpa) + return uv_gpa_to_gnode(gpa) & n_mask; + } + ++/* gpa -> node offset*/ ++static inline unsigned long uv_gpa_to_offset(unsigned long gpa) ++{ ++ return (gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift; ++} ++ + /* pnode, offset --> socket virtual */ + static inline void *uv_pnode_offset_to_vaddr(int pnode, unsigned long offset) + { +diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c +index d3d9d50..bfd75ff 100644 +--- a/arch/x86/kernel/amd_iommu.c ++++ b/arch/x86/kernel/amd_iommu.c +@@ -1203,7 +1203,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, + if (!pte || !IOMMU_PTE_PRESENT(*pte)) + continue; + +- dma_ops_reserve_addresses(dma_dom, i << PAGE_SHIFT, 1); ++ dma_ops_reserve_addresses(dma_dom, i >> PAGE_SHIFT, 1); + } + + update_domain(&dma_dom->domain); +diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c +index efd737e..521bead 100644 +--- a/arch/x86/kernel/apic/bigsmp_32.c ++++ b/arch/x86/kernel/apic/bigsmp_32.c +@@ -255,12 +255,24 @@ static struct apic apic_bigsmp = { + .x86_32_early_logical_apicid = bigsmp_early_logical_apicid, + }; + +-struct apic * __init generic_bigsmp_probe(void) ++void __init generic_bigsmp_probe(void) + { +- if (probe_bigsmp()) +- return &apic_bigsmp; ++ unsigned int cpu; + +- return NULL; ++ if (!probe_bigsmp()) ++ return; ++ ++ apic = &apic_bigsmp; ++ ++ for_each_possible_cpu(cpu) { ++ if (early_per_cpu(x86_cpu_to_logical_apicid, ++ cpu) == BAD_APICID) ++ continue; ++ early_per_cpu(x86_cpu_to_logical_apicid, cpu) = ++ bigsmp_early_logical_apicid(cpu); ++ } ++ ++ pr_info("Overriding APIC driver with %s\n", apic_bigsmp.name); + } + + apic_driver(apic_bigsmp); +diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c +index b5254ad..0787bb3 100644 +--- a/arch/x86/kernel/apic/probe_32.c ++++ b/arch/x86/kernel/apic/probe_32.c +@@ -200,14 +200,8 @@ void __init default_setup_apic_routing(void) + * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support + */ + +- if (!cmdline_apic && apic == &apic_default) { +- struct apic *bigsmp = generic_bigsmp_probe(); +- if (bigsmp) { +- apic = bigsmp; +- printk(KERN_INFO "Overriding APIC driver with %s\n", +- apic->name); +- } +- } ++ if (!cmdline_apic && apic == &apic_default) ++ generic_bigsmp_probe(); + #endif + + if (apic->setup_apic_routing) +diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c +index 34b1859..cfeb978 100644 +--- a/arch/x86/kernel/apic/x2apic_uv_x.c ++++ b/arch/x86/kernel/apic/x2apic_uv_x.c +@@ -832,6 +832,10 @@ void __init uv_system_init(void) + uv_cpu_hub_info(cpu)->apic_pnode_shift = uvh_apicid.s.pnode_shift; + uv_cpu_hub_info(cpu)->hub_revision = uv_hub_info->hub_revision; + ++ uv_cpu_hub_info(cpu)->m_shift = 64 - m_val; ++ uv_cpu_hub_info(cpu)->n_lshift = is_uv2_1_hub() ? ++ (m_val == 40 ? 40 : 39) : m_val; ++ + pnode = uv_apicid_to_pnode(apicid); + blade = boot_pnode_to_blade(pnode); + lcpu = uv_blade_info[blade].nr_possible_cpus; +@@ -862,8 +866,7 @@ void __init uv_system_init(void) + if (uv_node_to_blade[nid] >= 0) + continue; + paddr = node_start_pfn(nid) << PAGE_SHIFT; +- paddr = uv_soc_phys_ram_to_gpa(paddr); +- pnode = (paddr >> m_val) & pnode_mask; ++ pnode = uv_gpa_to_pnode(uv_soc_phys_ram_to_gpa(paddr)); + blade = boot_pnode_to_blade(pnode); + uv_node_to_blade[nid] = blade; + } +diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c +index f1a6244..794bc95 100644 +--- a/arch/x86/kernel/kprobes.c ++++ b/arch/x86/kernel/kprobes.c +@@ -75,8 +75,10 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); + /* + * Undefined/reserved opcodes, conditional jump, Opcode Extension + * Groups, and some special opcodes can not boost. ++ * This is non-const to keep gcc from statically optimizing it out, as ++ * variable_test_bit makes gcc think only *(unsigned long*) is used. + */ +-static const u32 twobyte_is_boostable[256 / 32] = { ++static u32 twobyte_is_boostable[256 / 32] = { + /* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ + /* ---------------------------------------------- */ + W(0x00, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0) | /* 00 */ +diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c +index dbe34b9..ea30585 100644 +--- a/arch/x86/mm/gup.c ++++ b/arch/x86/mm/gup.c +@@ -108,16 +108,6 @@ static inline void get_head_page_multiple(struct page *page, int nr) + SetPageReferenced(page); + } + +-static inline void get_huge_page_tail(struct page *page) +-{ +- /* +- * __split_huge_page_refcount() cannot run +- * from under us. +- */ +- VM_BUG_ON(atomic_read(&page->_count) < 0); +- atomic_inc(&page->_count); +-} +- + static noinline int gup_huge_pmd(pmd_t pmd, unsigned long addr, + unsigned long end, int write, struct page **pages, int *nr) + { +diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c +index 68e467f..82cff4a 100644 +--- a/arch/x86/platform/uv/tlb_uv.c ++++ b/arch/x86/platform/uv/tlb_uv.c +@@ -115,9 +115,6 @@ early_param("nobau", setup_nobau); + + /* base pnode in this partition */ + static int uv_base_pnode __read_mostly; +-/* position of pnode (which is nasid>>1): */ +-static int uv_nshift __read_mostly; +-static unsigned long uv_mmask __read_mostly; + + static DEFINE_PER_CPU(struct ptc_stats, ptcstats); + static DEFINE_PER_CPU(struct bau_control, bau_control); +@@ -1426,7 +1423,7 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode) + { + int i; + int cpu; +- unsigned long pa; ++ unsigned long gpa; + unsigned long m; + unsigned long n; + size_t dsize; +@@ -1442,9 +1439,9 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode) + bau_desc = kmalloc_node(dsize, GFP_KERNEL, node); + BUG_ON(!bau_desc); + +- pa = uv_gpa(bau_desc); /* need the real nasid*/ +- n = pa >> uv_nshift; +- m = pa & uv_mmask; ++ gpa = uv_gpa(bau_desc); ++ n = uv_gpa_to_gnode(gpa); ++ m = uv_gpa_to_offset(gpa); + + /* the 14-bit pnode */ + write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m)); +@@ -1516,9 +1513,9 @@ static void pq_init(int node, int pnode) + bcp->queue_last = pqp + (DEST_Q_SIZE - 1); + } + /* +- * need the pnode of where the memory was really allocated ++ * need the gnode of where the memory was really allocated + */ +- pn = uv_gpa(pqp) >> uv_nshift; ++ pn = uv_gpa_to_gnode(uv_gpa(pqp)); + first = uv_physnodeaddr(pqp); + pn_first = ((unsigned long)pn << UV_PAYLOADQ_PNODE_SHIFT) | first; + last = uv_physnodeaddr(pqp + (DEST_Q_SIZE - 1)); +@@ -1812,8 +1809,6 @@ static int __init uv_bau_init(void) + zalloc_cpumask_var_node(mask, GFP_KERNEL, cpu_to_node(cur_cpu)); + } + +- uv_nshift = uv_hub_info->m_val; +- uv_mmask = (1UL << uv_hub_info->m_val) - 1; + nuvhubs = uv_num_possible_blades(); + spin_lock_init(&disable_lock); + congested_cycles = usec_2_cycles(congested_respns_us); +diff --git a/block/genhd.c b/block/genhd.c +index 3608289..8c0829a 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -611,6 +611,12 @@ void add_disk(struct gendisk *disk) + register_disk(disk); + blk_register_queue(disk); + ++ /* ++ * Take an extra ref on queue which will be put on disk_release() ++ * so that it sticks around as long as @disk is there. ++ */ ++ WARN_ON_ONCE(blk_get_queue(disk->queue)); ++ + retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj, + "bdi"); + WARN_ON(retval); +@@ -1103,6 +1109,8 @@ static void disk_release(struct device *dev) + disk_replace_part_tbl(disk, NULL); + free_part_stats(&disk->part0); + free_part_info(&disk->part0); ++ if (disk->queue) ++ blk_put_queue(disk->queue); + kfree(disk); + } + struct class block_class = { +diff --git a/crypto/cryptd.c b/crypto/cryptd.c +index e46d21a..671d4d6 100644 +--- a/crypto/cryptd.c ++++ b/crypto/cryptd.c +@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void) + crypto_unregister_template(&cryptd_tmpl); + } + +-module_init(cryptd_init); ++subsys_initcall(cryptd_init); + module_exit(cryptd_exit); + + MODULE_LICENSE("GPL"); +diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c +index 7489b89..f151afe 100644 +--- a/drivers/acpi/atomicio.c ++++ b/drivers/acpi/atomicio.c +@@ -76,7 +76,7 @@ static void __iomem *__acpi_ioremap_fast(phys_addr_t paddr, + { + struct acpi_iomap *map; + +- map = __acpi_find_iomap(paddr, size); ++ map = __acpi_find_iomap(paddr, size/8); + if (map) + return map->vaddr + (paddr - map->paddr); + else +diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c +index 6f6e771..6da6deb 100644 +--- a/drivers/ata/ata_piix.c ++++ b/drivers/ata/ata_piix.c +@@ -113,6 +113,8 @@ enum { + PIIX_PATA_FLAGS = ATA_FLAG_SLAVE_POSS, + PIIX_SATA_FLAGS = ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR, + ++ PIIX_FLAG_PIO16 = (1 << 30), /*support 16bit PIO only*/ ++ + PIIX_80C_PRI = (1 << 5) | (1 << 4), + PIIX_80C_SEC = (1 << 7) | (1 << 6), + +@@ -147,6 +149,7 @@ enum piix_controller_ids { + ich8m_apple_sata, /* locks up on second port enable */ + tolapai_sata, + piix_pata_vmw, /* PIIX4 for VMware, spurious DMA_ERR */ ++ ich8_sata_snb, + }; + + struct piix_map_db { +@@ -177,6 +180,7 @@ static int piix_sidpr_scr_write(struct ata_link *link, + static int piix_sidpr_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, + unsigned hints); + static bool piix_irq_check(struct ata_port *ap); ++static int piix_port_start(struct ata_port *ap); + #ifdef CONFIG_PM + static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); + static int piix_pci_device_resume(struct pci_dev *pdev); +@@ -298,21 +302,21 @@ static const struct pci_device_id piix_pci_tbl[] = { + /* SATA Controller IDE (PCH) */ + { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, + /* SATA Controller IDE (CPT) */ +- { 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, ++ { 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, + /* SATA Controller IDE (CPT) */ +- { 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, ++ { 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, + /* SATA Controller IDE (CPT) */ + { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (CPT) */ + { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (PBG) */ +- { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, ++ { 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, + /* SATA Controller IDE (PBG) */ + { 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (Panther Point) */ +- { 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, ++ { 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, + /* SATA Controller IDE (Panther Point) */ +- { 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, ++ { 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, + /* SATA Controller IDE (Panther Point) */ + { 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + /* SATA Controller IDE (Panther Point) */ +@@ -338,6 +342,7 @@ static struct scsi_host_template piix_sht = { + static struct ata_port_operations piix_sata_ops = { + .inherits = &ata_bmdma32_port_ops, + .sff_irq_check = piix_irq_check, ++ .port_start = piix_port_start, + }; + + static struct ata_port_operations piix_pata_ops = { +@@ -478,6 +483,7 @@ static const struct piix_map_db *piix_map_db_table[] = { + [ich8_2port_sata] = &ich8_2port_map_db, + [ich8m_apple_sata] = &ich8m_apple_map_db, + [tolapai_sata] = &tolapai_map_db, ++ [ich8_sata_snb] = &ich8_map_db, + }; + + static struct ata_port_info piix_port_info[] = { +@@ -606,6 +612,19 @@ static struct ata_port_info piix_port_info[] = { + .port_ops = &piix_vmw_ops, + }, + ++ /* ++ * some Sandybridge chipsets have broken 32 mode up to now, ++ * see https://bugzilla.kernel.org/show_bug.cgi?id=40592 ++ */ ++ [ich8_sata_snb] = ++ { ++ .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16, ++ .pio_mask = ATA_PIO4, ++ .mwdma_mask = ATA_MWDMA2, ++ .udma_mask = ATA_UDMA6, ++ .port_ops = &piix_sata_ops, ++ }, ++ + }; + + static struct pci_bits piix_enable_bits[] = { +@@ -649,6 +668,14 @@ static const struct ich_laptop ich_laptop[] = { + { 0, } + }; + ++static int piix_port_start(struct ata_port *ap) ++{ ++ if (!(ap->flags & PIIX_FLAG_PIO16)) ++ ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE; ++ ++ return ata_bmdma_port_start(ap); ++} ++ + /** + * ich_pata_cable_detect - Probe host controller cable detect info + * @ap: Port for which cable detect info is desired +diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c +index 0d4587b..1023392 100644 +--- a/drivers/base/power/runtime.c ++++ b/drivers/base/power/runtime.c +@@ -278,6 +278,9 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev) + * If a deferred resume was requested while the callback was running then carry + * it out; otherwise send an idle notification for the device (if the suspend + * failed) or for its parent (if the suspend succeeded). ++ * If ->runtime_suspend failed with -EAGAIN or -EBUSY, and if the RPM_AUTO ++ * flag is set and the next autosuspend-delay expiration time is in the ++ * future, schedule another autosuspend attempt. + * + * This function must be called under dev->power.lock with interrupts disabled. + */ +@@ -389,10 +392,21 @@ static int rpm_suspend(struct device *dev, int rpmflags) + if (retval) { + __update_runtime_status(dev, RPM_ACTIVE); + dev->power.deferred_resume = 0; +- if (retval == -EAGAIN || retval == -EBUSY) ++ if (retval == -EAGAIN || retval == -EBUSY) { + dev->power.runtime_error = 0; +- else ++ ++ /* ++ * If the callback routine failed an autosuspend, and ++ * if the last_busy time has been updated so that there ++ * is a new autosuspend expiration time, automatically ++ * reschedule another autosuspend. ++ */ ++ if ((rpmflags & RPM_AUTO) && ++ pm_runtime_autosuspend_expiration(dev) != 0) ++ goto repeat; ++ } else { + pm_runtime_cancel_pending(dev); ++ } + } else { + no_callback: + __update_runtime_status(dev, RPM_SUSPENDED); +diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c +index 8f4ef65..c2f9b3e 100644 +--- a/drivers/block/cciss.c ++++ b/drivers/block/cciss.c +@@ -4533,6 +4533,13 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, + pmcsr &= ~PCI_PM_CTRL_STATE_MASK; + pmcsr |= PCI_D0; + pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); ++ ++ /* ++ * The P600 requires a small delay when changing states. ++ * Otherwise we may think the board did not reset and we bail. ++ * This for kdump only and is particular to the P600. ++ */ ++ msleep(500); + } + return 0; + } +diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c +index 5cf2993..54139d0 100644 +--- a/drivers/block/xen-blkback/blkback.c ++++ b/drivers/block/xen-blkback/blkback.c +@@ -667,7 +667,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif, + + if (operation == READ) + blkif->st_rd_sect += preq.nr_sects; +- else if (operation == WRITE || operation == WRITE_FLUSH) ++ else if (operation & WRITE) + blkif->st_wr_sect += preq.nr_sects; + + return 0; +diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c +index 6bacef3..db7cb81 100644 +--- a/drivers/bluetooth/ath3k.c ++++ b/drivers/bluetooth/ath3k.c +@@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = { + /* Atheros AR3011 with sflash firmware*/ + { USB_DEVICE(0x0CF3, 0x3002) }, + { USB_DEVICE(0x13d3, 0x3304) }, ++ { USB_DEVICE(0x0930, 0x0215) }, + + /* Atheros AR9285 Malbec with sflash firmware */ + { USB_DEVICE(0x03F0, 0x311D) }, +@@ -375,6 +376,11 @@ static int ath3k_probe(struct usb_interface *intf, + + /* load patch and sysconfig files for AR3012 */ + if (id->driver_info & BTUSB_ATH3012) { ++ ++ /* New firmware with patch and sysconfig files already loaded */ ++ if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x0001) ++ return -ENODEV; ++ + ret = ath3k_load_patch(udev); + if (ret < 0) { + BT_ERR("Loading patch file failed"); +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index c2de895..b9af6db 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -54,11 +54,15 @@ static struct usb_driver btusb_driver; + #define BTUSB_BCM92035 0x10 + #define BTUSB_BROKEN_ISOC 0x20 + #define BTUSB_WRONG_SCO_MTU 0x40 ++#define BTUSB_ATH3012 0x80 + + static struct usb_device_id btusb_table[] = { + /* Generic Bluetooth USB device */ + { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, + ++ /* Broadcom SoftSailing reporting vendor specific */ ++ { USB_DEVICE(0x05ac, 0x21e1) }, ++ + /* Apple MacBookPro 7,1 */ + { USB_DEVICE(0x05ac, 0x8213) }, + +@@ -71,9 +75,15 @@ static struct usb_device_id btusb_table[] = { + /* Apple MacBookAir3,1, MacBookAir3,2 */ + { USB_DEVICE(0x05ac, 0x821b) }, + ++ /* Apple MacBookAir4,1 */ ++ { USB_DEVICE(0x05ac, 0x821f) }, ++ + /* Apple MacBookPro8,2 */ + { USB_DEVICE(0x05ac, 0x821a) }, + ++ /* Apple MacMini5,1 */ ++ { USB_DEVICE(0x05ac, 0x8281) }, ++ + /* AVM BlueFRITZ! USB v2.0 */ + { USB_DEVICE(0x057c, 0x3800) }, + +@@ -105,12 +115,13 @@ static struct usb_device_id blacklist_table[] = { + /* Atheros 3011 with sflash firmware */ + { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE }, + { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE }, ++ { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE }, + + /* Atheros AR9285 Malbec with sflash firmware */ + { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE }, + + /* Atheros 3012 with sflash firmware */ +- { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_IGNORE }, ++ { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, + + /* Atheros AR5BBU12 with sflash firmware */ + { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, +@@ -914,6 +925,15 @@ static int btusb_probe(struct usb_interface *intf, + if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER) + return -ENODEV; + ++ if (id->driver_info & BTUSB_ATH3012) { ++ struct usb_device *udev = interface_to_usbdev(intf); ++ ++ /* Old firmware would otherwise let ath3k driver load ++ * patch and sysconfig files */ ++ if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001) ++ return -ENODEV; ++ } ++ + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; +diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c +index e2aced6..14264a8 100644 +--- a/drivers/gpu/drm/i915/intel_dp.c ++++ b/drivers/gpu/drm/i915/intel_dp.c +@@ -1658,6 +1658,31 @@ g4x_dp_detect(struct intel_dp *intel_dp) + return status; + } + ++static struct edid * ++intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) ++{ ++ struct intel_dp *intel_dp = intel_attached_dp(connector); ++ struct edid *edid; ++ ++ ironlake_edp_panel_vdd_on(intel_dp); ++ edid = drm_get_edid(connector, adapter); ++ ironlake_edp_panel_vdd_off(intel_dp); ++ return edid; ++} ++ ++static int ++intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *adapter) ++{ ++ struct intel_dp *intel_dp = intel_attached_dp(connector); ++ int ret; ++ ++ ironlake_edp_panel_vdd_on(intel_dp); ++ ret = intel_ddc_get_modes(connector, adapter); ++ ironlake_edp_panel_vdd_off(intel_dp); ++ return ret; ++} ++ ++ + /** + * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect DP connection. + * +@@ -1684,7 +1709,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) + if (intel_dp->force_audio) { + intel_dp->has_audio = intel_dp->force_audio > 0; + } else { +- edid = drm_get_edid(connector, &intel_dp->adapter); ++ edid = intel_dp_get_edid(connector, &intel_dp->adapter); + if (edid) { + intel_dp->has_audio = drm_detect_monitor_audio(edid); + connector->display_info.raw_edid = NULL; +@@ -1705,7 +1730,7 @@ static int intel_dp_get_modes(struct drm_connector *connector) + /* We should parse the EDID data and find out if it has an audio sink + */ + +- ret = intel_ddc_get_modes(connector, &intel_dp->adapter); ++ ret = intel_dp_get_edid_modes(connector, &intel_dp->adapter); + if (ret) { + if (is_edp(intel_dp) && !dev_priv->panel_fixed_mode) { + struct drm_display_mode *newmode; +@@ -1741,7 +1766,7 @@ intel_dp_detect_audio(struct drm_connector *connector) + struct edid *edid; + bool has_audio = false; + +- edid = drm_get_edid(connector, &intel_dp->adapter); ++ edid = intel_dp_get_edid(connector, &intel_dp->adapter); + if (edid) { + has_audio = drm_detect_monitor_audio(edid); + +diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c +index 05f500c..f8aa821 100644 +--- a/drivers/gpu/drm/i915/intel_panel.c ++++ b/drivers/gpu/drm/i915/intel_panel.c +@@ -226,7 +226,7 @@ static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level) + I915_WRITE(BLC_PWM_CPU_CTL, val | level); + } + +-void intel_panel_set_backlight(struct drm_device *dev, u32 level) ++static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 level) + { + struct drm_i915_private *dev_priv = dev->dev_private; + u32 tmp; +@@ -254,16 +254,21 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level) + I915_WRITE(BLC_PWM_CTL, tmp | level); + } + +-void intel_panel_disable_backlight(struct drm_device *dev) ++void intel_panel_set_backlight(struct drm_device *dev, u32 level) + { + struct drm_i915_private *dev_priv = dev->dev_private; + +- if (dev_priv->backlight_enabled) { +- dev_priv->backlight_level = intel_panel_get_backlight(dev); +- dev_priv->backlight_enabled = false; +- } ++ dev_priv->backlight_level = level; ++ if (dev_priv->backlight_enabled) ++ intel_panel_actually_set_backlight(dev, level); ++} ++ ++void intel_panel_disable_backlight(struct drm_device *dev) ++{ ++ struct drm_i915_private *dev_priv = dev->dev_private; + +- intel_panel_set_backlight(dev, 0); ++ dev_priv->backlight_enabled = false; ++ intel_panel_actually_set_backlight(dev, 0); + } + + void intel_panel_enable_backlight(struct drm_device *dev) +@@ -273,8 +278,8 @@ void intel_panel_enable_backlight(struct drm_device *dev) + if (dev_priv->backlight_level == 0) + dev_priv->backlight_level = intel_panel_get_max_backlight(dev); + +- intel_panel_set_backlight(dev, dev_priv->backlight_level); + dev_priv->backlight_enabled = true; ++ intel_panel_actually_set_backlight(dev, dev_priv->backlight_level); + } + + void intel_panel_setup_backlight(struct drm_device *dev) +diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c +index 79e8ebc..b5628ce 100644 +--- a/drivers/gpu/drm/radeon/atombios_dp.c ++++ b/drivers/gpu/drm/radeon/atombios_dp.c +@@ -553,6 +553,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, + { + struct drm_device *dev = encoder->dev; + struct radeon_device *rdev = dev->dev_private; ++ struct radeon_connector *radeon_connector = to_radeon_connector(connector); + int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE; + + if (!ASIC_IS_DCE4(rdev)) +@@ -560,10 +561,20 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, + + if (radeon_connector_encoder_is_dp_bridge(connector)) + panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; ++ else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { ++ u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); ++ if (tmp & 1) ++ panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; ++ } + + atombios_dig_encoder_setup(encoder, + ATOM_ENCODER_CMD_SETUP_PANEL_MODE, + panel_mode); ++ ++ if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) && ++ (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) { ++ radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1); ++ } + } + + void radeon_dp_set_link_config(struct drm_connector *connector, +diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c +index ea7a24e..f1bdb58 100644 +--- a/drivers/gpu/drm/radeon/evergreen.c ++++ b/drivers/gpu/drm/radeon/evergreen.c +@@ -353,6 +353,7 @@ void evergreen_hpd_init(struct radeon_device *rdev) + default: + break; + } ++ radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + } + if (rdev->irq.installed) + evergreen_irq_set(rdev); +diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c +index 7fcdbbb..c9a0dae 100644 +--- a/drivers/gpu/drm/radeon/r100.c ++++ b/drivers/gpu/drm/radeon/r100.c +@@ -434,6 +434,7 @@ void r100_hpd_init(struct radeon_device *rdev) + default: + break; + } ++ radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + } + if (rdev->irq.installed) + r100_irq_set(rdev); +diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c +index 1dea9d6..1a4ed43 100644 +--- a/drivers/gpu/drm/radeon/r600.c ++++ b/drivers/gpu/drm/radeon/r600.c +@@ -762,13 +762,14 @@ void r600_hpd_init(struct radeon_device *rdev) + struct drm_device *dev = rdev->ddev; + struct drm_connector *connector; + +- if (ASIC_IS_DCE3(rdev)) { +- u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa); +- if (ASIC_IS_DCE32(rdev)) +- tmp |= DC_HPDx_EN; ++ list_for_each_entry(connector, &dev->mode_config.connector_list, head) { ++ struct radeon_connector *radeon_connector = to_radeon_connector(connector); ++ ++ if (ASIC_IS_DCE3(rdev)) { ++ u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa); ++ if (ASIC_IS_DCE32(rdev)) ++ tmp |= DC_HPDx_EN; + +- list_for_each_entry(connector, &dev->mode_config.connector_list, head) { +- struct radeon_connector *radeon_connector = to_radeon_connector(connector); + switch (radeon_connector->hpd.hpd) { + case RADEON_HPD_1: + WREG32(DC_HPD1_CONTROL, tmp); +@@ -798,10 +799,7 @@ void r600_hpd_init(struct radeon_device *rdev) + default: + break; + } +- } +- } else { +- list_for_each_entry(connector, &dev->mode_config.connector_list, head) { +- struct radeon_connector *radeon_connector = to_radeon_connector(connector); ++ } else { + switch (radeon_connector->hpd.hpd) { + case RADEON_HPD_1: + WREG32(DC_HOT_PLUG_DETECT1_CONTROL, DC_HOT_PLUG_DETECTx_EN); +@@ -819,6 +817,7 @@ void r600_hpd_init(struct radeon_device *rdev) + break; + } + } ++ radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + } + if (rdev->irq.installed) + r600_irq_set(rdev); +diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h +index 0bb4ddf..59d72d0 100644 +--- a/drivers/gpu/drm/radeon/radeon.h ++++ b/drivers/gpu/drm/radeon/radeon.h +@@ -93,6 +93,7 @@ extern int radeon_audio; + extern int radeon_disp_priority; + extern int radeon_hw_i2c; + extern int radeon_pcie_gen2; ++extern int radeon_msi; + + /* + * Copy from radeon_drv.h so we don't have to include both and have conflicting +diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c +index cd3c86c..859df6b 100644 +--- a/drivers/gpu/drm/radeon/radeon_combios.c ++++ b/drivers/gpu/drm/radeon/radeon_combios.c +@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde + i2c.y_data_mask = 0x80; + } else { + /* default masks for ddc pads */ +- i2c.mask_clk_mask = RADEON_GPIO_EN_1; +- i2c.mask_data_mask = RADEON_GPIO_EN_0; ++ i2c.mask_clk_mask = RADEON_GPIO_MASK_1; ++ i2c.mask_data_mask = RADEON_GPIO_MASK_0; + i2c.a_clk_mask = RADEON_GPIO_A_1; + i2c.a_data_mask = RADEON_GPIO_A_0; + i2c.en_clk_mask = RADEON_GPIO_EN_1; +diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c +index 05b8b2c..2109c17 100644 +--- a/drivers/gpu/drm/radeon/radeon_connectors.c ++++ b/drivers/gpu/drm/radeon/radeon_connectors.c +@@ -715,6 +715,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force) + dret = radeon_ddc_probe(radeon_connector, + radeon_connector->requires_extended_probe); + if (dret) { ++ radeon_connector->detected_by_load = false; + if (radeon_connector->edid) { + kfree(radeon_connector->edid); + radeon_connector->edid = NULL; +@@ -741,12 +742,21 @@ radeon_vga_detect(struct drm_connector *connector, bool force) + } else { + + /* if we aren't forcing don't do destructive polling */ +- if (!force) +- return connector->status; ++ if (!force) { ++ /* only return the previous status if we last ++ * detected a monitor via load. ++ */ ++ if (radeon_connector->detected_by_load) ++ return connector->status; ++ else ++ return ret; ++ } + + if (radeon_connector->dac_load_detect && encoder) { + encoder_funcs = encoder->helper_private; + ret = encoder_funcs->detect(encoder, connector); ++ if (ret != connector_status_disconnected) ++ radeon_connector->detected_by_load = true; + } + } + +@@ -888,6 +898,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) + dret = radeon_ddc_probe(radeon_connector, + radeon_connector->requires_extended_probe); + if (dret) { ++ radeon_connector->detected_by_load = false; + if (radeon_connector->edid) { + kfree(radeon_connector->edid); + radeon_connector->edid = NULL; +@@ -950,8 +961,18 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) + if ((ret == connector_status_connected) && (radeon_connector->use_digital == true)) + goto out; + ++ /* DVI-D and HDMI-A are digital only */ ++ if ((connector->connector_type == DRM_MODE_CONNECTOR_DVID) || ++ (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)) ++ goto out; ++ ++ /* if we aren't forcing don't do destructive polling */ + if (!force) { +- ret = connector->status; ++ /* only return the previous status if we last ++ * detected a monitor via load. ++ */ ++ if (radeon_connector->detected_by_load) ++ ret = connector->status; + goto out; + } + +@@ -976,6 +997,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) + if (ret == connector_status_connected) { + radeon_connector->use_digital = false; + } ++ if (ret != connector_status_disconnected) ++ radeon_connector->detected_by_load = true; + } + break; + } +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +index 73dfbe8..60e1605 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -117,6 +117,7 @@ int radeon_audio = 0; + int radeon_disp_priority = 0; + int radeon_hw_i2c = 0; + int radeon_pcie_gen2 = 0; ++int radeon_msi = -1; + + MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); + module_param_named(no_wb, radeon_no_wb, int, 0444); +@@ -163,6 +164,9 @@ module_param_named(hw_i2c, radeon_hw_i2c, int, 0444); + MODULE_PARM_DESC(pcie_gen2, "PCIE Gen2 mode (1 = enable)"); + module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444); + ++MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); ++module_param_named(msi, radeon_msi, int, 0444); ++ + static int radeon_suspend(struct drm_device *dev, pm_message_t state) + { + drm_radeon_private_t *dev_priv = dev->dev_private; +diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c +index 9ec830c..fecc1aa 100644 +--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c ++++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c +@@ -108,6 +108,46 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev) + radeon_irq_set(rdev); + } + ++static bool radeon_msi_ok(struct radeon_device *rdev) ++{ ++ /* RV370/RV380 was first asic with MSI support */ ++ if (rdev->family < CHIP_RV380) ++ return false; ++ ++ /* MSIs don't work on AGP */ ++ if (rdev->flags & RADEON_IS_AGP) ++ return false; ++ ++ /* force MSI on */ ++ if (radeon_msi == 1) ++ return true; ++ else if (radeon_msi == 0) ++ return false; ++ ++ /* Quirks */ ++ /* HP RS690 only seems to work with MSIs. */ ++ if ((rdev->pdev->device == 0x791f) && ++ (rdev->pdev->subsystem_vendor == 0x103c) && ++ (rdev->pdev->subsystem_device == 0x30c2)) ++ return true; ++ ++ /* Dell RS690 only seems to work with MSIs. */ ++ if ((rdev->pdev->device == 0x791f) && ++ (rdev->pdev->subsystem_vendor == 0x1028) && ++ (rdev->pdev->subsystem_device == 0x01fd)) ++ return true; ++ ++ if (rdev->flags & RADEON_IS_IGP) { ++ /* APUs work fine with MSIs */ ++ if (rdev->family >= CHIP_PALM) ++ return true; ++ /* lots of IGPs have problems with MSIs */ ++ return false; ++ } ++ ++ return true; ++} ++ + int radeon_irq_kms_init(struct radeon_device *rdev) + { + int i; +@@ -124,12 +164,8 @@ int radeon_irq_kms_init(struct radeon_device *rdev) + } + /* enable msi */ + rdev->msi_enabled = 0; +- /* MSIs don't seem to work reliably on all IGP +- * chips. Disable MSI on them for now. +- */ +- if ((rdev->family >= CHIP_RV380) && +- ((!(rdev->flags & RADEON_IS_IGP)) || (rdev->family >= CHIP_PALM)) && +- (!(rdev->flags & RADEON_IS_AGP))) { ++ ++ if (radeon_msi_ok(rdev)) { + int ret = pci_enable_msi(rdev->pdev); + if (!ret) { + rdev->msi_enabled = 1; +diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h +index 68820f5..ed0178f 100644 +--- a/drivers/gpu/drm/radeon/radeon_mode.h ++++ b/drivers/gpu/drm/radeon/radeon_mode.h +@@ -447,6 +447,7 @@ struct radeon_connector { + struct edid *edid; + void *con_priv; + bool dac_load_detect; ++ bool detected_by_load; /* if the connection status was determined by load */ + uint16_t connector_object_id; + struct radeon_hpd hpd; + struct radeon_router router; +diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c +index 1f5850e..aea28c3 100644 +--- a/drivers/gpu/drm/radeon/rs600.c ++++ b/drivers/gpu/drm/radeon/rs600.c +@@ -287,6 +287,7 @@ void rs600_hpd_init(struct radeon_device *rdev) + default: + break; + } ++ radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + } + if (rdev->irq.installed) + rs600_irq_set(rdev); +diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig +index 36ca465..7e0acf4 100644 +--- a/drivers/hid/Kconfig ++++ b/drivers/hid/Kconfig +@@ -69,7 +69,7 @@ config HID_ACRUX + Say Y here if you want to enable support for ACRUX game controllers. + + config HID_ACRUX_FF +- tristate "ACRUX force feedback support" ++ bool "ACRUX force feedback support" + depends on HID_ACRUX + select INPUT_FF_MEMLESS + ---help--- +@@ -314,6 +314,7 @@ config HID_MULTITOUCH + - Hanvon dual touch panels + - Ilitek dual touch panels + - IrTouch Infrared USB panels ++ - LG Display panels (Dell ST2220Tc) + - Lumio CrystalTouch panels + - MosArt dual-touch panels + - PenMount dual touch panels +diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c +index b85744f..299d238 100644 +--- a/drivers/hid/hid-apple.c ++++ b/drivers/hid/hid-apple.c +@@ -444,11 +444,20 @@ static const struct hid_device_id apple_devices[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | + APPLE_RDESC_JIS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI), ++ .driver_data = APPLE_HAS_FN }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO), ++ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS), ++ .driver_data = APPLE_HAS_FN }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | + APPLE_ISO_KEYBOARD }, ++ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO), ++ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | ++ APPLE_ISO_KEYBOARD }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS), + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI), +@@ -487,6 +496,24 @@ static const struct hid_device_id apple_devices[] = { + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI), ++ .driver_data = APPLE_HAS_FN }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO), ++ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS), ++ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI), ++ .driver_data = APPLE_HAS_FN }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO), ++ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS), ++ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), ++ .driver_data = APPLE_HAS_FN }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), ++ .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), ++ .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index 6f3289a..4f81d20 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -1340,9 +1340,22 @@ static const struct hid_device_id hid_have_special_driver[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, ++ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, +@@ -1395,6 +1408,7 @@ static const struct hid_device_id hid_have_special_driver[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) }, +@@ -1883,6 +1897,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, + { } +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index c946d90..c97003c 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -109,9 +109,22 @@ + #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 + #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 + #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 ++#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI 0x0249 ++#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO 0x024a ++#define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS 0x024b ++#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c ++#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d ++#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e ++#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI 0x024f ++#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO 0x0250 ++#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS 0x0251 ++#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 ++#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 ++#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239 + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a + #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b ++#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 + #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a + #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b + #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241 +@@ -274,6 +287,7 @@ + #define USB_DEVICE_ID_PENPOWER 0x00f4 + + #define USB_VENDOR_ID_GREENASIA 0x0e8f ++#define USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD 0x3013 + + #define USB_VENDOR_ID_GRETAGMACBETH 0x0971 + #define USB_DEVICE_ID_GRETAGMACBETH_HUEY 0x2005 +@@ -416,6 +430,9 @@ + #define USB_DEVICE_ID_LD_HYBRID 0x2090 + #define USB_DEVICE_ID_LD_HEATCONTROL 0x20A0 + ++#define USB_VENDOR_ID_LG 0x1fd2 ++#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064 ++ + #define USB_VENDOR_ID_LOGITECH 0x046d + #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 + #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 +diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c +index 62cac4d..685d8e4 100644 +--- a/drivers/hid/hid-multitouch.c ++++ b/drivers/hid/hid-multitouch.c +@@ -672,6 +672,11 @@ static const struct hid_device_id mt_devices[] = { + HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS, + USB_DEVICE_ID_IRTOUCH_INFRARED_USB) }, + ++ /* LG Display panels */ ++ { .driver_data = MT_CLS_DEFAULT, ++ HID_USB_DEVICE(USB_VENDOR_ID_LG, ++ USB_DEVICE_ID_LG_MULTITOUCH) }, ++ + /* Lumio panels */ + { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE, + HID_USB_DEVICE(USB_VENDOR_ID_LUMIO, +diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c +index 4bdb5d4..3146fdc 100644 +--- a/drivers/hid/usbhid/hid-quirks.c ++++ b/drivers/hid/usbhid/hid-quirks.c +@@ -47,6 +47,7 @@ static const struct hid_blacklist { + { USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL }, + + { USB_VENDOR_ID_ETURBOTOUCH, USB_DEVICE_ID_ETURBOTOUCH, HID_QUIRK_MULTI_INPUT }, ++ { USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, + { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT }, +diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c +index 0070d54..f642194 100644 +--- a/drivers/hwmon/coretemp.c ++++ b/drivers/hwmon/coretemp.c +@@ -50,14 +50,13 @@ + #ifdef CONFIG_SMP + #define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id + #define TO_CORE_ID(cpu) cpu_data(cpu).cpu_core_id +-#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) + #define for_each_sibling(i, cpu) for_each_cpu(i, cpu_sibling_mask(cpu)) + #else + #define TO_PHYS_ID(cpu) (cpu) + #define TO_CORE_ID(cpu) (cpu) +-#define TO_ATTR_NO(cpu) (cpu) + #define for_each_sibling(i, cpu) for (i = 0; false; ) + #endif ++#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) + + /* + * Per-Core Temperature Data +diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c +index 36d7f27..4b2fc50 100644 +--- a/drivers/hwmon/w83627ehf.c ++++ b/drivers/hwmon/w83627ehf.c +@@ -1756,7 +1756,17 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, + diode = 0x70; + } + for (i = 0; i < 3; i++) { +- if ((tmp & (0x02 << i))) ++ const char *label = NULL; ++ ++ if (data->temp_label) ++ label = data->temp_label[data->temp_src[i]]; ++ ++ /* Digital source overrides analog type */ ++ if (label && strncmp(label, "PECI", 4) == 0) ++ data->temp_type[i] = 6; ++ else if (label && strncmp(label, "AMD", 3) == 0) ++ data->temp_type[i] = 5; ++ else if ((tmp & (0x02 << i))) + data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3; + else + data->temp_type[i] = 4; /* thermistor */ +diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c +index 43a6271..12f7c83 100644 +--- a/drivers/hwspinlock/hwspinlock_core.c ++++ b/drivers/hwspinlock/hwspinlock_core.c +@@ -26,6 +26,7 @@ + #include <linux/radix-tree.h> + #include <linux/hwspinlock.h> + #include <linux/pm_runtime.h> ++#include <linux/mutex.h> + + #include "hwspinlock_internal.h" + +@@ -52,10 +53,12 @@ + static RADIX_TREE(hwspinlock_tree, GFP_KERNEL); + + /* +- * Synchronization of access to the tree is achieved using this spinlock, ++ * Synchronization of access to the tree is achieved using this mutex, + * as the radix-tree API requires that users provide all synchronisation. ++ * A mutex is needed because we're using non-atomic radix tree allocations. + */ +-static DEFINE_SPINLOCK(hwspinlock_tree_lock); ++static DEFINE_MUTEX(hwspinlock_tree_lock); ++ + + /** + * __hwspin_trylock() - attempt to lock a specific hwspinlock +@@ -261,8 +264,7 @@ EXPORT_SYMBOL_GPL(__hwspin_unlock); + * This function should be called from the underlying platform-specific + * implementation, to register a new hwspinlock instance. + * +- * Can be called from an atomic context (will not sleep) but not from +- * within interrupt context. ++ * Should be called from a process context (might sleep) + * + * Returns 0 on success, or an appropriate error code on failure + */ +@@ -279,7 +281,7 @@ int hwspin_lock_register(struct hwspinlock *hwlock) + + spin_lock_init(&hwlock->lock); + +- spin_lock(&hwspinlock_tree_lock); ++ mutex_lock(&hwspinlock_tree_lock); + + ret = radix_tree_insert(&hwspinlock_tree, hwlock->id, hwlock); + if (ret) +@@ -293,7 +295,7 @@ int hwspin_lock_register(struct hwspinlock *hwlock) + WARN_ON(tmp != hwlock); + + out: +- spin_unlock(&hwspinlock_tree_lock); ++ mutex_unlock(&hwspinlock_tree_lock); + return ret; + } + EXPORT_SYMBOL_GPL(hwspin_lock_register); +@@ -305,8 +307,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_register); + * This function should be called from the underlying platform-specific + * implementation, to unregister an existing (and unused) hwspinlock. + * +- * Can be called from an atomic context (will not sleep) but not from +- * within interrupt context. ++ * Should be called from a process context (might sleep) + * + * Returns the address of hwspinlock @id on success, or NULL on failure + */ +@@ -315,7 +316,7 @@ struct hwspinlock *hwspin_lock_unregister(unsigned int id) + struct hwspinlock *hwlock = NULL; + int ret; + +- spin_lock(&hwspinlock_tree_lock); ++ mutex_lock(&hwspinlock_tree_lock); + + /* make sure the hwspinlock is not in use (tag is set) */ + ret = radix_tree_tag_get(&hwspinlock_tree, id, HWSPINLOCK_UNUSED); +@@ -331,7 +332,7 @@ struct hwspinlock *hwspin_lock_unregister(unsigned int id) + } + + out: +- spin_unlock(&hwspinlock_tree_lock); ++ mutex_unlock(&hwspinlock_tree_lock); + return hwlock; + } + EXPORT_SYMBOL_GPL(hwspin_lock_unregister); +@@ -400,9 +401,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_get_id); + * to the remote core before it can be used for synchronization (to get the + * id of a given hwlock, use hwspin_lock_get_id()). + * +- * Can be called from an atomic context (will not sleep) but not from +- * within interrupt context (simply because there is no use case for +- * that yet). ++ * Should be called from a process context (might sleep) + * + * Returns the address of the assigned hwspinlock, or NULL on error + */ +@@ -411,7 +410,7 @@ struct hwspinlock *hwspin_lock_request(void) + struct hwspinlock *hwlock; + int ret; + +- spin_lock(&hwspinlock_tree_lock); ++ mutex_lock(&hwspinlock_tree_lock); + + /* look for an unused lock */ + ret = radix_tree_gang_lookup_tag(&hwspinlock_tree, (void **)&hwlock, +@@ -431,7 +430,7 @@ struct hwspinlock *hwspin_lock_request(void) + hwlock = NULL; + + out: +- spin_unlock(&hwspinlock_tree_lock); ++ mutex_unlock(&hwspinlock_tree_lock); + return hwlock; + } + EXPORT_SYMBOL_GPL(hwspin_lock_request); +@@ -445,9 +444,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request); + * Usually early board code will be calling this function in order to + * reserve specific hwspinlock ids for predefined purposes. + * +- * Can be called from an atomic context (will not sleep) but not from +- * within interrupt context (simply because there is no use case for +- * that yet). ++ * Should be called from a process context (might sleep) + * + * Returns the address of the assigned hwspinlock, or NULL on error + */ +@@ -456,7 +453,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id) + struct hwspinlock *hwlock; + int ret; + +- spin_lock(&hwspinlock_tree_lock); ++ mutex_lock(&hwspinlock_tree_lock); + + /* make sure this hwspinlock exists */ + hwlock = radix_tree_lookup(&hwspinlock_tree, id); +@@ -482,7 +479,7 @@ struct hwspinlock *hwspin_lock_request_specific(unsigned int id) + hwlock = NULL; + + out: +- spin_unlock(&hwspinlock_tree_lock); ++ mutex_unlock(&hwspinlock_tree_lock); + return hwlock; + } + EXPORT_SYMBOL_GPL(hwspin_lock_request_specific); +@@ -495,9 +492,7 @@ EXPORT_SYMBOL_GPL(hwspin_lock_request_specific); + * Should only be called with an @hwlock that was retrieved from + * an earlier call to omap_hwspin_lock_request{_specific}. + * +- * Can be called from an atomic context (will not sleep) but not from +- * within interrupt context (simply because there is no use case for +- * that yet). ++ * Should be called from a process context (might sleep) + * + * Returns 0 on success, or an appropriate error code on failure + */ +@@ -511,7 +506,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock) + return -EINVAL; + } + +- spin_lock(&hwspinlock_tree_lock); ++ mutex_lock(&hwspinlock_tree_lock); + + /* make sure the hwspinlock is used */ + ret = radix_tree_tag_get(&hwspinlock_tree, hwlock->id, +@@ -538,7 +533,7 @@ int hwspin_lock_free(struct hwspinlock *hwlock) + module_put(hwlock->owner); + + out: +- spin_unlock(&hwspinlock_tree_lock); ++ mutex_unlock(&hwspinlock_tree_lock); + return ret; + } + EXPORT_SYMBOL_GPL(hwspin_lock_free); +diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c +index dc3d3d8..661b692 100644 +--- a/drivers/leds/led-class.c ++++ b/drivers/leds/led-class.c +@@ -267,9 +267,14 @@ void led_blink_set(struct led_classdev *led_cdev, + unsigned long *delay_on, + unsigned long *delay_off) + { ++ del_timer_sync(&led_cdev->blink_timer); ++ + if (led_cdev->blink_set && +- !led_cdev->blink_set(led_cdev, delay_on, delay_off)) ++ !led_cdev->blink_set(led_cdev, delay_on, delay_off)) { ++ led_cdev->blink_delay_on = *delay_on; ++ led_cdev->blink_delay_off = *delay_off; + return; ++ } + + /* blink with 1 Hz as default if nothing specified */ + if (!*delay_on && !*delay_off) +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index 2581ba1..e509147 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -3369,7 +3369,7 @@ static void handle_stripe6(struct stripe_head *sh) + /* Not in-sync */; + else if (test_bit(In_sync, &rdev->flags)) + set_bit(R5_Insync, &dev->flags); +- else { ++ else if (!test_bit(Faulty, &rdev->flags)) { + /* in sync if before recovery_offset */ + if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset) + set_bit(R5_Insync, &dev->flags); +diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c +index 5eb91b4..a224e94 100644 +--- a/drivers/media/dvb/dvb-usb/dib0700_core.c ++++ b/drivers/media/dvb/dvb-usb/dib0700_core.c +@@ -30,6 +30,11 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, + struct dib0700_state *st = d->priv; + int ret; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } ++ + ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), + REQUEST_GET_VERSION, + USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, +@@ -46,6 +51,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, + if (fwtype != NULL) + *fwtype = (st->buf[12] << 24) | (st->buf[13] << 16) | + (st->buf[14] << 8) | st->buf[15]; ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +@@ -108,7 +114,12 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen + int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val) + { + struct dib0700_state *st = d->priv; +- s16 ret; ++ int ret; ++ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } + + st->buf[0] = REQUEST_SET_GPIO; + st->buf[1] = gpio; +@@ -116,6 +127,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_ + + ret = dib0700_ctrl_wr(d, st->buf, 3); + ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +@@ -125,6 +137,11 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) + int ret; + + if (st->fw_version >= 0x10201) { ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_USB_XFER_LEN; + st->buf[1] = (nb_ts_packets >> 8) & 0xff; + st->buf[2] = nb_ts_packets & 0xff; +@@ -132,6 +149,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) + deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); + + ret = dib0700_ctrl_wr(d, st->buf, 3); ++ mutex_unlock(&d->usb_mutex); + } else { + deb_info("this firmware does not allow to change the USB xfer len\n"); + ret = -EIO; +@@ -208,6 +226,10 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, + + } else { + /* Write request */ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } + st->buf[0] = REQUEST_NEW_I2C_WRITE; + st->buf[1] = msg[i].addr << 1; + st->buf[2] = (en_start << 7) | (en_stop << 6) | +@@ -227,6 +249,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, + USB_TYPE_VENDOR | USB_DIR_OUT, + 0, 0, st->buf, msg[i].len + 4, + USB_CTRL_GET_TIMEOUT); ++ mutex_unlock(&d->usb_mutex); + if (result < 0) { + deb_info("i2c write error (status = %d)\n", result); + break; +@@ -249,6 +272,10 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, + + if (mutex_lock_interruptible(&d->i2c_mutex) < 0) + return -EAGAIN; ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } + + for (i = 0; i < num; i++) { + /* fill in the address */ +@@ -279,6 +306,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, + break; + } + } ++ mutex_unlock(&d->usb_mutex); + mutex_unlock(&d->i2c_mutex); + + return i; +@@ -337,7 +365,12 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, + u16 pll_loopdiv, u16 free_div, u16 dsuScaler) + { + struct dib0700_state *st = d->priv; +- s16 ret; ++ int ret; ++ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } + + st->buf[0] = REQUEST_SET_CLOCK; + st->buf[1] = (en_pll << 7) | (pll_src << 6) | +@@ -352,6 +385,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, + st->buf[9] = dsuScaler & 0xff; /* LSB */ + + ret = dib0700_ctrl_wr(d, st->buf, 10); ++ mutex_unlock(&d->usb_mutex); + + return ret; + } +@@ -360,10 +394,16 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) + { + struct dib0700_state *st = d->priv; + u16 divider; ++ int ret; + + if (scl_kHz == 0) + return -EINVAL; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_I2C_PARAM; + divider = (u16) (30000 / scl_kHz); + st->buf[1] = 0; +@@ -379,7 +419,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) + deb_info("setting I2C speed: %04x %04x %04x (%d kHz).", + (st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) | + st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz); +- return dib0700_ctrl_wr(d, st->buf, 8); ++ ++ ret = dib0700_ctrl_wr(d, st->buf, 8); ++ mutex_unlock(&d->usb_mutex); ++ ++ return ret; + } + + +@@ -515,6 +559,11 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) + } + } + ++ if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_ENABLE_VIDEO; + /* this bit gives a kind of command, + * rather than enabling something or not */ +@@ -548,7 +597,10 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) + + deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); + +- return dib0700_ctrl_wr(adap->dev, st->buf, 4); ++ ret = dib0700_ctrl_wr(adap->dev, st->buf, 4); ++ mutex_unlock(&adap->dev->usb_mutex); ++ ++ return ret; + } + + int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) +@@ -557,6 +609,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) + struct dib0700_state *st = d->priv; + int new_proto, ret; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ deb_info("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_RC; + st->buf[1] = 0; + st->buf[2] = 0; +@@ -567,23 +624,29 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) + else if (rc_type == RC_TYPE_NEC) + new_proto = 0; + else if (rc_type == RC_TYPE_RC6) { +- if (st->fw_version < 0x10200) +- return -EINVAL; ++ if (st->fw_version < 0x10200) { ++ ret = -EINVAL; ++ goto out; ++ } + + new_proto = 2; +- } else +- return -EINVAL; ++ } else { ++ ret = -EINVAL; ++ goto out; ++ } + + st->buf[1] = new_proto; + + ret = dib0700_ctrl_wr(d, st->buf, 3); + if (ret < 0) { + err("ir protocol setup failed"); +- return ret; ++ goto out; + } + + d->props.rc.core.protocol = rc_type; + ++out: ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c +index 1d47d4d..dc1cb17 100644 +--- a/drivers/media/dvb/frontends/dib0070.c ++++ b/drivers/media/dvb/frontends/dib0070.c +@@ -27,6 +27,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -78,10 +79,18 @@ struct dib0070_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[3]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + +-static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg) ++static u16 dib0070_read_reg(struct dib0070_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); +@@ -96,13 +105,23 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg) + + if (i2c_transfer(state->i2c, state->msg, 2) != 2) { + printk(KERN_WARNING "DiB0070 I2C read failed\n"); +- return 0; +- } +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } + state->i2c_write_buffer[0] = reg; + state->i2c_write_buffer[1] = val >> 8; + state->i2c_write_buffer[2] = val & 0xff; +@@ -115,9 +134,12 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val) + + if (i2c_transfer(state->i2c, state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0070 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + #define HARD_RESET(state) do { \ +@@ -734,6 +756,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter + state->cfg = cfg; + state->i2c = i2c; + state->fe = fe; ++ mutex_init(&state->i2c_buffer_lock); + fe->tuner_priv = state; + + if (dib0070_reset(fe) != 0) +diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c +index c9c935a..b174d1c 100644 +--- a/drivers/media/dvb/frontends/dib0090.c ++++ b/drivers/media/dvb/frontends/dib0090.c +@@ -27,6 +27,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -196,6 +197,7 @@ struct dib0090_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[3]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + struct dib0090_fw_state { +@@ -208,10 +210,18 @@ struct dib0090_fw_state { + struct i2c_msg msg; + u8 i2c_write_buffer[2]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); +@@ -226,14 +236,24 @@ static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg) + + if (i2c_transfer(state->i2c, state->msg, 2) != 2) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); +- return 0; +- } ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = reg & 0xff; + state->i2c_write_buffer[1] = val >> 8; + state->i2c_write_buffer[2] = val & 0xff; +@@ -246,13 +266,23 @@ static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val) + + if (i2c_transfer(state->i2c, state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(&state->msg, 0, sizeof(struct i2c_msg)); +@@ -262,13 +292,24 @@ static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg) + state->msg.len = 2; + if (i2c_transfer(state->i2c, &state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); +- return 0; +- } +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = val >> 8; + state->i2c_write_buffer[1] = val & 0xff; + +@@ -279,9 +320,12 @@ static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val) + state->msg.len = 2; + if (i2c_transfer(state->i2c, &state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + #define HARD_RESET(state) do { if (cfg->reset) { if (cfg->sleep) cfg->sleep(fe, 0); msleep(10); cfg->reset(fe, 1); msleep(10); cfg->reset(fe, 0); msleep(10); } } while (0) +@@ -2440,6 +2484,7 @@ struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapte + st->config = config; + st->i2c = i2c; + st->fe = fe; ++ mutex_init(&st->i2c_buffer_lock); + fe->tuner_priv = st; + + if (config->wbd == NULL) +@@ -2471,6 +2516,7 @@ struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_ada + st->config = config; + st->i2c = i2c; + st->fe = fe; ++ mutex_init(&st->i2c_buffer_lock); + fe->tuner_priv = st; + + if (dib0090_fw_reset_digital(fe, st->config) != 0) +diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c +index 79cb1c2..dbb76d7 100644 +--- a/drivers/media/dvb/frontends/dib7000m.c ++++ b/drivers/media/dvb/frontends/dib7000m.c +@@ -11,6 +11,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -55,6 +56,7 @@ struct dib7000m_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib7000m_power_mode { +@@ -69,6 +71,13 @@ enum dib7000m_power_mode { + + static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) | 0x80; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -85,11 +94,21 @@ static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg) + if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2) + dprintk("i2c read error on %d",reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -101,7 +120,10 @@ static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + static void dib7000m_write_tab(struct dib7000m_state *state, u16 *buf) + { +@@ -1385,6 +1407,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + demod = &st->demod; + demod->demodulator_priv = st; + memcpy(&st->demod.ops, &dib7000m_ops, sizeof(struct dvb_frontend_ops)); ++ mutex_init(&st->i2c_buffer_lock); + + st->timf_default = cfg->bw->timf; + +diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c +index 0c9f40c..292bc19 100644 +--- a/drivers/media/dvb/frontends/dib7000p.c ++++ b/drivers/media/dvb/frontends/dib7000p.c +@@ -10,6 +10,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_math.h" + #include "dvb_frontend.h" +@@ -68,6 +69,7 @@ struct dib7000p_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib7000p_power_mode { +@@ -81,6 +83,13 @@ static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff); + + static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg >> 8; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -97,11 +106,20 @@ static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) + if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -113,7 +131,10 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf) +@@ -1646,6 +1667,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau + return -ENOMEM; + + dpst->i2c_adap = i2c; ++ mutex_init(&dpst->i2c_buffer_lock); + + for (k = no_of_demods - 1; k >= 0; k--) { + dpst->cfg = cfg[k]; +@@ -2324,6 +2346,7 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + demod = &st->demod; + demod->demodulator_priv = st; + memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops)); ++ mutex_init(&st->i2c_buffer_lock); + + dib7000p_write_word(st, 1287, 0x0003); /* sram lead in, rdy */ + +@@ -2333,8 +2356,9 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + st->version = dib7000p_read_word(st, 897); + + /* FIXME: make sure the dev.parent field is initialized, or else +- request_firmware() will hit an OOPS (this should be moved somewhere +- more common) */ ++ request_firmware() will hit an OOPS (this should be moved somewhere ++ more common) */ ++ st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; + + dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); + +diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c +index 7d2ea11..fe284d5 100644 +--- a/drivers/media/dvb/frontends/dib8000.c ++++ b/drivers/media/dvb/frontends/dib8000.c +@@ -10,6 +10,8 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> ++ + #include "dvb_math.h" + + #include "dvb_frontend.h" +@@ -37,6 +39,7 @@ struct i2c_device { + u8 addr; + u8 *i2c_write_buffer; + u8 *i2c_read_buffer; ++ struct mutex *i2c_buffer_lock; + }; + + struct dib8000_state { +@@ -77,6 +80,7 @@ struct dib8000_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib8000_power_mode { +@@ -86,24 +90,39 @@ enum dib8000_power_mode { + + static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg) + { ++ u16 ret; + struct i2c_msg msg[2] = { +- {.addr = i2c->addr >> 1, .flags = 0, +- .buf = i2c->i2c_write_buffer, .len = 2}, +- {.addr = i2c->addr >> 1, .flags = I2C_M_RD, +- .buf = i2c->i2c_read_buffer, .len = 2}, ++ {.addr = i2c->addr >> 1, .flags = 0, .len = 2}, ++ {.addr = i2c->addr >> 1, .flags = I2C_M_RD, .len = 2}, + }; + ++ if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ ++ msg[0].buf = i2c->i2c_write_buffer; + msg[0].buf[0] = reg >> 8; + msg[0].buf[1] = reg & 0xff; ++ msg[1].buf = i2c->i2c_read_buffer; + + if (i2c_transfer(i2c->adap, msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (msg[1].buf[0] << 8) | msg[1].buf[1]; ++ ret = (msg[1].buf[0] << 8) | msg[1].buf[1]; ++ mutex_unlock(i2c->i2c_buffer_lock); ++ return ret; + } + + static u16 dib8000_read_word(struct dib8000_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg >> 8; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -120,7 +139,10 @@ static u16 dib8000_read_word(struct dib8000_state *state, u16 reg) + if (i2c_transfer(state->i2c.adap, state->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static u32 dib8000_read32(struct dib8000_state *state, u16 reg) +@@ -135,22 +157,35 @@ static u32 dib8000_read32(struct dib8000_state *state, u16 reg) + + static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val) + { +- struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, +- .buf = i2c->i2c_write_buffer, .len = 4}; ++ struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, .len = 4}; + int ret = 0; + ++ if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ ++ msg.buf = i2c->i2c_write_buffer; + msg.buf[0] = (reg >> 8) & 0xff; + msg.buf[1] = reg & 0xff; + msg.buf[2] = (val >> 8) & 0xff; + msg.buf[3] = val & 0xff; + + ret = i2c_transfer(i2c->adap, &msg, 1) != 1 ? -EREMOTEIO : 0; ++ mutex_unlock(i2c->i2c_buffer_lock); + + return ret; + } + + static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -162,7 +197,11 @@ static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static const s16 coeff_2k_sb_1seg_dqpsk[8] = { +@@ -2434,8 +2473,15 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau + if (!client.i2c_read_buffer) { + dprintk("%s: not enough memory", __func__); + ret = -ENOMEM; +- goto error_memory; ++ goto error_memory_read; ++ } ++ client.i2c_buffer_lock = kzalloc(sizeof(struct mutex), GFP_KERNEL); ++ if (!client.i2c_buffer_lock) { ++ dprintk("%s: not enough memory", __func__); ++ ret = -ENOMEM; ++ goto error_memory_lock; + } ++ mutex_init(client.i2c_buffer_lock); + + for (k = no_of_demods - 1; k >= 0; k--) { + /* designated i2c address */ +@@ -2476,8 +2522,10 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau + } + + error: ++ kfree(client.i2c_buffer_lock); ++error_memory_lock: + kfree(client.i2c_read_buffer); +-error_memory: ++error_memory_read: + kfree(client.i2c_write_buffer); + + return ret; +@@ -2581,6 +2629,8 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s + state->i2c.addr = i2c_addr; + state->i2c.i2c_write_buffer = state->i2c_write_buffer; + state->i2c.i2c_read_buffer = state->i2c_read_buffer; ++ mutex_init(&state->i2c_buffer_lock); ++ state->i2c.i2c_buffer_lock = &state->i2c_buffer_lock; + state->gpio_val = cfg->gpio_val; + state->gpio_dir = cfg->gpio_dir; + +diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c +index a085588..b931074 100644 +--- a/drivers/media/dvb/frontends/dib9000.c ++++ b/drivers/media/dvb/frontends/dib9000.c +@@ -38,6 +38,15 @@ struct i2c_device { + #define DibInitLock(lock) mutex_init(lock) + #define DibFreeLock(lock) + ++struct dib9000_pid_ctrl { ++#define DIB9000_PID_FILTER_CTRL 0 ++#define DIB9000_PID_FILTER 1 ++ u8 cmd; ++ u8 id; ++ u16 pid; ++ u8 onoff; ++}; ++ + struct dib9000_state { + struct i2c_device i2c; + +@@ -99,6 +108,10 @@ struct dib9000_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[255]; + u8 i2c_read_buffer[255]; ++ DIB_LOCK demod_lock; ++ u8 get_frontend_internal; ++ struct dib9000_pid_ctrl pid_ctrl[10]; ++ s8 pid_ctrl_index; /* -1: empty list; -2: do not use the list */ + }; + + static const u32 fe_info[44] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1743,19 +1756,56 @@ EXPORT_SYMBOL(dib9000_set_gpio); + int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff) + { + struct dib9000_state *state = fe->demodulator_priv; +- u16 val = dib9000_read_word(state, 294 + 1) & 0xffef; ++ u16 val; ++ int ret; ++ ++ if ((state->pid_ctrl_index != -2) && (state->pid_ctrl_index < 9)) { ++ /* postpone the pid filtering cmd */ ++ dprintk("pid filter cmd postpone"); ++ state->pid_ctrl_index++; ++ state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER_CTRL; ++ state->pid_ctrl[state->pid_ctrl_index].onoff = onoff; ++ return 0; ++ } ++ ++ DibAcquireLock(&state->demod_lock); ++ ++ val = dib9000_read_word(state, 294 + 1) & 0xffef; + val |= (onoff & 0x1) << 4; + + dprintk("PID filter enabled %d", onoff); +- return dib9000_write_word(state, 294 + 1, val); ++ ret = dib9000_write_word(state, 294 + 1, val); ++ DibReleaseLock(&state->demod_lock); ++ return ret; ++ + } + EXPORT_SYMBOL(dib9000_fw_pid_filter_ctrl); + + int dib9000_fw_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) + { + struct dib9000_state *state = fe->demodulator_priv; ++ int ret; ++ ++ if (state->pid_ctrl_index != -2) { ++ /* postpone the pid filtering cmd */ ++ dprintk("pid filter postpone"); ++ if (state->pid_ctrl_index < 9) { ++ state->pid_ctrl_index++; ++ state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER; ++ state->pid_ctrl[state->pid_ctrl_index].id = id; ++ state->pid_ctrl[state->pid_ctrl_index].pid = pid; ++ state->pid_ctrl[state->pid_ctrl_index].onoff = onoff; ++ } else ++ dprintk("can not add any more pid ctrl cmd"); ++ return 0; ++ } ++ ++ DibAcquireLock(&state->demod_lock); + dprintk("Index %x, PID %d, OnOff %d", id, pid, onoff); +- return dib9000_write_word(state, 300 + 1 + id, onoff ? (1 << 13) | pid : 0); ++ ret = dib9000_write_word(state, 300 + 1 + id, ++ onoff ? (1 << 13) | pid : 0); ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + EXPORT_SYMBOL(dib9000_fw_pid_filter); + +@@ -1778,6 +1828,7 @@ static void dib9000_release(struct dvb_frontend *demod) + DibFreeLock(&state->platform.risc.mbx_lock); + DibFreeLock(&state->platform.risc.mem_lock); + DibFreeLock(&state->platform.risc.mem_mbx_lock); ++ DibFreeLock(&state->demod_lock); + dibx000_exit_i2c_master(&st->i2c_master); + + i2c_del_adapter(&st->tuner_adap); +@@ -1795,14 +1846,19 @@ static int dib9000_sleep(struct dvb_frontend *fe) + { + struct dib9000_state *state = fe->demodulator_priv; + u8 index_frontend; +- int ret; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + ret = state->fe[index_frontend]->ops.sleep(state->fe[index_frontend]); + if (ret < 0) +- return ret; ++ goto error; + } +- return dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0); ++ ret = dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0); ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune) +@@ -1816,7 +1872,10 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + struct dib9000_state *state = fe->demodulator_priv; + u8 index_frontend, sub_index_frontend; + fe_status_t stat; +- int ret; ++ int ret = 0; ++ ++ if (state->get_frontend_internal == 0) ++ DibAcquireLock(&state->demod_lock); + + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + state->fe[index_frontend]->ops.read_status(state->fe[index_frontend], &stat); +@@ -1846,14 +1905,15 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + state->fe[index_frontend]->dtv_property_cache.rolloff; + } + } +- return 0; ++ ret = 0; ++ goto return_value; + } + } + + /* get the channel from master chip */ + ret = dib9000_fw_get_channel(fe, fep); + if (ret != 0) +- return ret; ++ goto return_value; + + /* synchronize the cache with the other frontends */ + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { +@@ -1866,8 +1926,12 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + state->fe[index_frontend]->dtv_property_cache.code_rate_LP = fe->dtv_property_cache.code_rate_LP; + state->fe[index_frontend]->dtv_property_cache.rolloff = fe->dtv_property_cache.rolloff; + } ++ ret = 0; + +- return 0; ++return_value: ++ if (state->get_frontend_internal == 0) ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state) +@@ -1912,6 +1976,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + dprintk("dib9000: must specify bandwidth "); + return 0; + } ++ ++ state->pid_ctrl_index = -1; /* postpone the pid filtering cmd */ ++ DibAcquireLock(&state->demod_lock); ++ + fe->dtv_property_cache.delivery_system = SYS_DVBT; + + /* set the master status */ +@@ -1974,13 +2042,18 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + /* check the tune result */ + if (exit_condition == 1) { /* tune failed */ + dprintk("tune failed"); ++ DibReleaseLock(&state->demod_lock); ++ /* tune failed; put all the pid filtering cmd to junk */ ++ state->pid_ctrl_index = -1; + return 0; + } + + dprintk("tune success on frontend%i", index_frontend_success); + + /* synchronize all the channel cache */ ++ state->get_frontend_internal = 1; + dib9000_get_frontend(state->fe[0], fep); ++ state->get_frontend_internal = 0; + + /* retune the other frontends with the found channel */ + channel_status.status = CHANNEL_STATUS_PARAMETERS_SET; +@@ -2025,6 +2098,28 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + /* turn off the diversity for the last frontend */ + dib9000_fw_set_diversity_in(state->fe[index_frontend - 1], 0); + ++ DibReleaseLock(&state->demod_lock); ++ if (state->pid_ctrl_index >= 0) { ++ u8 index_pid_filter_cmd; ++ u8 pid_ctrl_index = state->pid_ctrl_index; ++ ++ state->pid_ctrl_index = -2; ++ for (index_pid_filter_cmd = 0; ++ index_pid_filter_cmd <= pid_ctrl_index; ++ index_pid_filter_cmd++) { ++ if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER_CTRL) ++ dib9000_fw_pid_filter_ctrl(state->fe[0], ++ state->pid_ctrl[index_pid_filter_cmd].onoff); ++ else if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER) ++ dib9000_fw_pid_filter(state->fe[0], ++ state->pid_ctrl[index_pid_filter_cmd].id, ++ state->pid_ctrl[index_pid_filter_cmd].pid, ++ state->pid_ctrl[index_pid_filter_cmd].onoff); ++ } ++ } ++ /* do not postpone any more the pid filtering */ ++ state->pid_ctrl_index = -2; ++ + return 0; + } + +@@ -2041,6 +2136,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat) + u8 index_frontend; + u16 lock = 0, lock_slave = 0; + ++ DibAcquireLock(&state->demod_lock); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) + lock_slave |= dib9000_read_lock(state->fe[index_frontend]); + +@@ -2059,6 +2155,8 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat) + if ((lock & 0x0008) || (lock_slave & 0x0008)) + *stat |= FE_HAS_LOCK; + ++ DibReleaseLock(&state->demod_lock); ++ + return 0; + } + +@@ -2066,10 +2164,14 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber) + { + struct dib9000_state *state = fe->demodulator_priv; + u16 *c; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, + state->i2c_read_buffer, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +@@ -2077,7 +2179,10 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber) + c = (u16 *)state->i2c_read_buffer; + + *ber = c[10] << 16 | c[11]; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) +@@ -2086,7 +2191,9 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + u8 index_frontend; + u16 *c = (u16 *)state->i2c_read_buffer; + u16 val; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + *strength = 0; + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + state->fe[index_frontend]->ops.read_signal_strength(state->fe[index_frontend], &val); +@@ -2097,8 +2204,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + } + + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); + +@@ -2107,7 +2216,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + *strength = 65535; + else + *strength += val; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static u32 dib9000_get_snr(struct dvb_frontend *fe) +@@ -2151,6 +2263,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr) + u8 index_frontend; + u32 snr_master; + ++ DibAcquireLock(&state->demod_lock); + snr_master = dib9000_get_snr(fe); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) + snr_master += dib9000_get_snr(state->fe[index_frontend]); +@@ -2161,6 +2274,8 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr) + } else + *snr = 0; + ++ DibReleaseLock(&state->demod_lock); ++ + return 0; + } + +@@ -2168,15 +2283,22 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc) + { + struct dib9000_state *state = fe->demodulator_priv; + u16 *c = (u16 *)state->i2c_read_buffer; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); + + *unc = c[12]; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + int dib9000_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, u8 first_addr) +@@ -2322,6 +2444,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c + DibInitLock(&st->platform.risc.mbx_lock); + DibInitLock(&st->platform.risc.mem_lock); + DibInitLock(&st->platform.risc.mem_mbx_lock); ++ DibInitLock(&st->demod_lock); ++ st->get_frontend_internal = 0; ++ ++ st->pid_ctrl_index = -2; + + st->fe[0] = fe; + fe->demodulator_priv = st; +diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c +index dc5d17a..774d507 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.c ++++ b/drivers/media/dvb/frontends/dibx000_common.c +@@ -1,4 +1,5 @@ + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dibx000_common.h" + +@@ -10,6 +11,13 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)"); + + static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + mst->i2c_write_buffer[0] = (reg >> 8) & 0xff; + mst->i2c_write_buffer[1] = reg & 0xff; + mst->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -21,11 +29,21 @@ static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val) + mst->msg[0].buf = mst->i2c_write_buffer; + mst->msg[0].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0; ++ mutex_unlock(&mst->i2c_buffer_lock); ++ ++ return ret; + } + + static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + mst->i2c_write_buffer[0] = reg >> 8; + mst->i2c_write_buffer[1] = reg & 0xff; + +@@ -42,7 +60,10 @@ static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg) + if (i2c_transfer(mst->i2c_adap, mst->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1]; ++ ret = (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1]; ++ mutex_unlock(&mst->i2c_buffer_lock); ++ ++ return ret; + } + + static int dibx000_is_i2c_done(struct dibx000_i2c_master *mst) +@@ -257,6 +278,7 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap); ++ int ret; + + if (num > 32) { + dprintk("%s: too much I2C message to be transmitted (%i).\ +@@ -264,10 +286,15 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + return -ENOMEM; + } + +- memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +- + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_GPIO_6_7); + ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); ++ + /* open the gate */ + dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); + mst->msg[0].addr = mst->i2c_addr; +@@ -282,7 +309,11 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + mst->msg[num + 1].buf = &mst->i2c_write_buffer[4]; + mst->msg[num + 1].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO; ++ ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? ++ num : -EIO); ++ ++ mutex_unlock(&mst->i2c_buffer_lock); ++ return ret; + } + + static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = { +@@ -294,6 +325,7 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap); ++ int ret; + + if (num > 32) { + dprintk("%s: too much I2C message to be transmitted (%i).\ +@@ -301,10 +333,14 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + return -ENOMEM; + } + +- memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +- + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER); + ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); ++ + /* open the gate */ + dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); + mst->msg[0].addr = mst->i2c_addr; +@@ -319,7 +355,10 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + mst->msg[num + 1].buf = &mst->i2c_write_buffer[4]; + mst->msg[num + 1].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO; ++ ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? ++ num : -EIO); ++ mutex_unlock(&mst->i2c_buffer_lock); ++ return ret; + } + + static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = { +@@ -390,8 +429,18 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, + int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, + struct i2c_adapter *i2c_adap, u8 i2c_addr) + { +- u8 tx[4]; +- struct i2c_msg m = {.addr = i2c_addr >> 1,.buf = tx,.len = 4 }; ++ int ret; ++ ++ mutex_init(&mst->i2c_buffer_lock); ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ memset(mst->msg, 0, sizeof(struct i2c_msg)); ++ mst->msg[0].addr = i2c_addr >> 1; ++ mst->msg[0].flags = 0; ++ mst->msg[0].buf = mst->i2c_write_buffer; ++ mst->msg[0].len = 4; + + mst->device_rev = device_rev; + mst->i2c_adap = i2c_adap; +@@ -431,9 +480,12 @@ int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, + "DiBX000: could not initialize the master i2c_adapter\n"); + + /* initialize the i2c-master by closing the gate */ +- dibx000_i2c_gate_ctrl(mst, tx, 0, 0); ++ dibx000_i2c_gate_ctrl(mst, mst->i2c_write_buffer, 0, 0); ++ ++ ret = (i2c_transfer(i2c_adap, mst->msg, 1) == 1); ++ mutex_unlock(&mst->i2c_buffer_lock); + +- return i2c_transfer(i2c_adap, &m, 1) == 1; ++ return ret; + } + + EXPORT_SYMBOL(dibx000_init_i2c_master); +diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h +index f031165..5e01147 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.h ++++ b/drivers/media/dvb/frontends/dibx000_common.h +@@ -33,6 +33,7 @@ struct dibx000_i2c_master { + struct i2c_msg msg[34]; + u8 i2c_write_buffer[8]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, +diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c +index 3c315f9..2b5cd21 100644 +--- a/drivers/media/video/cx23885/cx23885-dvb.c ++++ b/drivers/media/video/cx23885/cx23885-dvb.c +@@ -843,7 +843,7 @@ static int dvb_register(struct cx23885_tsport *port) + static struct xc2028_ctrl ctl = { + .fname = XC3028L_DEFAULT_FIRMWARE, + .max_len = 64, +- .demod = 5000, ++ .demod = XC3028_FE_DIBCOM52, + /* This is true for all demods with + v36 firmware? */ + .type = XC2028_D2633, +diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c +index b6eae48..1f962dc 100644 +--- a/drivers/media/video/uvc/uvc_driver.c ++++ b/drivers/media/video/uvc/uvc_driver.c +@@ -1960,7 +1960,7 @@ static int __uvc_resume(struct usb_interface *intf, int reset) + + list_for_each_entry(stream, &dev->streams, list) { + if (stream->intf == intf) +- return uvc_video_resume(stream); ++ return uvc_video_resume(stream, reset); + } + + uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB interface " +diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c +index 4999479..6f147de 100644 +--- a/drivers/media/video/uvc/uvc_video.c ++++ b/drivers/media/video/uvc/uvc_video.c +@@ -1104,10 +1104,18 @@ int uvc_video_suspend(struct uvc_streaming *stream) + * buffers, making sure userspace applications are notified of the problem + * instead of waiting forever. + */ +-int uvc_video_resume(struct uvc_streaming *stream) ++int uvc_video_resume(struct uvc_streaming *stream, int reset) + { + int ret; + ++ /* If the bus has been reset on resume, set the alternate setting to 0. ++ * This should be the default value, but some devices crash or otherwise ++ * misbehave if they don't receive a SET_INTERFACE request before any ++ * other video control request. ++ */ ++ if (reset) ++ usb_set_interface(stream->dev->udev, stream->intfnum, 0); ++ + stream->frozen = 0; + + ret = uvc_commit_video(stream, &stream->ctrl); +diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h +index 20107fd..2a38d5e 100644 +--- a/drivers/media/video/uvc/uvcvideo.h ++++ b/drivers/media/video/uvc/uvcvideo.h +@@ -639,7 +639,7 @@ extern void uvc_mc_cleanup_entity(struct uvc_entity *entity); + /* Video */ + extern int uvc_video_init(struct uvc_streaming *stream); + extern int uvc_video_suspend(struct uvc_streaming *stream); +-extern int uvc_video_resume(struct uvc_streaming *stream); ++extern int uvc_video_resume(struct uvc_streaming *stream, int reset); + extern int uvc_video_enable(struct uvc_streaming *stream, int enable); + extern int uvc_probe_video(struct uvc_streaming *stream, + struct uvc_streaming_control *probe); +diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c +index 38089b2..75db30e6 100644 +--- a/drivers/mmc/core/core.c ++++ b/drivers/mmc/core/core.c +@@ -1057,7 +1057,7 @@ static void mmc_power_up(struct mmc_host *host) + mmc_host_clk_release(host); + } + +-static void mmc_power_off(struct mmc_host *host) ++void mmc_power_off(struct mmc_host *host) + { + mmc_host_clk_hold(host); + +@@ -1147,8 +1147,7 @@ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops) + } + + /* +- * Remove the current bus handler from a host. Assumes that there are +- * no interesting cards left, so the bus is powered down. ++ * Remove the current bus handler from a host. + */ + void mmc_detach_bus(struct mmc_host *host) + { +@@ -1165,8 +1164,6 @@ void mmc_detach_bus(struct mmc_host *host) + + spin_unlock_irqrestore(&host->lock, flags); + +- mmc_power_off(host); +- + mmc_bus_put(host); + } + +@@ -1675,6 +1672,7 @@ void mmc_stop_host(struct mmc_host *host) + + mmc_claim_host(host); + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + mmc_bus_put(host); + return; +@@ -1796,6 +1794,7 @@ int mmc_suspend_host(struct mmc_host *host) + host->bus_ops->remove(host); + mmc_claim_host(host); + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + host->pm_flags = 0; + err = 0; +@@ -1883,6 +1882,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, + host->bus_ops->remove(host); + + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + host->pm_flags = 0; + break; +diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h +index d9411ed..14664f1 100644 +--- a/drivers/mmc/core/core.h ++++ b/drivers/mmc/core/core.h +@@ -43,6 +43,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, + bool cmd11); + void mmc_set_timing(struct mmc_host *host, unsigned int timing); + void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type); ++void mmc_power_off(struct mmc_host *host); + + static inline void mmc_delay(unsigned int ms) + { +diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c +index aa7d1d7..20b42c8 100644 +--- a/drivers/mmc/core/mmc.c ++++ b/drivers/mmc/core/mmc.c +@@ -359,6 +359,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) + * card has the Enhanced area enabled. If so, export enhanced + * area offset and size to user by adding sysfs interface. + */ ++ card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT]; + if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) && + (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) { + u8 hc_erase_grp_sz = +@@ -405,6 +406,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) + if (card->ext_csd.rev >= 5) + card->ext_csd.rel_param = ext_csd[EXT_CSD_WR_REL_PARAM]; + ++ card->ext_csd.raw_erased_mem_count = ext_csd[EXT_CSD_ERASED_MEM_CONT]; + if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) + card->erased_byte = 0xFF; + else +@@ -891,6 +893,7 @@ static void mmc_detect(struct mmc_host *host) + + mmc_claim_host(host); + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + } + } +diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c +index ff27741..bd8805c 100644 +--- a/drivers/mmc/core/sd.c ++++ b/drivers/mmc/core/sd.c +@@ -1008,6 +1008,7 @@ static void mmc_sd_detect(struct mmc_host *host) + + mmc_claim_host(host); + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + } + } +diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c +index 262fff0..ac492ac 100644 +--- a/drivers/mmc/core/sdio.c ++++ b/drivers/mmc/core/sdio.c +@@ -597,6 +597,7 @@ out: + + mmc_claim_host(host); + mmc_detach_bus(host); ++ mmc_power_off(host); + mmc_release_host(host); + } + } +diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c +index 3f92731..9f8658e 100644 +--- a/drivers/mtd/mtdchar.c ++++ b/drivers/mtd/mtdchar.c +@@ -320,6 +320,7 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count + ops.mode = MTD_OOB_RAW; + ops.datbuf = kbuf; + ops.oobbuf = NULL; ++ ops.ooboffs = 0; + ops.len = len; + + ret = mtd->write_oob(mtd, *ppos, &ops); +diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c +index a46e9bb..86f05f4 100644 +--- a/drivers/mtd/nand/nand_base.c ++++ b/drivers/mtd/nand/nand_base.c +@@ -2097,14 +2097,22 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, + + /** + * nand_fill_oob - [Internal] Transfer client buffer to oob +- * @chip: nand chip structure ++ * @mtd: MTD device structure + * @oob: oob data buffer + * @len: oob data write length + * @ops: oob ops structure + */ +-static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob, size_t len, +- struct mtd_oob_ops *ops) ++static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len, ++ struct mtd_oob_ops *ops) + { ++ struct nand_chip *chip = mtd->priv; ++ ++ /* ++ * Initialise to all 0xFF, to avoid the possibility of left over OOB ++ * data from a previous OOB read. ++ */ ++ memset(chip->oob_poi, 0xff, mtd->oobsize); ++ + switch (ops->mode) { + + case MTD_OOB_PLACE: +@@ -2201,10 +2209,6 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, + (chip->pagebuf << chip->page_shift) < (to + ops->len)) + chip->pagebuf = -1; + +- /* If we're not given explicit OOB data, let it be 0xFF */ +- if (likely(!oob)) +- memset(chip->oob_poi, 0xff, mtd->oobsize); +- + /* Don't allow multipage oob writes with offset */ + if (oob && ops->ooboffs && (ops->ooboffs + ops->ooblen > oobmaxlen)) + return -EINVAL; +@@ -2226,8 +2230,11 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, + + if (unlikely(oob)) { + size_t len = min(oobwritelen, oobmaxlen); +- oob = nand_fill_oob(chip, oob, len, ops); ++ oob = nand_fill_oob(mtd, oob, len, ops); + oobwritelen -= len; ++ } else { ++ /* We still need to erase leftover OOB data */ ++ memset(chip->oob_poi, 0xff, mtd->oobsize); + } + + ret = chip->write_page(mtd, chip, wbuf, page, cached, +@@ -2401,10 +2408,8 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, + if (page == chip->pagebuf) + chip->pagebuf = -1; + +- memset(chip->oob_poi, 0xff, mtd->oobsize); +- nand_fill_oob(chip, ops->oobbuf, ops->ooblen, ops); ++ nand_fill_oob(mtd, ops->oobbuf, ops->ooblen, ops); + status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask); +- memset(chip->oob_poi, 0xff, mtd->oobsize); + + if (status) + return status; +diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c +index 1fb3b3a..30689cc 100644 +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -685,6 +685,8 @@ static int pxa3xx_nand_read_page_hwecc(struct mtd_info *mtd, + * OOB, ignore such double bit errors + */ + if (is_buf_blank(buf, mtd->writesize)) ++ info->retcode = ERR_NONE; ++ else + mtd->ecc_stats.failed++; + } + +@@ -813,7 +815,7 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) + info->page_size = ndcr & NDCR_PAGE_SZ ? 2048 : 512; + /* set info fields needed to read id */ + info->read_id_bytes = (info->page_size == 2048) ? 4 : 2; +- info->reg_ndcr = ndcr; ++ info->reg_ndcr = ndcr & ~NDCR_INT_MASK; + info->cmdset = &default_cmdset; + + info->ndtr0cs0 = nand_readl(info, NDTR0CS0); +@@ -882,7 +884,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) + struct pxa3xx_nand_info *info = mtd->priv; + struct platform_device *pdev = info->pdev; + struct pxa3xx_nand_platform_data *pdata = pdev->dev.platform_data; +- struct nand_flash_dev pxa3xx_flash_ids[2] = { {NULL,}, {NULL,} }; ++ struct nand_flash_dev pxa3xx_flash_ids[2], *def = NULL; + const struct pxa3xx_nand_flash *f = NULL; + struct nand_chip *chip = mtd->priv; + uint32_t id = -1; +@@ -942,8 +944,10 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) + pxa3xx_flash_ids[0].erasesize = f->page_size * f->page_per_block; + if (f->flash_width == 16) + pxa3xx_flash_ids[0].options = NAND_BUSWIDTH_16; ++ pxa3xx_flash_ids[1].name = NULL; ++ def = pxa3xx_flash_ids; + KEEP_CONFIG: +- if (nand_scan_ident(mtd, 1, pxa3xx_flash_ids)) ++ if (nand_scan_ident(mtd, 1, def)) + return -ENODEV; + /* calculate addressing information */ + info->col_addr_cycles = (mtd->writesize >= 2048) ? 2 : 1; +@@ -954,9 +958,9 @@ KEEP_CONFIG: + info->row_addr_cycles = 2; + mtd->name = mtd_names[0]; + chip->ecc.mode = NAND_ECC_HW; +- chip->ecc.size = f->page_size; ++ chip->ecc.size = info->page_size; + +- chip->options = (f->flash_width == 16) ? NAND_BUSWIDTH_16 : 0; ++ chip->options = (info->reg_ndcr & NDCR_DWIDTH_M) ? NAND_BUSWIDTH_16 : 0; + chip->options |= NAND_NO_AUTOINCR; + chip->options |= NAND_NO_READRDY; + +diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c +index 7a87d07..4938bd0 100644 +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -297,6 +297,9 @@ static struct mtd_part_parser redboot_parser = { + .name = "RedBoot", + }; + ++/* mtd parsers will request the module by parser name */ ++MODULE_ALIAS("RedBoot"); ++ + static int __init redboot_parser_init(void) + { + return register_mtd_parser(&redboot_parser); +diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c +index 9ea2f21..2065cb4 100644 +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -1500,6 +1500,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) + struct sk_buff *skb = *pskb; + struct slave *slave; + struct bonding *bond; ++ void (*recv_probe)(struct sk_buff *, struct bonding *, ++ struct slave *); + + skb = skb_share_check(skb, GFP_ATOMIC); + if (unlikely(!skb)) +@@ -1513,11 +1515,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) + if (bond->params.arp_interval) + slave->dev->last_rx = jiffies; + +- if (bond->recv_probe) { ++ recv_probe = ACCESS_ONCE(bond->recv_probe); ++ if (recv_probe) { + struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC); + + if (likely(nskb)) { +- bond->recv_probe(nskb, bond, slave); ++ recv_probe(nskb, bond, slave); + dev_kfree_skb(nskb); + } + } +diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c +index 2f433fb..51fba5f 100644 +--- a/drivers/net/enic/enic_main.c ++++ b/drivers/net/enic/enic_main.c +@@ -1718,8 +1718,12 @@ static void enic_poll_controller(struct net_device *netdev) + enic_isr_msix_rq(enic->msix_entry[intr].vector, + &enic->napi[i]); + } +- intr = enic_msix_wq_intr(enic, i); +- enic_isr_msix_wq(enic->msix_entry[intr].vector, enic); ++ ++ for (i = 0; i < enic->wq_count; i++) { ++ intr = enic_msix_wq_intr(enic, i); ++ enic_isr_msix_wq(enic->msix_entry[intr].vector, enic); ++ } ++ + break; + case VNIC_DEV_INTR_MODE_MSI: + enic_isr_msi(enic->pdev->irq, enic); +diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c +index 2f3c48d..ab4723d 100644 +--- a/drivers/net/macvlan.c ++++ b/drivers/net/macvlan.c +@@ -239,7 +239,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) + dest = macvlan_hash_lookup(port, eth->h_dest); + if (dest && dest->mode == MACVLAN_MODE_BRIDGE) { + /* send to lowerdev first for its network taps */ +- vlan->forward(vlan->lowerdev, skb); ++ dev_forward_skb(vlan->lowerdev, skb); + + return NET_XMIT_SUCCESS; + } +diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c +index dfc8272..4840ab7 100644 +--- a/drivers/net/netconsole.c ++++ b/drivers/net/netconsole.c +@@ -307,6 +307,11 @@ static ssize_t store_enabled(struct netconsole_target *nt, + return err; + if (enabled < 0 || enabled > 1) + return -EINVAL; ++ if (enabled == nt->enabled) { ++ printk(KERN_INFO "netconsole: network logging has already %s\n", ++ nt->enabled ? "started" : "stopped"); ++ return -EINVAL; ++ } + + if (enabled) { /* 1 */ + +diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c +index cb6e0b4..364cd67 100644 +--- a/drivers/net/phy/dp83640.c ++++ b/drivers/net/phy/dp83640.c +@@ -875,6 +875,7 @@ static void dp83640_remove(struct phy_device *phydev) + struct dp83640_clock *clock; + struct list_head *this, *next; + struct dp83640_private *tmp, *dp83640 = phydev->priv; ++ struct sk_buff *skb; + + if (phydev->addr == BROADCAST_ADDR) + return; +@@ -882,6 +883,12 @@ static void dp83640_remove(struct phy_device *phydev) + enable_status_frames(phydev, false); + cancel_work_sync(&dp83640->ts_work); + ++ while ((skb = skb_dequeue(&dp83640->rx_queue)) != NULL) ++ kfree_skb(skb); ++ ++ while ((skb = skb_dequeue(&dp83640->tx_queue)) != NULL) ++ skb_complete_tx_timestamp(skb, NULL); ++ + clock = dp83640_clock_get(dp83640->clock); + + if (dp83640 == clock->chosen) { +@@ -1060,7 +1067,7 @@ static void dp83640_txtstamp(struct phy_device *phydev, + struct dp83640_private *dp83640 = phydev->priv; + + if (!dp83640->hwts_tx_en) { +- kfree_skb(skb); ++ skb_complete_tx_timestamp(skb, NULL); + return; + } + skb_queue_tail(&dp83640->tx_queue, skb); +diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c +index ca4694e..1f421d7 100644 +--- a/drivers/net/rionet.c ++++ b/drivers/net/rionet.c +@@ -88,8 +88,8 @@ static struct rio_dev **rionet_active; + #define dev_rionet_capable(dev) \ + is_rionet_capable(dev->src_ops, dev->dst_ops) + +-#define RIONET_MAC_MATCH(x) (*(u32 *)x == 0x00010001) +-#define RIONET_GET_DESTID(x) (*(u16 *)(x + 4)) ++#define RIONET_MAC_MATCH(x) (!memcmp((x), "\00\01\00\01", 4)) ++#define RIONET_GET_DESTID(x) ((*((u8 *)x + 4) << 8) | *((u8 *)x + 5)) + + static int rionet_rx_clean(struct net_device *ndev) + { +diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c +index 38f6859..bc8c183 100644 +--- a/drivers/net/tg3.c ++++ b/drivers/net/tg3.c +@@ -15278,7 +15278,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev) + + cancel_work_sync(&tp->reset_task); + +- if (!tg3_flag(tp, USE_PHYLIB)) { ++ if (tg3_flag(tp, USE_PHYLIB)) { + tg3_phy_fini(tp); + tg3_mdio_fini(tp); + } +diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c +index 5250288..c5c4b4d 100644 +--- a/drivers/net/usb/asix.c ++++ b/drivers/net/usb/asix.c +@@ -314,12 +314,11 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) + skb_pull(skb, 4); + + while (skb->len > 0) { +- if ((short)(header & 0x0000ffff) != +- ~((short)((header & 0xffff0000) >> 16))) { ++ if ((header & 0x07ff) != ((~header >> 16) & 0x07ff)) + netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n"); +- } ++ + /* get the packet length */ +- size = (u16) (header & 0x0000ffff); ++ size = (u16) (header & 0x000007ff); + + if ((skb->len) - ((size + 1) & 0xfffe) == 0) { + u8 alignment = (unsigned long)skb->data & 0x3; +diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c +index d3b9e95..6a53161 100644 +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -229,23 +229,40 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) + if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) { + + if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) { +- struct usb_cdc_ncm_ndp_input_size ndp_in_sz; ++ struct usb_cdc_ncm_ndp_input_size *ndp_in_sz; ++ ++ ndp_in_sz = kzalloc(sizeof(*ndp_in_sz), GFP_KERNEL); ++ if (!ndp_in_sz) { ++ err = -ENOMEM; ++ goto size_err; ++ } ++ + err = usb_control_msg(ctx->udev, + usb_sndctrlpipe(ctx->udev, 0), + USB_CDC_SET_NTB_INPUT_SIZE, + USB_TYPE_CLASS | USB_DIR_OUT + | USB_RECIP_INTERFACE, +- 0, iface_no, &ndp_in_sz, 8, 1000); ++ 0, iface_no, ndp_in_sz, 8, 1000); ++ kfree(ndp_in_sz); + } else { +- __le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max); ++ __le32 *dwNtbInMaxSize; ++ dwNtbInMaxSize = kzalloc(sizeof(*dwNtbInMaxSize), ++ GFP_KERNEL); ++ if (!dwNtbInMaxSize) { ++ err = -ENOMEM; ++ goto size_err; ++ } ++ *dwNtbInMaxSize = cpu_to_le32(ctx->rx_max); ++ + err = usb_control_msg(ctx->udev, + usb_sndctrlpipe(ctx->udev, 0), + USB_CDC_SET_NTB_INPUT_SIZE, + USB_TYPE_CLASS | USB_DIR_OUT + | USB_RECIP_INTERFACE, +- 0, iface_no, &dwNtbInMaxSize, 4, 1000); ++ 0, iface_no, dwNtbInMaxSize, 4, 1000); ++ kfree(dwNtbInMaxSize); + } +- ++size_err: + if (err < 0) + pr_debug("Setting NTB Input Size failed\n"); + } +@@ -326,19 +343,29 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) + + /* set Max Datagram Size (MTU) */ + if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) { +- __le16 max_datagram_size; ++ __le16 *max_datagram_size; + u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize); ++ ++ max_datagram_size = kzalloc(sizeof(*max_datagram_size), ++ GFP_KERNEL); ++ if (!max_datagram_size) { ++ err = -ENOMEM; ++ goto max_dgram_err; ++ } ++ + err = usb_control_msg(ctx->udev, usb_rcvctrlpipe(ctx->udev, 0), + USB_CDC_GET_MAX_DATAGRAM_SIZE, + USB_TYPE_CLASS | USB_DIR_IN + | USB_RECIP_INTERFACE, +- 0, iface_no, &max_datagram_size, ++ 0, iface_no, max_datagram_size, + 2, 1000); + if (err < 0) { + pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n", + CDC_NCM_MIN_DATAGRAM_SIZE); ++ kfree(max_datagram_size); + } else { +- ctx->max_datagram_size = le16_to_cpu(max_datagram_size); ++ ctx->max_datagram_size = ++ le16_to_cpu(*max_datagram_size); + /* Check Eth descriptor value */ + if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) { + if (ctx->max_datagram_size > eth_max_sz) +@@ -361,8 +388,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx) + USB_TYPE_CLASS | USB_DIR_OUT + | USB_RECIP_INTERFACE, + 0, +- iface_no, &max_datagram_size, ++ iface_no, max_datagram_size, + 2, 1000); ++ kfree(max_datagram_size); ++max_dgram_err: + if (err < 0) + pr_debug("SET_MAX_DATAGRAM_SIZE failed\n"); + } +diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c +index 81126ff..8f9b7f7 100644 +--- a/drivers/net/usb/ipheth.c ++++ b/drivers/net/usb/ipheth.c +@@ -59,6 +59,7 @@ + #define USB_PRODUCT_IPHONE_3G 0x1292 + #define USB_PRODUCT_IPHONE_3GS 0x1294 + #define USB_PRODUCT_IPHONE_4 0x1297 ++#define USB_PRODUCT_IPHONE_4_VZW 0x129c + + #define IPHETH_USBINTF_CLASS 255 + #define IPHETH_USBINTF_SUBCLASS 253 +@@ -98,6 +99,10 @@ static struct usb_device_id ipheth_table[] = { + USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4, + IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, + IPHETH_USBINTF_PROTO) }, ++ { USB_DEVICE_AND_INTERFACE_INFO( ++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW, ++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, ++ IPHETH_USBINTF_PROTO) }, + { } + }; + MODULE_DEVICE_TABLE(usb, ipheth_table); +diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c +index 041fb7d..ef3b236 100644 +--- a/drivers/net/usb/rtl8150.c ++++ b/drivers/net/usb/rtl8150.c +@@ -977,7 +977,6 @@ static void rtl8150_disconnect(struct usb_interface *intf) + usb_set_intfdata(intf, NULL); + if (dev) { + set_bit(RTL8150_UNPLUG, &dev->flags); +- tasklet_disable(&dev->tl); + tasklet_kill(&dev->tl); + unregister_netdev(dev->netdev); + unlink_all_urbs(dev); +diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c +index bfb6481..4e4e7c3 100644 +--- a/drivers/net/wireless/ath/ath9k/ani.c ++++ b/drivers/net/wireless/ath/ath9k/ani.c +@@ -502,9 +502,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning) + ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR, + ATH9K_ANI_CCK_WEAK_SIG_THR); + +- ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) | +- ATH9K_RX_FILTER_PHYERR); +- + ath9k_ani_restart(ah); + return; + } +@@ -525,8 +522,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning) + ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL, + aniState->firstepLevel); + +- ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) & +- ~ATH9K_RX_FILTER_PHYERR); + ath9k_ani_restart(ah); + + ENABLE_REGWRITE_BUFFER(ah); +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +index f48051c..7c2aaad 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c +@@ -643,8 +643,9 @@ static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement, + outlier_idx = max_idx; + else + outlier_idx = min_idx; ++ ++ mp_coeff[outlier_idx] = mp_avg; + } +- mp_coeff[outlier_idx] = mp_avg; + } + + static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah, +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +index 1f99249..7880dca 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +@@ -255,8 +255,6 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds, + return -EIO; + } + +- if (status & AR_TxOpExceeded) +- ts->ts_status |= ATH9K_TXERR_XTXOP; + ts->ts_rateindex = MS(status, AR_FinalTxIdx); + ts->ts_seqnum = MS(status, AR_SeqNum); + ts->tid = MS(status, AR_TxTid); +@@ -267,6 +265,8 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds, + ts->ts_status = 0; + ts->ts_flags = 0; + ++ if (status & AR_TxOpExceeded) ++ ts->ts_status |= ATH9K_TXERR_XTXOP; + status = ACCESS_ONCE(ads->status2); + ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00); + ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01); +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h +index efdbe98..2364b5f 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h ++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h +@@ -570,12 +570,12 @@ + + #define AR_PHY_TXGAIN_TABLE (AR_SM_BASE + 0x300) + +-#define AR_PHY_TX_IQCAL_CONTROL_1 (AR_SM_BASE + AR_SREV_9485(ah) ? \ +- 0x3c8 : 0x448) +-#define AR_PHY_TX_IQCAL_START (AR_SM_BASE + AR_SREV_9485(ah) ? \ +- 0x3c4 : 0x440) +-#define AR_PHY_TX_IQCAL_STATUS_B0 (AR_SM_BASE + AR_SREV_9485(ah) ? \ +- 0x3f0 : 0x48c) ++#define AR_PHY_TX_IQCAL_CONTROL_1 (AR_SM_BASE + (AR_SREV_9485(ah) ? \ ++ 0x3c8 : 0x448)) ++#define AR_PHY_TX_IQCAL_START (AR_SM_BASE + (AR_SREV_9485(ah) ? \ ++ 0x3c4 : 0x440)) ++#define AR_PHY_TX_IQCAL_STATUS_B0 (AR_SM_BASE + (AR_SREV_9485(ah) ? \ ++ 0x3f0 : 0x48c)) + #define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i) (AR_SM_BASE + \ + (AR_SREV_9485(ah) ? \ + 0x3d0 : 0x450) + ((_i) << 2)) +diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h +index 611ea6c..d16d029 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h ++++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h +@@ -521,7 +521,7 @@ static const u32 ar9485_1_1_radio_postamble[][2] = { + {0x000160ac, 0x24611800}, + {0x000160b0, 0x03284f3e}, + {0x0001610c, 0x00170000}, +- {0x00016140, 0x10804008}, ++ {0x00016140, 0x50804008}, + }; + + static const u32 ar9485_1_1_mac_postamble[][5] = { +@@ -603,7 +603,7 @@ static const u32 ar9485_1_1_radio_core[][2] = { + + static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = { + /* Addr allmodes */ +- {0x00018c00, 0x10052e5e}, ++ {0x00018c00, 0x18052e5e}, + {0x00018c04, 0x000801d8}, + {0x00018c08, 0x0000080c}, + }; +@@ -776,7 +776,7 @@ static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = { + + static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = { + /* Addr allmodes */ +- {0x00018c00, 0x10013e5e}, ++ {0x00018c00, 0x18013e5e}, + {0x00018c04, 0x000801d8}, + {0x00018c08, 0x0000080c}, + }; +@@ -882,7 +882,7 @@ static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = { + + static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = { + /* Addr allmodes */ +- {0x00018c00, 0x10012e5e}, ++ {0x00018c00, 0x18012e5e}, + {0x00018c04, 0x000801d8}, + {0x00018c08, 0x0000080c}, + }; +@@ -1021,7 +1021,7 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = { + + static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = { + /* Addr allmodes */ +- {0x00018c00, 0x10053e5e}, ++ {0x00018c00, 0x18053e5e}, + {0x00018c04, 0x000801d8}, + {0x00018c08, 0x0000080c}, + }; +diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c +index 260f1f3..5513c0a 100644 +--- a/drivers/net/wireless/ath/ath9k/hif_usb.c ++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c +@@ -37,6 +37,7 @@ static struct usb_device_id ath9k_hif_usb_ids[] = { + { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */ + { USB_DEVICE(0x040D, 0x3801) }, /* VIA */ + { USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */ ++ { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */ + + { USB_DEVICE(0x0cf3, 0x7015), + .driver_info = AR9287_USB }, /* Atheros */ +diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c +index 03900ca..7c2f06e 100644 +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -1931,6 +1931,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) + pCap->num_gpio_pins = AR9271_NUM_GPIO; + else if (AR_DEVID_7010(ah)) + pCap->num_gpio_pins = AR7010_NUM_GPIO; ++ else if (AR_SREV_9300_20_OR_LATER(ah)) ++ pCap->num_gpio_pins = AR9300_NUM_GPIO; ++ else if (AR_SREV_9287_11_OR_LATER(ah)) ++ pCap->num_gpio_pins = AR9287_NUM_GPIO; + else if (AR_SREV_9285_12_OR_LATER(ah)) + pCap->num_gpio_pins = AR9285_NUM_GPIO; + else if (AR_SREV_9280_20_OR_LATER(ah)) +diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c +index 07e35e5..3b5f9d6 100644 +--- a/drivers/net/wireless/ath/ath9k/recv.c ++++ b/drivers/net/wireless/ath/ath9k/recv.c +@@ -423,12 +423,9 @@ void ath_rx_cleanup(struct ath_softc *sc) + + u32 ath_calcrxfilter(struct ath_softc *sc) + { +-#define RX_FILTER_PRESERVE (ATH9K_RX_FILTER_PHYERR | ATH9K_RX_FILTER_PHYRADAR) +- + u32 rfilt; + +- rfilt = (ath9k_hw_getrxfilter(sc->sc_ah) & RX_FILTER_PRESERVE) +- | ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST ++ rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST + | ATH9K_RX_FILTER_MCAST; + + if (sc->rx.rxfilter & FIF_PROBE_REQ) +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +index 97de5d9..a03dbcc 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +@@ -144,13 +144,8 @@ static int iwlagn_load_section(struct iwl_priv *priv, const char *name, + FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD); + + IWL_DEBUG_INFO(priv, "%s uCode section being loaded...\n", name); +- ret = wait_event_interruptible_timeout(priv->wait_command_queue, +- priv->ucode_write_complete, 5 * HZ); +- if (ret == -ERESTARTSYS) { +- IWL_ERR(priv, "Could not load the %s uCode section due " +- "to interrupt\n", name); +- return ret; +- } ++ ret = wait_event_timeout(priv->wait_command_queue, ++ priv->ucode_write_complete, 5 * HZ); + if (!ret) { + IWL_ERR(priv, "Could not load the %s uCode section\n", + name); +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c +index f24165d..baec52d 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c +@@ -797,7 +797,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) + handled |= CSR_INT_BIT_FH_TX; + /* Wake up uCode load routine, now that load is complete */ + priv->ucode_write_complete = 1; +- wake_up_interruptible(&priv->wait_command_queue); ++ wake_up(&priv->wait_command_queue); + } + + if (inta & ~handled) { +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c +index 45cc51c..5638407 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-core.c ++++ b/drivers/net/wireless/iwlwifi/iwl-core.c +@@ -899,7 +899,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) + * commands by clearing the ready bit */ + clear_bit(STATUS_READY, &priv->status); + +- wake_up_interruptible(&priv->wait_command_queue); ++ wake_up(&priv->wait_command_queue); + + if (!ondemand) { + /* +@@ -950,7 +950,7 @@ void iwl_irq_handle_error(struct iwl_priv *priv) + */ + clear_bit(STATUS_READY, &priv->status); + clear_bit(STATUS_HCMD_ACTIVE, &priv->status); +- wake_up_interruptible(&priv->wait_command_queue); ++ wake_up(&priv->wait_command_queue); + IWL_ERR(priv, "RF is used by WiMAX\n"); + return; + } +diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c +index 76f9966..fc11277 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c ++++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c +@@ -194,7 +194,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd) + return ret; + } + +- ret = wait_event_interruptible_timeout(priv->wait_command_queue, ++ ret = wait_event_timeout(priv->wait_command_queue, + !test_bit(STATUS_HCMD_ACTIVE, &priv->status), + HOST_COMPLETE_TIMEOUT); + if (!ret) { +diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c +index b774517..865ac1a 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-rx.c ++++ b/drivers/net/wireless/iwlwifi/iwl-rx.c +@@ -738,7 +738,7 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, + wiphy_rfkill_set_hw_state(priv->hw->wiphy, + test_bit(STATUS_RF_KILL_HW, &priv->status)); + else +- wake_up_interruptible(&priv->wait_command_queue); ++ wake_up(&priv->wait_command_queue); + } + + static void iwl_rx_missed_beacon_notif(struct iwl_priv *priv, +diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c +index c368c50..93152c3 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-tx.c ++++ b/drivers/net/wireless/iwlwifi/iwl-tx.c +@@ -821,7 +821,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) + clear_bit(STATUS_HCMD_ACTIVE, &priv->status); + IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n", + get_cmd_string(cmd->hdr.cmd)); +- wake_up_interruptible(&priv->wait_command_queue); ++ wake_up(&priv->wait_command_queue); + } + + /* Mark as unmapped */ +diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c +index 56f76ab..9542e46 100644 +--- a/drivers/net/wireless/wl12xx/scan.c ++++ b/drivers/net/wireless/wl12xx/scan.c +@@ -83,14 +83,18 @@ static int wl1271_get_scan_channels(struct wl1271 *wl, + for (i = 0, j = 0; + i < req->n_channels && j < WL1271_SCAN_MAX_CHANNELS; + i++) { +- + flags = req->channels[i]->flags; + + if (!test_bit(i, wl->scan.scanned_ch) && + !(flags & IEEE80211_CHAN_DISABLED) && +- ((!!(flags & IEEE80211_CHAN_PASSIVE_SCAN)) == passive) && +- (req->channels[i]->band == band)) { +- ++ (req->channels[i]->band == band) && ++ /* ++ * In passive scans, we scan all remaining ++ * channels, even if not marked as such. ++ * In active scans, we only scan channels not ++ * marked as passive. ++ */ ++ (passive || !(flags & IEEE80211_CHAN_PASSIVE_SCAN))) { + wl1271_debug(DEBUG_SCAN, "band %d, center_freq %d ", + req->channels[i]->band, + req->channels[i]->center_freq); +@@ -142,6 +146,10 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band, + int ret; + u16 scan_options = 0; + ++ /* skip active scans if we don't have SSIDs */ ++ if (!passive && wl->scan.req->n_ssids == 0) ++ return WL1271_NOTHING_TO_SCAN; ++ + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + trigger = kzalloc(sizeof(*trigger), GFP_KERNEL); + if (!cmd || !trigger) { +@@ -152,8 +160,7 @@ static int wl1271_scan_send(struct wl1271 *wl, enum ieee80211_band band, + /* We always use high priority scans */ + scan_options = WL1271_SCAN_OPT_PRIORITY_HIGH; + +- /* No SSIDs means that we have a forced passive scan */ +- if (passive || wl->scan.req->n_ssids == 0) ++ if (passive) + scan_options |= WL1271_SCAN_OPT_PASSIVE; + + cmd->params.scan_options = cpu_to_le16(scan_options); +diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c +index 0ca86f9..1825629 100644 +--- a/drivers/net/xen-netback/interface.c ++++ b/drivers/net/xen-netback/interface.c +@@ -327,12 +327,12 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref, + xenvif_get(vif); + + rtnl_lock(); +- if (netif_running(vif->dev)) +- xenvif_up(vif); + if (!vif->can_sg && vif->dev->mtu > ETH_DATA_LEN) + dev_set_mtu(vif->dev, ETH_DATA_LEN); + netdev_update_features(vif->dev); + netif_carrier_on(vif->dev); ++ if (netif_running(vif->dev)) ++ xenvif_up(vif); + rtnl_unlock(); + + return 0; +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 1196f61..cec4629 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2745,20 +2745,6 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) + /* disable must be done via function #0 */ + if (PCI_FUNC(dev->devfn)) + return; +- +- pci_read_config_byte(dev, 0xCB, &disable); +- +- if (disable & 0x02) +- return; +- +- pci_read_config_byte(dev, 0xCA, &write_enable); +- pci_write_config_byte(dev, 0xCA, 0x57); +- pci_write_config_byte(dev, 0xCB, disable | 0x02); +- pci_write_config_byte(dev, 0xCA, write_enable); +- +- dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n"); +- dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); +- + /* + * RICOH 0xe823 SD/MMC card reader fails to recognize + * certain types of SD/MMC cards. Lowering the SD base +@@ -2781,6 +2767,20 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev) + + dev_notice(&dev->dev, "MMC controller base frequency changed to 50Mhz.\n"); + } ++ ++ pci_read_config_byte(dev, 0xCB, &disable); ++ ++ if (disable & 0x02) ++ return; ++ ++ pci_read_config_byte(dev, 0xCA, &write_enable); ++ pci_write_config_byte(dev, 0xCA, 0x57); ++ pci_write_config_byte(dev, 0xCB, disable | 0x02); ++ pci_write_config_byte(dev, 0xCA, write_enable); ++ ++ dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n"); ++ dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n"); ++ + } + DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832); + DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832); +diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c +index 492b7d8..d4e7a10 100644 +--- a/drivers/pci/xen-pcifront.c ++++ b/drivers/pci/xen-pcifront.c +@@ -400,9 +400,8 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data) + dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n", + pci_name(dev), i); + if (pci_claim_resource(dev, i)) { +- dev_err(&pdev->xdev->dev, "Could not claim " +- "resource %s/%d! Device offline. Try " +- "giving less than 4GB to domain.\n", ++ dev_err(&pdev->xdev->dev, "Could not claim resource %s/%d! " ++ "Device offline. Try using e820_host=1 in the guest config.\n", + pci_name(dev), i); + } + } +diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c +index 1658575..ec85987 100644 +--- a/drivers/platform/x86/samsung-laptop.c ++++ b/drivers/platform/x86/samsung-laptop.c +@@ -370,15 +370,17 @@ static u8 read_brightness(void) + &sretval); + if (!retval) { + user_brightness = sretval.retval[0]; +- if (user_brightness != 0) ++ if (user_brightness > sabi_config->min_brightness) + user_brightness -= sabi_config->min_brightness; ++ else ++ user_brightness = 0; + } + return user_brightness; + } + + static void set_brightness(u8 user_brightness) + { +- u8 user_level = user_brightness - sabi_config->min_brightness; ++ u8 user_level = user_brightness + sabi_config->min_brightness; + + sabi_set_command(sabi_config->commands.set_brightness, user_level); + } +@@ -631,6 +633,15 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { + .callback = dmi_check_cb, + }, + { ++ .ident = "R700", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "SR700"), ++ DMI_MATCH(DMI_BOARD_NAME, "SR700"), ++ }, ++ .callback = dmi_check_cb, ++ }, ++ { + .ident = "R530/R730", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), +@@ -676,6 +687,24 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { + }, + .callback = dmi_check_cb, + }, ++ { ++ .ident = "X520", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "X520"), ++ DMI_MATCH(DMI_BOARD_NAME, "X520"), ++ }, ++ .callback = dmi_check_cb, ++ }, ++ { ++ .ident = "R528/R728", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "R528/R728"), ++ DMI_MATCH(DMI_BOARD_NAME, "R528/R728"), ++ }, ++ .callback = dmi_check_cb, ++ }, + { }, + }; + MODULE_DEVICE_TABLE(dmi, samsung_dmi_table); +@@ -760,7 +789,7 @@ static int __init samsung_init(void) + sabi_iface = ioremap_nocache(ifaceP, 16); + if (!sabi_iface) { + pr_err("Can't remap %x\n", ifaceP); +- goto exit; ++ goto error_no_signature; + } + if (debug) { + printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP); +@@ -792,7 +821,8 @@ static int __init samsung_init(void) + /* create a backlight device to talk to this one */ + memset(&props, 0, sizeof(struct backlight_properties)); + props.type = BACKLIGHT_PLATFORM; +- props.max_brightness = sabi_config->max_brightness; ++ props.max_brightness = sabi_config->max_brightness - ++ sabi_config->min_brightness; + backlight_device = backlight_device_register("samsung", &sdev->dev, + NULL, &backlight_ops, + &props); +@@ -811,7 +841,6 @@ static int __init samsung_init(void) + if (retval) + goto error_file_create; + +-exit: + return 0; + + error_file_create: +diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c +index f23d5a8..9b88be4 100644 +--- a/drivers/platform/x86/wmi.c ++++ b/drivers/platform/x86/wmi.c +@@ -754,9 +754,13 @@ static void wmi_free_devices(void) + struct wmi_block *wblock, *next; + + /* Delete devices for all the GUIDs */ +- list_for_each_entry_safe(wblock, next, &wmi_block_list, list) ++ list_for_each_entry_safe(wblock, next, &wmi_block_list, list) { ++ list_del(&wblock->list); + if (wblock->dev.class) + device_unregister(&wblock->dev); ++ else ++ kfree(wblock); ++ } + } + + static bool guid_already_parsed(const char *guid_string) +diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c +index 1fefe82..91a783d 100644 +--- a/drivers/power/ds2780_battery.c ++++ b/drivers/power/ds2780_battery.c +@@ -39,6 +39,7 @@ struct ds2780_device_info { + struct device *dev; + struct power_supply bat; + struct device *w1_dev; ++ struct task_struct *mutex_holder; + }; + + enum current_types { +@@ -49,8 +50,8 @@ enum current_types { + static const char model[] = "DS2780"; + static const char manufacturer[] = "Maxim/Dallas"; + +-static inline struct ds2780_device_info *to_ds2780_device_info( +- struct power_supply *psy) ++static inline struct ds2780_device_info * ++to_ds2780_device_info(struct power_supply *psy) + { + return container_of(psy, struct ds2780_device_info, bat); + } +@@ -60,17 +61,28 @@ static inline struct power_supply *to_power_supply(struct device *dev) + return dev_get_drvdata(dev); + } + +-static inline int ds2780_read8(struct device *dev, u8 *val, int addr) ++static inline int ds2780_battery_io(struct ds2780_device_info *dev_info, ++ char *buf, int addr, size_t count, int io) + { +- return w1_ds2780_io(dev, val, addr, sizeof(u8), 0); ++ if (dev_info->mutex_holder == current) ++ return w1_ds2780_io_nolock(dev_info->w1_dev, buf, addr, count, io); ++ else ++ return w1_ds2780_io(dev_info->w1_dev, buf, addr, count, io); ++} ++ ++static inline int ds2780_read8(struct ds2780_device_info *dev_info, u8 *val, ++ int addr) ++{ ++ return ds2780_battery_io(dev_info, val, addr, sizeof(u8), 0); + } + +-static int ds2780_read16(struct device *dev, s16 *val, int addr) ++static int ds2780_read16(struct ds2780_device_info *dev_info, s16 *val, ++ int addr) + { + int ret; + u8 raw[2]; + +- ret = w1_ds2780_io(dev, raw, addr, sizeof(u8) * 2, 0); ++ ret = ds2780_battery_io(dev_info, raw, addr, sizeof(raw), 0); + if (ret < 0) + return ret; + +@@ -79,16 +91,16 @@ static int ds2780_read16(struct device *dev, s16 *val, int addr) + return 0; + } + +-static inline int ds2780_read_block(struct device *dev, u8 *val, int addr, +- size_t count) ++static inline int ds2780_read_block(struct ds2780_device_info *dev_info, ++ u8 *val, int addr, size_t count) + { +- return w1_ds2780_io(dev, val, addr, count, 0); ++ return ds2780_battery_io(dev_info, val, addr, count, 0); + } + +-static inline int ds2780_write(struct device *dev, u8 *val, int addr, +- size_t count) ++static inline int ds2780_write(struct ds2780_device_info *dev_info, u8 *val, ++ int addr, size_t count) + { +- return w1_ds2780_io(dev, val, addr, count, 1); ++ return ds2780_battery_io(dev_info, val, addr, count, 1); + } + + static inline int ds2780_store_eeprom(struct device *dev, int addr) +@@ -122,7 +134,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info, + { + int ret; + +- ret = ds2780_write(dev_info->w1_dev, &conductance, ++ ret = ds2780_write(dev_info, &conductance, + DS2780_RSNSP_REG, sizeof(u8)); + if (ret < 0) + return ret; +@@ -134,7 +146,7 @@ static int ds2780_set_sense_register(struct ds2780_device_info *dev_info, + static int ds2780_get_rsgain_register(struct ds2780_device_info *dev_info, + u16 *rsgain) + { +- return ds2780_read16(dev_info->w1_dev, rsgain, DS2780_RSGAIN_MSB_REG); ++ return ds2780_read16(dev_info, rsgain, DS2780_RSGAIN_MSB_REG); + } + + /* Set RSGAIN value from 0 to 1.999 in steps of 0.001 */ +@@ -144,8 +156,8 @@ static int ds2780_set_rsgain_register(struct ds2780_device_info *dev_info, + int ret; + u8 raw[] = {rsgain >> 8, rsgain & 0xFF}; + +- ret = ds2780_write(dev_info->w1_dev, raw, +- DS2780_RSGAIN_MSB_REG, sizeof(u8) * 2); ++ ret = ds2780_write(dev_info, raw, ++ DS2780_RSGAIN_MSB_REG, sizeof(raw)); + if (ret < 0) + return ret; + +@@ -167,7 +179,7 @@ static int ds2780_get_voltage(struct ds2780_device_info *dev_info, + * Bits 2 - 0 of the voltage value are in bits 7 - 5 of the + * voltage LSB register + */ +- ret = ds2780_read16(dev_info->w1_dev, &voltage_raw, ++ ret = ds2780_read16(dev_info, &voltage_raw, + DS2780_VOLT_MSB_REG); + if (ret < 0) + return ret; +@@ -196,7 +208,7 @@ static int ds2780_get_temperature(struct ds2780_device_info *dev_info, + * Bits 2 - 0 of the temperature value are in bits 7 - 5 of the + * temperature LSB register + */ +- ret = ds2780_read16(dev_info->w1_dev, &temperature_raw, ++ ret = ds2780_read16(dev_info, &temperature_raw, + DS2780_TEMP_MSB_REG); + if (ret < 0) + return ret; +@@ -222,13 +234,13 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info, + * The units of measurement for current are dependent on the value of + * the sense resistor. + */ +- ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG); ++ ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG); + if (ret < 0) + return ret; + + if (sense_res_raw == 0) { + dev_err(dev_info->dev, "sense resistor value is 0\n"); +- return -ENXIO; ++ return -EINVAL; + } + sense_res = 1000 / sense_res_raw; + +@@ -248,7 +260,7 @@ static int ds2780_get_current(struct ds2780_device_info *dev_info, + * Bits 7 - 0 of the current value are in bits 7 - 0 of the current + * LSB register + */ +- ret = ds2780_read16(dev_info->w1_dev, ¤t_raw, reg_msb); ++ ret = ds2780_read16(dev_info, ¤t_raw, reg_msb); + if (ret < 0) + return ret; + +@@ -267,7 +279,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info, + * The units of measurement for accumulated current are dependent on + * the value of the sense resistor. + */ +- ret = ds2780_read8(dev_info->w1_dev, &sense_res_raw, DS2780_RSNSP_REG); ++ ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG); + if (ret < 0) + return ret; + +@@ -285,7 +297,7 @@ static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info, + * Bits 7 - 0 of the ACR value are in bits 7 - 0 of the ACR + * LSB register + */ +- ret = ds2780_read16(dev_info->w1_dev, ¤t_raw, DS2780_ACR_MSB_REG); ++ ret = ds2780_read16(dev_info, ¤t_raw, DS2780_ACR_MSB_REG); + if (ret < 0) + return ret; + +@@ -299,7 +311,7 @@ static int ds2780_get_capacity(struct ds2780_device_info *dev_info, + int ret; + u8 raw; + +- ret = ds2780_read8(dev_info->w1_dev, &raw, DS2780_RARC_REG); ++ ret = ds2780_read8(dev_info, &raw, DS2780_RARC_REG); + if (ret < 0) + return ret; + +@@ -345,7 +357,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info, + * Bits 7 - 0 of the RAAC value are in bits 7 - 0 of the RAAC + * LSB register + */ +- ret = ds2780_read16(dev_info->w1_dev, &charge_raw, DS2780_RAAC_MSB_REG); ++ ret = ds2780_read16(dev_info, &charge_raw, DS2780_RAAC_MSB_REG); + if (ret < 0) + return ret; + +@@ -356,7 +368,7 @@ static int ds2780_get_charge_now(struct ds2780_device_info *dev_info, + static int ds2780_get_control_register(struct ds2780_device_info *dev_info, + u8 *control_reg) + { +- return ds2780_read8(dev_info->w1_dev, control_reg, DS2780_CONTROL_REG); ++ return ds2780_read8(dev_info, control_reg, DS2780_CONTROL_REG); + } + + static int ds2780_set_control_register(struct ds2780_device_info *dev_info, +@@ -364,7 +376,7 @@ static int ds2780_set_control_register(struct ds2780_device_info *dev_info, + { + int ret; + +- ret = ds2780_write(dev_info->w1_dev, &control_reg, ++ ret = ds2780_write(dev_info, &control_reg, + DS2780_CONTROL_REG, sizeof(u8)); + if (ret < 0) + return ret; +@@ -503,7 +515,7 @@ static ssize_t ds2780_get_sense_resistor_value(struct device *dev, + struct power_supply *psy = to_power_supply(dev); + struct ds2780_device_info *dev_info = to_ds2780_device_info(psy); + +- ret = ds2780_read8(dev_info->w1_dev, &sense_resistor, DS2780_RSNSP_REG); ++ ret = ds2780_read8(dev_info, &sense_resistor, DS2780_RSNSP_REG); + if (ret < 0) + return ret; + +@@ -584,7 +596,7 @@ static ssize_t ds2780_get_pio_pin(struct device *dev, + struct power_supply *psy = to_power_supply(dev); + struct ds2780_device_info *dev_info = to_ds2780_device_info(psy); + +- ret = ds2780_read8(dev_info->w1_dev, &sfr, DS2780_SFR_REG); ++ ret = ds2780_read8(dev_info, &sfr, DS2780_SFR_REG); + if (ret < 0) + return ret; + +@@ -611,7 +623,7 @@ static ssize_t ds2780_set_pio_pin(struct device *dev, + return -EINVAL; + } + +- ret = ds2780_write(dev_info->w1_dev, &new_setting, ++ ret = ds2780_write(dev_info, &new_setting, + DS2780_SFR_REG, sizeof(u8)); + if (ret < 0) + return ret; +@@ -632,7 +644,7 @@ static ssize_t ds2780_read_param_eeprom_bin(struct file *filp, + DS2780_EEPROM_BLOCK1_END - + DS2780_EEPROM_BLOCK1_START + 1 - off); + +- return ds2780_read_block(dev_info->w1_dev, buf, ++ return ds2780_read_block(dev_info, buf, + DS2780_EEPROM_BLOCK1_START + off, count); + } + +@@ -650,7 +662,7 @@ static ssize_t ds2780_write_param_eeprom_bin(struct file *filp, + DS2780_EEPROM_BLOCK1_END - + DS2780_EEPROM_BLOCK1_START + 1 - off); + +- ret = ds2780_write(dev_info->w1_dev, buf, ++ ret = ds2780_write(dev_info, buf, + DS2780_EEPROM_BLOCK1_START + off, count); + if (ret < 0) + return ret; +@@ -685,9 +697,8 @@ static ssize_t ds2780_read_user_eeprom_bin(struct file *filp, + DS2780_EEPROM_BLOCK0_END - + DS2780_EEPROM_BLOCK0_START + 1 - off); + +- return ds2780_read_block(dev_info->w1_dev, buf, ++ return ds2780_read_block(dev_info, buf, + DS2780_EEPROM_BLOCK0_START + off, count); +- + } + + static ssize_t ds2780_write_user_eeprom_bin(struct file *filp, +@@ -704,7 +715,7 @@ static ssize_t ds2780_write_user_eeprom_bin(struct file *filp, + DS2780_EEPROM_BLOCK0_END - + DS2780_EEPROM_BLOCK0_START + 1 - off); + +- ret = ds2780_write(dev_info->w1_dev, buf, ++ ret = ds2780_write(dev_info, buf, + DS2780_EEPROM_BLOCK0_START + off, count); + if (ret < 0) + return ret; +@@ -768,6 +779,7 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev) + dev_info->bat.properties = ds2780_battery_props; + dev_info->bat.num_properties = ARRAY_SIZE(ds2780_battery_props); + dev_info->bat.get_property = ds2780_battery_get_property; ++ dev_info->mutex_holder = current; + + ret = power_supply_register(&pdev->dev, &dev_info->bat); + if (ret) { +@@ -797,6 +809,8 @@ static int __devinit ds2780_battery_probe(struct platform_device *pdev) + goto fail_remove_bin_file; + } + ++ dev_info->mutex_holder = NULL; ++ + return 0; + + fail_remove_bin_file: +@@ -816,6 +830,8 @@ static int __devexit ds2780_battery_remove(struct platform_device *pdev) + { + struct ds2780_device_info *dev_info = platform_get_drvdata(pdev); + ++ dev_info->mutex_holder = current; ++ + /* remove attributes */ + sysfs_remove_group(&dev_info->bat.dev->kobj, &ds2780_attr_group); + +diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c +index 5c56741..cda9bd6 100644 +--- a/drivers/s390/cio/ccwgroup.c ++++ b/drivers/s390/cio/ccwgroup.c +@@ -87,6 +87,12 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev) + } + } + ++static ssize_t ccwgroup_online_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count); ++static ssize_t ccwgroup_online_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf); + /* + * Provide an 'ungroup' attribute so the user can remove group devices no + * longer needed or accidentially created. Saves memory :) +@@ -134,6 +140,20 @@ out: + } + + static DEVICE_ATTR(ungroup, 0200, NULL, ccwgroup_ungroup_store); ++static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store); ++ ++static struct attribute *ccwgroup_attrs[] = { ++ &dev_attr_online.attr, ++ &dev_attr_ungroup.attr, ++ NULL, ++}; ++static struct attribute_group ccwgroup_attr_group = { ++ .attrs = ccwgroup_attrs, ++}; ++static const struct attribute_group *ccwgroup_attr_groups[] = { ++ &ccwgroup_attr_group, ++ NULL, ++}; + + static void + ccwgroup_release (struct device *dev) +@@ -293,25 +313,17 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id, + } + + dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev)); +- ++ gdev->dev.groups = ccwgroup_attr_groups; + rc = device_add(&gdev->dev); + if (rc) + goto error; + get_device(&gdev->dev); +- rc = device_create_file(&gdev->dev, &dev_attr_ungroup); +- +- if (rc) { +- device_unregister(&gdev->dev); +- goto error; +- } +- + rc = __ccwgroup_create_symlinks(gdev); + if (!rc) { + mutex_unlock(&gdev->reg_mutex); + put_device(&gdev->dev); + return 0; + } +- device_remove_file(&gdev->dev, &dev_attr_ungroup); + device_unregister(&gdev->dev); + error: + for (i = 0; i < num_devices; i++) +@@ -423,7 +435,7 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const + int ret; + + if (!dev->driver) +- return -ENODEV; ++ return -EINVAL; + + gdev = to_ccwgroupdev(dev); + gdrv = to_ccwgroupdrv(dev->driver); +@@ -456,8 +468,6 @@ ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *b + return sprintf(buf, online ? "1\n" : "0\n"); + } + +-static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store); +- + static int + ccwgroup_probe (struct device *dev) + { +@@ -469,12 +479,7 @@ ccwgroup_probe (struct device *dev) + gdev = to_ccwgroupdev(dev); + gdrv = to_ccwgroupdrv(dev->driver); + +- if ((ret = device_create_file(dev, &dev_attr_online))) +- return ret; +- + ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV; +- if (ret) +- device_remove_file(dev, &dev_attr_online); + + return ret; + } +@@ -485,9 +490,6 @@ ccwgroup_remove (struct device *dev) + struct ccwgroup_device *gdev; + struct ccwgroup_driver *gdrv; + +- device_remove_file(dev, &dev_attr_online); +- device_remove_file(dev, &dev_attr_ungroup); +- + if (!dev->driver) + return 0; + +diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c +index 0119b81..d973325 100644 +--- a/drivers/scsi/device_handler/scsi_dh.c ++++ b/drivers/scsi/device_handler/scsi_dh.c +@@ -398,7 +398,15 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data) + + spin_lock_irqsave(q->queue_lock, flags); + sdev = q->queuedata; +- if (sdev && sdev->scsi_dh_data) ++ if (!sdev) { ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ err = SCSI_DH_NOSYS; ++ if (fn) ++ fn(data, err); ++ return err; ++ } ++ ++ if (sdev->scsi_dh_data) + scsi_dh = sdev->scsi_dh_data->scsi_dh; + dev = get_device(&sdev->sdev_gendev); + if (!scsi_dh || !dev || +diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c +index 4f7a582..351dc0b 100644 +--- a/drivers/scsi/hosts.c ++++ b/drivers/scsi/hosts.c +@@ -286,6 +286,7 @@ static void scsi_host_dev_release(struct device *dev) + { + struct Scsi_Host *shost = dev_to_shost(dev); + struct device *parent = dev->parent; ++ struct request_queue *q; + + scsi_proc_hostdir_rm(shost->hostt); + +@@ -293,9 +294,11 @@ static void scsi_host_dev_release(struct device *dev) + kthread_stop(shost->ehandler); + if (shost->work_q) + destroy_workqueue(shost->work_q); +- if (shost->uspace_req_q) { +- kfree(shost->uspace_req_q->queuedata); +- scsi_free_queue(shost->uspace_req_q); ++ q = shost->uspace_req_q; ++ if (q) { ++ kfree(q->queuedata); ++ q->queuedata = NULL; ++ scsi_free_queue(q); + } + + scsi_destroy_command_freelist(shost); +diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c +index 78c2e20..6689d5d 100644 +--- a/drivers/scsi/hpsa.c ++++ b/drivers/scsi/hpsa.c +@@ -3300,6 +3300,13 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, + pmcsr &= ~PCI_PM_CTRL_STATE_MASK; + pmcsr |= PCI_D0; + pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); ++ ++ /* ++ * The P600 requires a small delay when changing states. ++ * Otherwise we may think the board did not reset and we bail. ++ * This for kdump only and is particular to the P600. ++ */ ++ msleep(500); + } + return 0; + } +diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c +index 888086c..c5c7c3a 100644 +--- a/drivers/scsi/ipr.c ++++ b/drivers/scsi/ipr.c +@@ -8812,7 +8812,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, + uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32); + if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT)) + ioa_cfg->needs_hard_reset = 1; +- if (interrupts & IPR_PCII_ERROR_INTERRUPTS) ++ if ((interrupts & IPR_PCII_ERROR_INTERRUPTS) || reset_devices) + ioa_cfg->needs_hard_reset = 1; + if (interrupts & IPR_PCII_IOA_UNIT_CHECKED) + ioa_cfg->ioa_unit_checked = 1; +diff --git a/drivers/scsi/isci/isci.h b/drivers/scsi/isci/isci.h +index d1de633..8efeb6b 100644 +--- a/drivers/scsi/isci/isci.h ++++ b/drivers/scsi/isci/isci.h +@@ -97,7 +97,7 @@ + #define SCU_MAX_COMPLETION_QUEUE_SHIFT (ilog2(SCU_MAX_COMPLETION_QUEUE_ENTRIES)) + + #define SCU_ABSOLUTE_MAX_UNSOLICITED_FRAMES (4096) +-#define SCU_UNSOLICITED_FRAME_BUFFER_SIZE (1024) ++#define SCU_UNSOLICITED_FRAME_BUFFER_SIZE (1024U) + #define SCU_INVALID_FRAME_INDEX (0xFFFF) + + #define SCU_IO_REQUEST_MAX_SGE_SIZE (0x00FFFFFF) +diff --git a/drivers/scsi/isci/port_config.c b/drivers/scsi/isci/port_config.c +index 486b113..38a99d2 100644 +--- a/drivers/scsi/isci/port_config.c ++++ b/drivers/scsi/isci/port_config.c +@@ -678,7 +678,7 @@ static void apc_agent_timeout(unsigned long data) + configure_phy_mask = ~port_agent->phy_configured_mask & port_agent->phy_ready_mask; + + if (!configure_phy_mask) +- return; ++ goto done; + + for (index = 0; index < SCI_MAX_PHYS; index++) { + if ((configure_phy_mask & (1 << index)) == 0) +diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c +index b5d3a8c..225b196 100644 +--- a/drivers/scsi/isci/request.c ++++ b/drivers/scsi/isci/request.c +@@ -1490,29 +1490,30 @@ sci_io_request_frame_handler(struct isci_request *ireq, + return SCI_SUCCESS; + + case SCI_REQ_SMP_WAIT_RESP: { +- struct smp_resp *rsp_hdr = &ireq->smp.rsp; +- void *frame_header; ++ struct sas_task *task = isci_request_access_task(ireq); ++ struct scatterlist *sg = &task->smp_task.smp_resp; ++ void *frame_header, *kaddr; ++ u8 *rsp; + + sci_unsolicited_frame_control_get_header(&ihost->uf_control, +- frame_index, +- &frame_header); +- +- /* byte swap the header. */ +- word_cnt = SMP_RESP_HDR_SZ / sizeof(u32); +- sci_swab32_cpy(rsp_hdr, frame_header, word_cnt); ++ frame_index, ++ &frame_header); ++ kaddr = kmap_atomic(sg_page(sg), KM_IRQ0); ++ rsp = kaddr + sg->offset; ++ sci_swab32_cpy(rsp, frame_header, 1); + +- if (rsp_hdr->frame_type == SMP_RESPONSE) { ++ if (rsp[0] == SMP_RESPONSE) { + void *smp_resp; + + sci_unsolicited_frame_control_get_buffer(&ihost->uf_control, +- frame_index, +- &smp_resp); ++ frame_index, ++ &smp_resp); + +- word_cnt = (sizeof(struct smp_resp) - SMP_RESP_HDR_SZ) / +- sizeof(u32); +- +- sci_swab32_cpy(((u8 *) rsp_hdr) + SMP_RESP_HDR_SZ, +- smp_resp, word_cnt); ++ word_cnt = (sg->length/4)-1; ++ if (word_cnt > 0) ++ word_cnt = min_t(unsigned int, word_cnt, ++ SCU_UNSOLICITED_FRAME_BUFFER_SIZE/4); ++ sci_swab32_cpy(rsp + 4, smp_resp, word_cnt); + + ireq->scu_status = SCU_TASK_DONE_GOOD; + ireq->sci_status = SCI_SUCCESS; +@@ -1528,12 +1529,13 @@ sci_io_request_frame_handler(struct isci_request *ireq, + __func__, + ireq, + frame_index, +- rsp_hdr->frame_type); ++ rsp[0]); + + ireq->scu_status = SCU_TASK_DONE_SMP_FRM_TYPE_ERR; + ireq->sci_status = SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR; + sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); + } ++ kunmap_atomic(kaddr, KM_IRQ0); + + sci_controller_release_frame(ihost, frame_index); + +@@ -2603,18 +2605,7 @@ static void isci_request_io_request_complete(struct isci_host *ihost, + status = SAM_STAT_GOOD; + set_bit(IREQ_COMPLETE_IN_TARGET, &request->flags); + +- if (task->task_proto == SAS_PROTOCOL_SMP) { +- void *rsp = &request->smp.rsp; +- +- dev_dbg(&ihost->pdev->dev, +- "%s: SMP protocol completion\n", +- __func__); +- +- sg_copy_from_buffer( +- &task->smp_task.smp_resp, 1, +- rsp, sizeof(struct smp_resp)); +- } else if (completion_status +- == SCI_IO_SUCCESS_IO_DONE_EARLY) { ++ if (completion_status == SCI_IO_SUCCESS_IO_DONE_EARLY) { + + /* This was an SSP / STP / SATA transfer. + * There is a possibility that less data than +diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h +index 7a1d5a9..58d70b6 100644 +--- a/drivers/scsi/isci/request.h ++++ b/drivers/scsi/isci/request.h +@@ -174,9 +174,6 @@ struct isci_request { + }; + } ssp; + struct { +- struct smp_resp rsp; +- } smp; +- struct { + struct isci_stp_request req; + struct host_to_dev_fis cmd; + struct dev_to_host_fis rsp; +diff --git a/drivers/scsi/isci/sas.h b/drivers/scsi/isci/sas.h +index 462b151..dc26b4a 100644 +--- a/drivers/scsi/isci/sas.h ++++ b/drivers/scsi/isci/sas.h +@@ -204,8 +204,6 @@ struct smp_req { + u8 req_data[0]; + } __packed; + +-#define SMP_RESP_HDR_SZ 4 +- + /* + * struct sci_sas_address - This structure depicts how a SAS address is + * represented by SCI. +diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c +index 16ad97d..37cbe4d 100644 +--- a/drivers/scsi/libsas/sas_expander.c ++++ b/drivers/scsi/libsas/sas_expander.c +@@ -199,6 +199,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, + phy->virtual = dr->virtual; + phy->last_da_index = -1; + ++ phy->phy->identify.sas_address = SAS_ADDR(phy->attached_sas_addr); ++ phy->phy->identify.device_type = phy->attached_dev_type; + phy->phy->identify.initiator_port_protocols = phy->attached_iproto; + phy->phy->identify.target_port_protocols = phy->attached_tproto; + phy->phy->identify.phy_identifier = phy_id; +diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c +index 2d8cdce..e6e30f4 100644 +--- a/drivers/scsi/megaraid/megaraid_sas_base.c ++++ b/drivers/scsi/megaraid/megaraid_sas_base.c +@@ -1906,7 +1906,6 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd) + static enum + blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd) + { +- struct megasas_cmd *cmd = (struct megasas_cmd *)scmd->SCp.ptr; + struct megasas_instance *instance; + unsigned long flags; + +@@ -1915,7 +1914,7 @@ blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd) + return BLK_EH_NOT_HANDLED; + } + +- instance = cmd->instance; ++ instance = (struct megasas_instance *)scmd->device->host->hostdata; + if (!(instance->flag & MEGASAS_FW_BUSY)) { + /* FW is busy, throttle IO */ + spin_lock_irqsave(instance->host->host_lock, flags); +diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +index 8dc2ad4..5690f09 100644 +--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c ++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +@@ -7318,22 +7318,27 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc) + /* SAS Device List */ + list_for_each_entry_safe(sas_device, next, &ioc->sas_device_init_list, + list) { +- spin_lock_irqsave(&ioc->sas_device_lock, flags); +- list_move_tail(&sas_device->list, &ioc->sas_device_list); +- spin_unlock_irqrestore(&ioc->sas_device_lock, flags); + + if (ioc->hide_drives) + continue; + + if (!mpt2sas_transport_port_add(ioc, sas_device->handle, + sas_device->sas_address_parent)) { +- _scsih_sas_device_remove(ioc, sas_device); ++ list_del(&sas_device->list); ++ kfree(sas_device); ++ continue; + } else if (!sas_device->starget) { + mpt2sas_transport_port_remove(ioc, + sas_device->sas_address, + sas_device->sas_address_parent); +- _scsih_sas_device_remove(ioc, sas_device); ++ list_del(&sas_device->list); ++ kfree(sas_device); ++ continue; ++ + } ++ spin_lock_irqsave(&ioc->sas_device_lock, flags); ++ list_move_tail(&sas_device->list, &ioc->sas_device_list); ++ spin_unlock_irqrestore(&ioc->sas_device_lock, flags); + } + } + +diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c +index 28d9c9d..f97acff 100644 +--- a/drivers/scsi/scsi_lib.c ++++ b/drivers/scsi/scsi_lib.c +@@ -1697,6 +1697,15 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev) + + void scsi_free_queue(struct request_queue *q) + { ++ unsigned long flags; ++ ++ WARN_ON(q->queuedata); ++ ++ /* cause scsi_request_fn() to kill all non-finished requests */ ++ spin_lock_irqsave(q->queue_lock, flags); ++ q->request_fn(q); ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ + blk_cleanup_queue(q); + } + +diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c +index 44e8ca3..72273a0 100644 +--- a/drivers/scsi/scsi_scan.c ++++ b/drivers/scsi/scsi_scan.c +@@ -322,6 +322,7 @@ out_device_destroy: + scsi_device_set_state(sdev, SDEV_DEL); + transport_destroy_device(&sdev->sdev_gendev); + put_device(&sdev->sdev_dev); ++ scsi_free_queue(sdev->request_queue); + put_device(&sdev->sdev_gendev); + out: + if (display_failure_msg) +diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c +index 1871b8a..9b28f39 100644 +--- a/drivers/scsi/st.c ++++ b/drivers/scsi/st.c +@@ -462,14 +462,16 @@ static void st_scsi_execute_end(struct request *req, int uptodate) + { + struct st_request *SRpnt = req->end_io_data; + struct scsi_tape *STp = SRpnt->stp; ++ struct bio *tmp; + + STp->buffer->cmdstat.midlevel_result = SRpnt->result = req->errors; + STp->buffer->cmdstat.residual = req->resid_len; + ++ tmp = SRpnt->bio; + if (SRpnt->waiting) + complete(SRpnt->waiting); + +- blk_rq_unmap_user(SRpnt->bio); ++ blk_rq_unmap_user(tmp); + __blk_put_request(req->q, req); + } + +diff --git a/drivers/staging/hv/hyperv_storage.h b/drivers/staging/hv/hyperv_storage.h +index a01f9a0..5af82f4 100644 +--- a/drivers/staging/hv/hyperv_storage.h ++++ b/drivers/staging/hv/hyperv_storage.h +@@ -218,6 +218,7 @@ struct vstor_packet { + #define STORVSC_MAX_LUNS_PER_TARGET 64 + #define STORVSC_MAX_TARGETS 1 + #define STORVSC_MAX_CHANNELS 1 ++#define STORVSC_MAX_CMD_LEN 16 + + struct hv_storvsc_request; + +diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c +index cb4a25b..734076b 100644 +--- a/drivers/staging/hv/storvsc_drv.c ++++ b/drivers/staging/hv/storvsc_drv.c +@@ -729,6 +729,8 @@ static int storvsc_probe(struct hv_device *device) + host->max_id = STORVSC_MAX_TARGETS; + /* max # of channels */ + host->max_channel = STORVSC_MAX_CHANNELS - 1; ++ /* max cmd length */ ++ host->max_cmd_len = STORVSC_MAX_CMD_LEN; + + /* Register the HBA and start the scsi bus scan */ + ret = scsi_add_host(host, &device->device); +diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c +index ca098ca..02fafec 100644 +--- a/drivers/staging/quatech_usb2/quatech_usb2.c ++++ b/drivers/staging/quatech_usb2/quatech_usb2.c +@@ -916,9 +916,10 @@ static int qt2_ioctl(struct tty_struct *tty, + dbg("%s() port %d, cmd == TIOCMIWAIT enter", + __func__, port->number); + prev_msr_value = port_extra->shadowMSR & QT2_SERIAL_MSR_MASK; ++ barrier(); ++ __set_current_state(TASK_INTERRUPTIBLE); + while (1) { + add_wait_queue(&port_extra->wait, &wait); +- set_current_state(TASK_INTERRUPTIBLE); + schedule(); + dbg("%s(): port %d, cmd == TIOCMIWAIT here\n", + __func__, port->number); +@@ -926,9 +927,12 @@ static int qt2_ioctl(struct tty_struct *tty, + /* see if a signal woke us up */ + if (signal_pending(current)) + return -ERESTARTSYS; ++ set_current_state(TASK_INTERRUPTIBLE); + msr_value = port_extra->shadowMSR & QT2_SERIAL_MSR_MASK; +- if (msr_value == prev_msr_value) ++ if (msr_value == prev_msr_value) { ++ __set_current_state(TASK_RUNNING); + return -EIO; /* no change - error */ ++ } + if ((arg & TIOCM_RNG && + ((prev_msr_value & QT2_SERIAL_MSR_RI) == + (msr_value & QT2_SERIAL_MSR_RI))) || +@@ -941,6 +945,7 @@ static int qt2_ioctl(struct tty_struct *tty, + (arg & TIOCM_CTS && + ((prev_msr_value & QT2_SERIAL_MSR_CTS) == + (msr_value & QT2_SERIAL_MSR_CTS)))) { ++ __set_current_state(TASK_RUNNING); + return 0; + } + } /* end inifinite while */ +diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c +index 12f5eba..48aa61e 100644 +--- a/drivers/staging/serqt_usb2/serqt_usb2.c ++++ b/drivers/staging/serqt_usb2/serqt_usb2.c +@@ -24,7 +24,6 @@ static int debug; + #define DRIVER_DESC "Quatech USB to Serial Driver" + + #define USB_VENDOR_ID_QUATECH 0x061d /* Quatech VID */ +-#define QUATECH_SSU100 0xC020 /* SSU100 */ + #define QUATECH_SSU200 0xC030 /* SSU200 */ + #define QUATECH_DSU100 0xC040 /* DSU100 */ + #define QUATECH_DSU200 0xC050 /* DSU200 */ +@@ -127,7 +126,6 @@ static int debug; + #define RS232_MODE 0x00 + + static const struct usb_device_id serqt_id_table[] = { +- {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU100)}, + {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU200)}, + {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU100)}, + {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU200)}, +@@ -775,7 +773,6 @@ static int qt_startup(struct usb_serial *serial) + } + + switch (serial->dev->descriptor.idProduct) { +- case QUATECH_SSU100: + case QUATECH_DSU100: + case QUATECH_QSU100: + case QUATECH_ESU100A: +diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c +index 70c2e7f..4b5421b 100644 +--- a/drivers/target/loopback/tcm_loop.c ++++ b/drivers/target/loopback/tcm_loop.c +@@ -127,6 +127,24 @@ static struct se_cmd *tcm_loop_allocate_core_cmd( + set_host_byte(sc, DID_NO_CONNECT); + return NULL; + } ++ /* ++ * Because some userspace code via scsi-generic do not memset their ++ * associated read buffers, go ahead and do that here for type ++ * SCF_SCSI_CONTROL_SG_IO_CDB. Also note that this is currently ++ * guaranteed to be a single SGL for SCF_SCSI_CONTROL_SG_IO_CDB ++ * by target core in transport_generic_allocate_tasks() -> ++ * transport_generic_cmd_sequencer(). ++ */ ++ if (se_cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB && ++ se_cmd->data_direction == DMA_FROM_DEVICE) { ++ struct scatterlist *sg = scsi_sglist(sc); ++ unsigned char *buf = kmap(sg_page(sg)) + sg->offset; ++ ++ if (buf != NULL) { ++ memset(buf, 0, sg->length); ++ kunmap(sg_page(sg)); ++ } ++ } + + transport_device_setup_cmd(se_cmd); + return se_cmd; +diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c +index 47abb42..86b3660 100644 +--- a/drivers/target/target_core_alua.c ++++ b/drivers/target/target_core_alua.c +@@ -60,11 +60,31 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd) + unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf; + u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first + Target port group descriptor */ ++ /* ++ * Need at least 4 bytes of response data or else we can't ++ * even fit the return data length. ++ */ ++ if (cmd->data_length < 4) { ++ pr_warn("REPORT TARGET PORT GROUPS allocation length %u" ++ " too small\n", cmd->data_length); ++ return -EINVAL; ++ } + + spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock); + list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list, + tg_pt_gp_list) { + /* ++ * Check if the Target port group and Target port descriptor list ++ * based on tg_pt_gp_members count will fit into the response payload. ++ * Otherwise, bump rd_len to let the initiator know we have exceeded ++ * the allocation length and the response is truncated. ++ */ ++ if ((off + 8 + (tg_pt_gp->tg_pt_gp_members * 4)) > ++ cmd->data_length) { ++ rd_len += 8 + (tg_pt_gp->tg_pt_gp_members * 4); ++ continue; ++ } ++ /* + * PREF: Preferred target port bit, determine if this + * bit should be set for port group. + */ +diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c +index e809e9d..e18604b 100644 +--- a/drivers/tty/pty.c ++++ b/drivers/tty/pty.c +@@ -670,12 +670,18 @@ static int ptmx_open(struct inode *inode, struct file *filp) + + nonseekable_open(inode, filp); + ++ retval = tty_alloc_file(filp); ++ if (retval) ++ return retval; ++ + /* find a device that is not in use. */ + tty_lock(); + index = devpts_new_index(inode); + tty_unlock(); +- if (index < 0) +- return index; ++ if (index < 0) { ++ retval = index; ++ goto err_file; ++ } + + mutex_lock(&tty_mutex); + tty_lock(); +@@ -689,27 +695,27 @@ static int ptmx_open(struct inode *inode, struct file *filp) + + set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */ + +- retval = tty_add_file(tty, filp); +- if (retval) +- goto out; ++ tty_add_file(tty, filp); + + retval = devpts_pty_new(inode, tty->link); + if (retval) +- goto out1; ++ goto err_release; + + retval = ptm_driver->ops->open(tty, filp); + if (retval) +- goto out2; +-out1: ++ goto err_release; ++ + tty_unlock(); +- return retval; +-out2: ++ return 0; ++err_release: + tty_unlock(); + tty_release(inode, filp); + return retval; + out: + devpts_kill_index(inode, index); + tty_unlock(); ++err_file: ++ tty_free_file(filp); + return retval; + } + +diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c +index 225123b..58be715 100644 +--- a/drivers/tty/serial/crisv10.c ++++ b/drivers/tty/serial/crisv10.c +@@ -4450,7 +4450,7 @@ static int __init rs_init(void) + + #if defined(CONFIG_ETRAX_RS485) + #if defined(CONFIG_ETRAX_RS485_ON_PA) +- if (cris_io_interface_allocate_pins(if_ser0, 'a', rs485_pa_bit, ++ if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit, + rs485_pa_bit)) { + printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " + "RS485 pin\n"); +@@ -4459,7 +4459,7 @@ static int __init rs_init(void) + } + #endif + #if defined(CONFIG_ETRAX_RS485_ON_PORT_G) +- if (cris_io_interface_allocate_pins(if_ser0, 'g', rs485_pa_bit, ++ if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit, + rs485_port_g_bit)) { + printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " + "RS485 pin\n"); +diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h +index b704c8c..5b837e7 100644 +--- a/drivers/tty/serial/jsm/jsm.h ++++ b/drivers/tty/serial/jsm/jsm.h +@@ -183,10 +183,8 @@ struct jsm_board + /* Our Read/Error/Write queue sizes */ + #define RQUEUEMASK 0x1FFF /* 8 K - 1 */ + #define EQUEUEMASK 0x1FFF /* 8 K - 1 */ +-#define WQUEUEMASK 0x0FFF /* 4 K - 1 */ + #define RQUEUESIZE (RQUEUEMASK + 1) + #define EQUEUESIZE RQUEUESIZE +-#define WQUEUESIZE (WQUEUEMASK + 1) + + + /************************************************************************ +@@ -226,10 +224,6 @@ struct jsm_channel { + u16 ch_e_head; /* Head location of the error queue */ + u16 ch_e_tail; /* Tail location of the error queue */ + +- u8 *ch_wqueue; /* Our write queue buffer - malloc'ed */ +- u16 ch_w_head; /* Head location of the write queue */ +- u16 ch_w_tail; /* Tail location of the write queue */ +- + u64 ch_rxcount; /* total of data received so far */ + u64 ch_txcount; /* total of data transmitted so far */ + +@@ -378,7 +372,6 @@ extern int jsm_debug; + * Prototypes for non-static functions used in more than one module + * + *************************************************************************/ +-int jsm_tty_write(struct uart_port *port); + int jsm_tty_init(struct jsm_board *); + int jsm_uart_port_init(struct jsm_board *); + int jsm_remove_uart_port(struct jsm_board *); +diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c +index 96da178..2aaafa9 100644 +--- a/drivers/tty/serial/jsm/jsm_driver.c ++++ b/drivers/tty/serial/jsm/jsm_driver.c +@@ -211,7 +211,6 @@ static void __devexit jsm_remove_one(struct pci_dev *pdev) + if (brd->channels[i]) { + kfree(brd->channels[i]->ch_rqueue); + kfree(brd->channels[i]->ch_equeue); +- kfree(brd->channels[i]->ch_wqueue); + kfree(brd->channels[i]); + } + } +diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c +index 4538c3e..bd6e846 100644 +--- a/drivers/tty/serial/jsm/jsm_neo.c ++++ b/drivers/tty/serial/jsm/jsm_neo.c +@@ -496,12 +496,15 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch) + int s; + int qlen; + u32 len_written = 0; ++ struct circ_buf *circ; + + if (!ch) + return; + ++ circ = &ch->uart_port.state->xmit; ++ + /* No data to write to the UART */ +- if (ch->ch_w_tail == ch->ch_w_head) ++ if (uart_circ_empty(circ)) + return; + + /* If port is "stopped", don't send any data to the UART */ +@@ -517,11 +520,10 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch) + if (ch->ch_cached_lsr & UART_LSR_THRE) { + ch->ch_cached_lsr &= ~(UART_LSR_THRE); + +- writeb(ch->ch_wqueue[ch->ch_w_tail], &ch->ch_neo_uart->txrx); ++ writeb(circ->buf[circ->tail], &ch->ch_neo_uart->txrx); + jsm_printk(WRITE, INFO, &ch->ch_bd->pci_dev, +- "Tx data: %x\n", ch->ch_wqueue[ch->ch_w_head]); +- ch->ch_w_tail++; +- ch->ch_w_tail &= WQUEUEMASK; ++ "Tx data: %x\n", circ->buf[circ->head]); ++ circ->tail = (circ->tail + 1) & (UART_XMIT_SIZE - 1); + ch->ch_txcount++; + } + return; +@@ -536,36 +538,36 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch) + n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel; + + /* cache head and tail of queue */ +- head = ch->ch_w_head & WQUEUEMASK; +- tail = ch->ch_w_tail & WQUEUEMASK; +- qlen = (head - tail) & WQUEUEMASK; ++ head = circ->head & (UART_XMIT_SIZE - 1); ++ tail = circ->tail & (UART_XMIT_SIZE - 1); ++ qlen = uart_circ_chars_pending(circ); + + /* Find minimum of the FIFO space, versus queue length */ + n = min(n, qlen); + + while (n > 0) { + +- s = ((head >= tail) ? head : WQUEUESIZE) - tail; ++ s = ((head >= tail) ? head : UART_XMIT_SIZE) - tail; + s = min(s, n); + + if (s <= 0) + break; + +- memcpy_toio(&ch->ch_neo_uart->txrxburst, ch->ch_wqueue + tail, s); ++ memcpy_toio(&ch->ch_neo_uart->txrxburst, circ->buf + tail, s); + /* Add and flip queue if needed */ +- tail = (tail + s) & WQUEUEMASK; ++ tail = (tail + s) & (UART_XMIT_SIZE - 1); + n -= s; + ch->ch_txcount += s; + len_written += s; + } + + /* Update the final tail */ +- ch->ch_w_tail = tail & WQUEUEMASK; ++ circ->tail = tail & (UART_XMIT_SIZE - 1); + + if (len_written >= ch->ch_t_tlevel) + ch->ch_flags &= ~(CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM); + +- if (!jsm_tty_write(&ch->uart_port)) ++ if (uart_circ_empty(circ)) + uart_write_wakeup(&ch->uart_port); + } + +@@ -946,7 +948,6 @@ static void neo_param(struct jsm_channel *ch) + if ((ch->ch_c_cflag & (CBAUD)) == 0) { + ch->ch_r_head = ch->ch_r_tail = 0; + ch->ch_e_head = ch->ch_e_tail = 0; +- ch->ch_w_head = ch->ch_w_tail = 0; + + neo_flush_uart_write(ch); + neo_flush_uart_read(ch); +diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c +index 7a4a914..434bd88 100644 +--- a/drivers/tty/serial/jsm/jsm_tty.c ++++ b/drivers/tty/serial/jsm/jsm_tty.c +@@ -118,6 +118,19 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl) + udelay(10); + } + ++/* ++ * jsm_tty_write() ++ * ++ * Take data from the user or kernel and send it out to the FEP. ++ * In here exists all the Transparent Print magic as well. ++ */ ++static void jsm_tty_write(struct uart_port *port) ++{ ++ struct jsm_channel *channel; ++ channel = container_of(port, struct jsm_channel, uart_port); ++ channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel); ++} ++ + static void jsm_tty_start_tx(struct uart_port *port) + { + struct jsm_channel *channel = (struct jsm_channel *)port; +@@ -216,14 +229,6 @@ static int jsm_tty_open(struct uart_port *port) + return -ENOMEM; + } + } +- if (!channel->ch_wqueue) { +- channel->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL); +- if (!channel->ch_wqueue) { +- jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev, +- "unable to allocate write queue buf"); +- return -ENOMEM; +- } +- } + + channel->ch_flags &= ~(CH_OPENING); + /* +@@ -237,7 +242,6 @@ static int jsm_tty_open(struct uart_port *port) + */ + channel->ch_r_head = channel->ch_r_tail = 0; + channel->ch_e_head = channel->ch_e_tail = 0; +- channel->ch_w_head = channel->ch_w_tail = 0; + + brd->bd_ops->flush_uart_write(channel); + brd->bd_ops->flush_uart_read(channel); +@@ -836,75 +840,3 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch) + } + } + } +- +-/* +- * jsm_tty_write() +- * +- * Take data from the user or kernel and send it out to the FEP. +- * In here exists all the Transparent Print magic as well. +- */ +-int jsm_tty_write(struct uart_port *port) +-{ +- int bufcount; +- int data_count = 0,data_count1 =0; +- u16 head; +- u16 tail; +- u16 tmask; +- u32 remain; +- int temp_tail = port->state->xmit.tail; +- struct jsm_channel *channel = (struct jsm_channel *)port; +- +- tmask = WQUEUEMASK; +- head = (channel->ch_w_head) & tmask; +- tail = (channel->ch_w_tail) & tmask; +- +- if ((bufcount = tail - head - 1) < 0) +- bufcount += WQUEUESIZE; +- +- bufcount = min(bufcount, 56); +- remain = WQUEUESIZE - head; +- +- data_count = 0; +- if (bufcount >= remain) { +- bufcount -= remain; +- while ((port->state->xmit.head != temp_tail) && +- (data_count < remain)) { +- channel->ch_wqueue[head++] = +- port->state->xmit.buf[temp_tail]; +- +- temp_tail++; +- temp_tail &= (UART_XMIT_SIZE - 1); +- data_count++; +- } +- if (data_count == remain) head = 0; +- } +- +- data_count1 = 0; +- if (bufcount > 0) { +- remain = bufcount; +- while ((port->state->xmit.head != temp_tail) && +- (data_count1 < remain)) { +- channel->ch_wqueue[head++] = +- port->state->xmit.buf[temp_tail]; +- +- temp_tail++; +- temp_tail &= (UART_XMIT_SIZE - 1); +- data_count1++; +- +- } +- } +- +- port->state->xmit.tail = temp_tail; +- +- data_count += data_count1; +- if (data_count) { +- head &= tmask; +- channel->ch_w_head = head; +- } +- +- if (data_count) { +- channel->ch_bd->bd_ops->copy_data_from_queue_to_uart(channel); +- } +- +- return data_count; +-} +diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c +index 4302e6e..81243a6 100644 +--- a/drivers/tty/serial/pxa.c ++++ b/drivers/tty/serial/pxa.c +@@ -100,6 +100,16 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status) + int max_count = 256; + + do { ++ /* work around Errata #20 according to ++ * Intel(R) PXA27x Processor Family ++ * Specification Update (May 2005) ++ * ++ * Step 2 ++ * Disable the Reciever Time Out Interrupt via IER[RTOEI] ++ */ ++ up->ier &= ~UART_IER_RTOIE; ++ serial_out(up, UART_IER, up->ier); ++ + ch = serial_in(up, UART_RX); + flag = TTY_NORMAL; + up->port.icount.rx++; +@@ -156,6 +166,16 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status) + *status = serial_in(up, UART_LSR); + } while ((*status & UART_LSR_DR) && (max_count-- > 0)); + tty_flip_buffer_push(tty); ++ ++ /* work around Errata #20 according to ++ * Intel(R) PXA27x Processor Family ++ * Specification Update (May 2005) ++ * ++ * Step 6: ++ * No more data in FIFO: Re-enable RTO interrupt via IER[RTOIE] ++ */ ++ up->ier |= UART_IER_RTOIE; ++ serial_out(up, UART_IER, up->ier); + } + + static void transmit_chars(struct uart_pxa_port *up) +diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c +index db7912c..6bc20d7 100644 +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -2003,6 +2003,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) + if (port->tty && port->tty->termios && termios.c_cflag == 0) + termios = *(port->tty->termios); + ++ if (console_suspend_enabled) ++ uart_change_pm(state, 0); + uport->ops->set_termios(uport, &termios, NULL); + if (console_suspend_enabled) + console_start(uport->cons); +diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c +index b6f92d3..b44aef0 100644 +--- a/drivers/tty/tty_io.c ++++ b/drivers/tty/tty_io.c +@@ -193,8 +193,7 @@ static inline struct tty_struct *file_tty(struct file *file) + return ((struct tty_file_private *)file->private_data)->tty; + } + +-/* Associate a new file with the tty structure */ +-int tty_add_file(struct tty_struct *tty, struct file *file) ++int tty_alloc_file(struct file *file) + { + struct tty_file_private *priv; + +@@ -202,15 +201,36 @@ int tty_add_file(struct tty_struct *tty, struct file *file) + if (!priv) + return -ENOMEM; + ++ file->private_data = priv; ++ ++ return 0; ++} ++ ++/* Associate a new file with the tty structure */ ++void tty_add_file(struct tty_struct *tty, struct file *file) ++{ ++ struct tty_file_private *priv = file->private_data; ++ + priv->tty = tty; + priv->file = file; +- file->private_data = priv; + + spin_lock(&tty_files_lock); + list_add(&priv->list, &tty->tty_files); + spin_unlock(&tty_files_lock); ++} + +- return 0; ++/** ++ * tty_free_file - free file->private_data ++ * ++ * This shall be used only for fail path handling when tty_add_file was not ++ * called yet. ++ */ ++void tty_free_file(struct file *file) ++{ ++ struct tty_file_private *priv = file->private_data; ++ ++ file->private_data = NULL; ++ kfree(priv); + } + + /* Delete file from its tty */ +@@ -221,8 +241,7 @@ void tty_del_file(struct file *file) + spin_lock(&tty_files_lock); + list_del(&priv->list); + spin_unlock(&tty_files_lock); +- file->private_data = NULL; +- kfree(priv); ++ tty_free_file(file); + } + + +@@ -1811,6 +1830,10 @@ static int tty_open(struct inode *inode, struct file *filp) + nonseekable_open(inode, filp); + + retry_open: ++ retval = tty_alloc_file(filp); ++ if (retval) ++ return -ENOMEM; ++ + noctty = filp->f_flags & O_NOCTTY; + index = -1; + retval = 0; +@@ -1823,6 +1846,7 @@ retry_open: + if (!tty) { + tty_unlock(); + mutex_unlock(&tty_mutex); ++ tty_free_file(filp); + return -ENXIO; + } + driver = tty_driver_kref_get(tty->driver); +@@ -1855,6 +1879,7 @@ retry_open: + } + tty_unlock(); + mutex_unlock(&tty_mutex); ++ tty_free_file(filp); + return -ENODEV; + } + +@@ -1862,6 +1887,7 @@ retry_open: + if (!driver) { + tty_unlock(); + mutex_unlock(&tty_mutex); ++ tty_free_file(filp); + return -ENODEV; + } + got_driver: +@@ -1872,6 +1898,8 @@ got_driver: + if (IS_ERR(tty)) { + tty_unlock(); + mutex_unlock(&tty_mutex); ++ tty_driver_kref_put(driver); ++ tty_free_file(filp); + return PTR_ERR(tty); + } + } +@@ -1887,15 +1915,11 @@ got_driver: + tty_driver_kref_put(driver); + if (IS_ERR(tty)) { + tty_unlock(); ++ tty_free_file(filp); + return PTR_ERR(tty); + } + +- retval = tty_add_file(tty, filp); +- if (retval) { +- tty_unlock(); +- tty_release(inode, filp); +- return retval; +- } ++ tty_add_file(tty, filp); + + check_tty_count(tty, "tty_open"); + if (tty->driver->type == TTY_DRIVER_TYPE_PTY && +diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c +index dac7676..5112f57 100644 +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1534,6 +1534,9 @@ static const struct usb_device_id acm_ids[] = { + { NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */ + { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */ + ++ /* Support for Owen devices */ ++ { USB_DEVICE(0x03eb, 0x0030), }, /* Owen SI30 */ ++ + /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ + + /* Support Lego NXT using pbLua firmware */ +diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c +index 37518df..0ca54e2 100644 +--- a/drivers/usb/core/devio.c ++++ b/drivers/usb/core/devio.c +@@ -407,7 +407,7 @@ static void async_completed(struct urb *urb) + sinfo.si_errno = as->status; + sinfo.si_code = SI_ASYNCIO; + sinfo.si_addr = as->userurb; +- pid = as->pid; ++ pid = get_pid(as->pid); + uid = as->uid; + euid = as->euid; + secid = as->secid; +@@ -422,9 +422,11 @@ static void async_completed(struct urb *urb) + cancel_bulk_urbs(ps, as->bulk_addr); + spin_unlock(&ps->lock); + +- if (signr) ++ if (signr) { + kill_pid_info_as_uid(sinfo.si_signo, &sinfo, pid, uid, + euid, secid); ++ put_pid(pid); ++ } + + wake_up(&ps->wait); + } +@@ -607,9 +609,10 @@ static int findintfep(struct usb_device *dev, unsigned int ep) + } + + static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, +- unsigned int index) ++ unsigned int request, unsigned int index) + { + int ret = 0; ++ struct usb_host_interface *alt_setting; + + if (ps->dev->state != USB_STATE_UNAUTHENTICATED + && ps->dev->state != USB_STATE_ADDRESS +@@ -618,6 +621,19 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, + if (USB_TYPE_VENDOR == (USB_TYPE_MASK & requesttype)) + return 0; + ++ /* ++ * check for the special corner case 'get_device_id' in the printer ++ * class specification, where wIndex is (interface << 8 | altsetting) ++ * instead of just interface ++ */ ++ if (requesttype == 0xa1 && request == 0) { ++ alt_setting = usb_find_alt_setting(ps->dev->actconfig, ++ index >> 8, index & 0xff); ++ if (alt_setting ++ && alt_setting->desc.bInterfaceClass == USB_CLASS_PRINTER) ++ index >>= 8; ++ } ++ + index &= 0xff; + switch (requesttype & USB_RECIP_MASK) { + case USB_RECIP_ENDPOINT: +@@ -770,7 +786,8 @@ static int proc_control(struct dev_state *ps, void __user *arg) + + if (copy_from_user(&ctrl, arg, sizeof(ctrl))) + return -EFAULT; +- ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.wIndex); ++ ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.bRequest, ++ ctrl.wIndex); + if (ret) + return ret; + wLength = ctrl.wLength; /* To suppress 64k PAGE_SIZE warning */ +@@ -1100,7 +1117,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, + kfree(dr); + return -EINVAL; + } +- ret = check_ctrlrecip(ps, dr->bRequestType, ++ ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest, + le16_to_cpup(&dr->wIndex)); + if (ret) { + kfree(dr); +diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c +index 34e3da5..75b4bc0 100644 +--- a/drivers/usb/core/driver.c ++++ b/drivers/usb/core/driver.c +@@ -1583,7 +1583,7 @@ int usb_autopm_get_interface_async(struct usb_interface *intf) + dev_vdbg(&intf->dev, "%s: cnt %d -> %d\n", + __func__, atomic_read(&intf->dev.power.usage_count), + status); +- if (status > 0) ++ if (status > 0 || status == -EINPROGRESS) + status = 0; + return status; + } +@@ -1668,6 +1668,11 @@ int usb_runtime_suspend(struct device *dev) + return -EAGAIN; + + status = usb_suspend_both(udev, PMSG_AUTO_SUSPEND); ++ ++ /* Allow a retry if autosuspend failed temporarily */ ++ if (status == -EAGAIN || status == -EBUSY) ++ usb_mark_last_busy(udev); ++ + /* The PM core reacts badly unless the return code is 0, + * -EAGAIN, or -EBUSY, so always return -EBUSY on an error. + */ +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index ace9f84..39ea00b 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -1764,6 +1764,8 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, + struct usb_interface *iface = usb_ifnum_to_if(udev, + cur_alt->desc.bInterfaceNumber); + ++ if (!iface) ++ return -EINVAL; + if (iface->resetting_device) { + /* + * The USB core just reset the device, so the xHCI host +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index 81ce6a8..d6a8d82 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -38,6 +38,27 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Creative SB Audigy 2 NX */ + { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Logitech Webcam C200 */ ++ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C250 */ ++ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C300 */ ++ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam B/C500 */ ++ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam Pro 9000 */ ++ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C310 */ ++ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C270 */ ++ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech Harmony 700-series */ + { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT }, + +@@ -69,6 +90,9 @@ static const struct usb_device_id usb_quirk_list[] = { + { USB_DEVICE(0x06a3, 0x0006), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + ++ /* Guillemot Webcam Hercules Dualpix Exchange*/ ++ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* M-Systems Flash Disk Pioneers */ + { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, + +diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c +index 271ef94..88a464c 100644 +--- a/drivers/usb/gadget/printer.c ++++ b/drivers/usb/gadget/printer.c +@@ -1602,7 +1602,7 @@ cleanup(void) + if (status) + ERROR(dev, "usb_gadget_unregister_driver %x\n", status); + +- unregister_chrdev_region(g_printer_devno, 2); ++ unregister_chrdev_region(g_printer_devno, 1); + class_destroy(usb_gadget_class); + mutex_unlock(&usb_printer_gadget.lock_printer_io); + } +diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c +index 40a844c..3e2ccb0 100644 +--- a/drivers/usb/host/ehci-dbg.c ++++ b/drivers/usb/host/ehci-dbg.c +@@ -808,7 +808,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) + next += temp; + + temp = scnprintf (next, size, "uframe %04x\n", +- ehci_readl(ehci, &ehci->regs->frame_index)); ++ ehci_read_frame_index(ehci)); + size -= temp; + next += temp; + +diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c +index 9ff9abc..b27ceab 100644 +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -761,6 +761,35 @@ static int ehci_run (struct usb_hcd *hcd) + return 0; + } + ++static int __maybe_unused ehci_setup (struct usb_hcd *hcd) ++{ ++ struct ehci_hcd *ehci = hcd_to_ehci(hcd); ++ int retval; ++ ++ ehci->regs = (void __iomem *)ehci->caps + ++ HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); ++ dbg_hcs_params(ehci, "reset"); ++ dbg_hcc_params(ehci, "reset"); ++ ++ /* cache this readonly data; minimize chip reads */ ++ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); ++ ++ ehci->sbrn = HCD_USB2; ++ ++ retval = ehci_halt(ehci); ++ if (retval) ++ return retval; ++ ++ /* data structure init */ ++ retval = ehci_init(hcd); ++ if (retval) ++ return retval; ++ ++ ehci_reset(ehci); ++ ++ return 0; ++} ++ + /*-------------------------------------------------------------------------*/ + + static irqreturn_t ehci_irq (struct usb_hcd *hcd) +@@ -1159,8 +1188,7 @@ ehci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep) + static int ehci_get_frame (struct usb_hcd *hcd) + { + struct ehci_hcd *ehci = hcd_to_ehci (hcd); +- return (ehci_readl(ehci, &ehci->regs->frame_index) >> 3) % +- ehci->periodic_size; ++ return (ehci_read_frame_index(ehci) >> 3) % ehci->periodic_size; + } + + /*-------------------------------------------------------------------------*/ +diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c +index 0f3a724..f5d7fed 100644 +--- a/drivers/usb/host/ehci-hub.c ++++ b/drivers/usb/host/ehci-hub.c +@@ -1120,7 +1120,19 @@ static int ehci_hub_control ( + if (!selector || selector > 5) + goto error; + ehci_quiesce(ehci); ++ ++ /* Put all enabled ports into suspend */ ++ while (ports--) { ++ u32 __iomem *sreg = ++ &ehci->regs->port_status[ports]; ++ ++ temp = ehci_readl(ehci, sreg) & ~PORT_RWC_BITS; ++ if (temp & PORT_PE) ++ ehci_writel(ehci, temp | PORT_SUSPEND, ++ sreg); ++ } + ehci_halt(ehci); ++ temp = ehci_readl(ehci, status_reg); + temp |= selector << 16; + ehci_writel(ehci, temp, status_reg); + break; +diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c +index 1102ce6..1d1caa6 100644 +--- a/drivers/usb/host/ehci-pci.c ++++ b/drivers/usb/host/ehci-pci.c +@@ -224,6 +224,11 @@ static int ehci_pci_setup(struct usb_hcd *hcd) + pci_dev_put(p_smbus); + } + break; ++ case PCI_VENDOR_ID_NETMOS: ++ /* MosChip frame-index-register bug */ ++ ehci_info(ehci, "applying MosChip frame-index workaround\n"); ++ ehci->frame_index_bug = 1; ++ break; + } + + /* optional debug port, normally in the first BAR */ +diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c +index 6c9fbe3..063c630 100644 +--- a/drivers/usb/host/ehci-sched.c ++++ b/drivers/usb/host/ehci-sched.c +@@ -36,6 +36,27 @@ + + static int ehci_get_frame (struct usb_hcd *hcd); + ++#ifdef CONFIG_PCI ++ ++static unsigned ehci_read_frame_index(struct ehci_hcd *ehci) ++{ ++ unsigned uf; ++ ++ /* ++ * The MosChip MCS9990 controller updates its microframe counter ++ * a little before the frame counter, and occasionally we will read ++ * the invalid intermediate value. Avoid problems by checking the ++ * microframe number (the low-order 3 bits); if they are 0 then ++ * re-read the register to get the correct value. ++ */ ++ uf = ehci_readl(ehci, &ehci->regs->frame_index); ++ if (unlikely(ehci->frame_index_bug && ((uf & 7) == 0))) ++ uf = ehci_readl(ehci, &ehci->regs->frame_index); ++ return uf; ++} ++ ++#endif ++ + /*-------------------------------------------------------------------------*/ + + /* +@@ -482,7 +503,7 @@ static int enable_periodic (struct ehci_hcd *ehci) + ehci_to_hcd(ehci)->state = HC_STATE_RUNNING; + + /* make sure ehci_work scans these */ +- ehci->next_uframe = ehci_readl(ehci, &ehci->regs->frame_index) ++ ehci->next_uframe = ehci_read_frame_index(ehci) + % (ehci->periodic_size << 3); + if (unlikely(ehci->broken_periodic)) + ehci->last_periodic_enable = ktime_get_real(); +@@ -1412,7 +1433,7 @@ iso_stream_schedule ( + goto fail; + } + +- now = ehci_readl(ehci, &ehci->regs->frame_index) & (mod - 1); ++ now = ehci_read_frame_index(ehci) & (mod - 1); + + /* Typical case: reuse current schedule, stream is still active. + * Hopefully there are no gaps from the host falling behind +@@ -2279,7 +2300,7 @@ scan_periodic (struct ehci_hcd *ehci) + */ + now_uframe = ehci->next_uframe; + if (HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) { +- clock = ehci_readl(ehci, &ehci->regs->frame_index); ++ clock = ehci_read_frame_index(ehci); + clock_frame = (clock >> 3) & (ehci->periodic_size - 1); + } else { + clock = now_uframe + mod - 1; +@@ -2458,8 +2479,7 @@ restart: + || ehci->periodic_sched == 0) + break; + ehci->next_uframe = now_uframe; +- now = ehci_readl(ehci, &ehci->regs->frame_index) & +- (mod - 1); ++ now = ehci_read_frame_index(ehci) & (mod - 1); + if (now_uframe == now) + break; + +diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h +index 989e0a8..3ffb27f 100644 +--- a/drivers/usb/host/ehci.h ++++ b/drivers/usb/host/ehci.h +@@ -137,6 +137,7 @@ struct ehci_hcd { /* one per controller */ + unsigned fs_i_thresh:1; /* Intel iso scheduling */ + unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ + unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ ++ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */ + + /* required for usb32 quirk */ + #define OHCI_CTRL_HCFS (3 << 6) +@@ -738,6 +739,22 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x) + + /*-------------------------------------------------------------------------*/ + ++#ifdef CONFIG_PCI ++ ++/* For working around the MosChip frame-index-register bug */ ++static unsigned ehci_read_frame_index(struct ehci_hcd *ehci); ++ ++#else ++ ++static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci) ++{ ++ return ehci_readl(ehci, &ehci->regs->frame_index); ++} ++ ++#endif ++ ++/*-------------------------------------------------------------------------*/ ++ + #ifndef DEBUG + #define STUB_DEBUG_FILES + #endif /* DEBUG */ +diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c +index a42ef38..2df851b 100644 +--- a/drivers/usb/host/fhci-sched.c ++++ b/drivers/usb/host/fhci-sched.c +@@ -1,7 +1,7 @@ + /* + * Freescale QUICC Engine USB Host Controller Driver + * +- * Copyright (c) Freescale Semicondutor, Inc. 2006. ++ * Copyright (c) Freescale Semicondutor, Inc. 2006, 2011. + * Shlomi Gridish <gridish@freescale.com> + * Jerry Huang <Chang-Ming.Huang@freescale.com> + * Copyright (c) Logic Product Development, Inc. 2007 +@@ -810,9 +810,11 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) + ed->dev_addr = usb_pipedevice(urb->pipe); + ed->max_pkt_size = usb_maxpacket(urb->dev, urb->pipe, + usb_pipeout(urb->pipe)); ++ /* setup stage */ + td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP, + USB_TD_TOGGLE_DATA0, urb->setup_packet, 8, 0, 0, true); + ++ /* data stage */ + if (data_len > 0) { + td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, + usb_pipeout(urb->pipe) ? FHCI_TA_OUT : +@@ -820,9 +822,18 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) + USB_TD_TOGGLE_DATA1, data, data_len, 0, 0, + true); + } +- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, +- usb_pipeout(urb->pipe) ? FHCI_TA_IN : FHCI_TA_OUT, +- USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true); ++ ++ /* status stage */ ++ if (data_len > 0) ++ td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, ++ (usb_pipeout(urb->pipe) ? FHCI_TA_IN : ++ FHCI_TA_OUT), ++ USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true); ++ else ++ td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, ++ FHCI_TA_IN, ++ USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true); ++ + urb_state = US_CTRL_SETUP; + break; + case FHCI_TF_ISO: +diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c +index 55d3d58..840beda 100644 +--- a/drivers/usb/host/isp1760-hcd.c ++++ b/drivers/usb/host/isp1760-hcd.c +@@ -1583,6 +1583,9 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, + int retval = 0; + + spin_lock_irqsave(&priv->lock, spinflags); ++ retval = usb_hcd_check_unlink_urb(hcd, urb, status); ++ if (retval) ++ goto out; + + qh = urb->ep->hcpriv; + if (!qh) { +diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c +index 9154615..2f00040 100644 +--- a/drivers/usb/host/ohci-hub.c ++++ b/drivers/usb/host/ohci-hub.c +@@ -356,10 +356,7 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd) + msleep(20); + } + +- /* Does the root hub have a port wakeup pending? */ +- if (ohci_readl(ohci, &ohci->regs->intrstatus) & +- (OHCI_INTR_RD | OHCI_INTR_RHSC)) +- usb_hcd_resume_root_hub(hcd); ++ usb_hcd_resume_root_hub(hcd); + } + + /* Carry out polling-, autostop-, and autoresume-related state changes */ +diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c +index 723f823..ce9f974 100644 +--- a/drivers/usb/host/xhci-hub.c ++++ b/drivers/usb/host/xhci-hub.c +@@ -392,6 +392,20 @@ static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array) + return max_ports; + } + ++/* Test and clear port RWC bit */ ++void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array, ++ int port_id, u32 port_bit) ++{ ++ u32 temp; ++ ++ temp = xhci_readl(xhci, port_array[port_id]); ++ if (temp & port_bit) { ++ temp = xhci_port_state_to_neutral(temp); ++ temp |= port_bit; ++ xhci_writel(xhci, temp, port_array[port_id]); ++ } ++} ++ + int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, + u16 wIndex, char *buf, u16 wLength) + { +@@ -938,12 +952,8 @@ int xhci_bus_resume(struct usb_hcd *hcd) + spin_lock_irqsave(&xhci->lock, flags); + + /* Clear PLC */ +- temp = xhci_readl(xhci, port_array[port_index]); +- if (temp & PORT_PLC) { +- temp = xhci_port_state_to_neutral(temp); +- temp |= PORT_PLC; +- xhci_writel(xhci, temp, port_array[port_index]); +- } ++ xhci_test_and_clear_bit(xhci, port_array, port_index, ++ PORT_PLC); + + slot_id = xhci_find_slot_id_by_port(hcd, + xhci, port_index + 1); +diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c +index fcb7f7e..104620b 100644 +--- a/drivers/usb/host/xhci-mem.c ++++ b/drivers/usb/host/xhci-mem.c +@@ -81,7 +81,7 @@ static void xhci_segment_free(struct xhci_hcd *xhci, struct xhci_segment *seg) + * related flags, such as End TRB, Toggle Cycle, and no snoop. + */ + static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev, +- struct xhci_segment *next, bool link_trbs) ++ struct xhci_segment *next, bool link_trbs, bool isoc) + { + u32 val; + +@@ -97,7 +97,9 @@ static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev, + val &= ~TRB_TYPE_BITMASK; + val |= TRB_TYPE(TRB_LINK); + /* Always set the chain bit with 0.95 hardware */ +- if (xhci_link_trb_quirk(xhci)) ++ /* Set chain bit for isoc rings on AMD 0.96 host */ ++ if (xhci_link_trb_quirk(xhci) || ++ (isoc && (xhci->quirks & XHCI_AMD_0x96_HOST))) + val |= TRB_CHAIN; + prev->trbs[TRBS_PER_SEGMENT-1].link.control = cpu_to_le32(val); + } +@@ -112,18 +114,20 @@ void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring) + struct xhci_segment *seg; + struct xhci_segment *first_seg; + +- if (!ring || !ring->first_seg) ++ if (!ring) + return; +- first_seg = ring->first_seg; +- seg = first_seg->next; +- xhci_dbg(xhci, "Freeing ring at %p\n", ring); +- while (seg != first_seg) { +- struct xhci_segment *next = seg->next; +- xhci_segment_free(xhci, seg); +- seg = next; ++ if (ring->first_seg) { ++ first_seg = ring->first_seg; ++ seg = first_seg->next; ++ xhci_dbg(xhci, "Freeing ring at %p\n", ring); ++ while (seg != first_seg) { ++ struct xhci_segment *next = seg->next; ++ xhci_segment_free(xhci, seg); ++ seg = next; ++ } ++ xhci_segment_free(xhci, first_seg); ++ ring->first_seg = NULL; + } +- xhci_segment_free(xhci, first_seg); +- ring->first_seg = NULL; + kfree(ring); + } + +@@ -152,7 +156,7 @@ static void xhci_initialize_ring_info(struct xhci_ring *ring) + * See section 4.9.1 and figures 15 and 16. + */ + static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci, +- unsigned int num_segs, bool link_trbs, gfp_t flags) ++ unsigned int num_segs, bool link_trbs, bool isoc, gfp_t flags) + { + struct xhci_ring *ring; + struct xhci_segment *prev; +@@ -178,12 +182,12 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci, + next = xhci_segment_alloc(xhci, flags); + if (!next) + goto fail; +- xhci_link_segments(xhci, prev, next, link_trbs); ++ xhci_link_segments(xhci, prev, next, link_trbs, isoc); + + prev = next; + num_segs--; + } +- xhci_link_segments(xhci, prev, ring->first_seg, link_trbs); ++ xhci_link_segments(xhci, prev, ring->first_seg, link_trbs, isoc); + + if (link_trbs) { + /* See section 4.9.2.1 and 6.4.4.1 */ +@@ -229,14 +233,14 @@ void xhci_free_or_cache_endpoint_ring(struct xhci_hcd *xhci, + * pointers to the beginning of the ring. + */ + static void xhci_reinit_cached_ring(struct xhci_hcd *xhci, +- struct xhci_ring *ring) ++ struct xhci_ring *ring, bool isoc) + { + struct xhci_segment *seg = ring->first_seg; + do { + memset(seg->trbs, 0, + sizeof(union xhci_trb)*TRBS_PER_SEGMENT); + /* All endpoint rings have link TRBs */ +- xhci_link_segments(xhci, seg, seg->next, 1); ++ xhci_link_segments(xhci, seg, seg->next, 1, isoc); + seg = seg->next; + } while (seg != ring->first_seg); + xhci_initialize_ring_info(ring); +@@ -540,7 +544,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci, + */ + for (cur_stream = 1; cur_stream < num_streams; cur_stream++) { + stream_info->stream_rings[cur_stream] = +- xhci_ring_alloc(xhci, 1, true, mem_flags); ++ xhci_ring_alloc(xhci, 1, true, false, mem_flags); + cur_ring = stream_info->stream_rings[cur_stream]; + if (!cur_ring) + goto cleanup_rings; +@@ -765,7 +769,7 @@ int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, + } + + /* Allocate endpoint 0 ring */ +- dev->eps[0].ring = xhci_ring_alloc(xhci, 1, true, flags); ++ dev->eps[0].ring = xhci_ring_alloc(xhci, 1, true, false, flags); + if (!dev->eps[0].ring) + goto fail; + +@@ -1175,10 +1179,10 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, + */ + if (usb_endpoint_xfer_isoc(&ep->desc)) + virt_dev->eps[ep_index].new_ring = +- xhci_ring_alloc(xhci, 8, true, mem_flags); ++ xhci_ring_alloc(xhci, 8, true, true, mem_flags); + else + virt_dev->eps[ep_index].new_ring = +- xhci_ring_alloc(xhci, 1, true, mem_flags); ++ xhci_ring_alloc(xhci, 1, true, false, mem_flags); + if (!virt_dev->eps[ep_index].new_ring) { + /* Attempt to use the ring cache */ + if (virt_dev->num_rings_cached == 0) +@@ -1187,7 +1191,8 @@ int xhci_endpoint_init(struct xhci_hcd *xhci, + virt_dev->ring_cache[virt_dev->num_rings_cached]; + virt_dev->ring_cache[virt_dev->num_rings_cached] = NULL; + virt_dev->num_rings_cached--; +- xhci_reinit_cached_ring(xhci, virt_dev->eps[ep_index].new_ring); ++ xhci_reinit_cached_ring(xhci, virt_dev->eps[ep_index].new_ring, ++ usb_endpoint_xfer_isoc(&ep->desc) ? true : false); + } + virt_dev->eps[ep_index].skip = false; + ep_ring = virt_dev->eps[ep_index].new_ring; +@@ -2001,7 +2006,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) + goto fail; + + /* Set up the command ring to have one segments for now. */ +- xhci->cmd_ring = xhci_ring_alloc(xhci, 1, true, flags); ++ xhci->cmd_ring = xhci_ring_alloc(xhci, 1, true, false, flags); + if (!xhci->cmd_ring) + goto fail; + xhci_dbg(xhci, "Allocated command ring at %p\n", xhci->cmd_ring); +@@ -2032,7 +2037,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) + * the event ring segment table (ERST). Section 4.9.3. + */ + xhci_dbg(xhci, "// Allocating event ring\n"); +- xhci->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, false, flags); ++ xhci->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, false, false, ++ flags); + if (!xhci->event_ring) + goto fail; + if (xhci_check_trb_in_td_math(xhci, flags) < 0) +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index cb16de2..50e7156 100644 +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -128,6 +128,9 @@ static int xhci_pci_setup(struct usb_hcd *hcd) + if (pdev->vendor == PCI_VENDOR_ID_NEC) + xhci->quirks |= XHCI_NEC_HOST; + ++ if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96) ++ xhci->quirks |= XHCI_AMD_0x96_HOST; ++ + /* AMD PLL quirk */ + if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info()) + xhci->quirks |= XHCI_AMD_PLL_FIX; +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index d0871ea..b20d2f7 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -187,7 +187,7 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer + * prepare_transfer()? + */ + static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring, +- bool consumer, bool more_trbs_coming) ++ bool consumer, bool more_trbs_coming, bool isoc) + { + u32 chain; + union xhci_trb *next; +@@ -214,11 +214,13 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring, + if (!chain && !more_trbs_coming) + break; + +- /* If we're not dealing with 0.95 hardware, ++ /* If we're not dealing with 0.95 hardware or ++ * isoc rings on AMD 0.96 host, + * carry over the chain bit of the previous TRB + * (which may mean the chain bit is cleared). + */ +- if (!xhci_link_trb_quirk(xhci)) { ++ if (!(isoc && (xhci->quirks & XHCI_AMD_0x96_HOST)) ++ && !xhci_link_trb_quirk(xhci)) { + next->link.control &= + cpu_to_le32(~TRB_CHAIN); + next->link.control |= +@@ -1345,10 +1347,8 @@ static void handle_port_status(struct xhci_hcd *xhci, + xhci_ring_device(xhci, slot_id); + xhci_dbg(xhci, "resume SS port %d finished\n", port_id); + /* Clear PORT_PLC */ +- temp = xhci_readl(xhci, port_array[faked_port_index]); +- temp = xhci_port_state_to_neutral(temp); +- temp |= PORT_PLC; +- xhci_writel(xhci, temp, port_array[faked_port_index]); ++ xhci_test_and_clear_bit(xhci, port_array, ++ faked_port_index, PORT_PLC); + } else { + xhci_dbg(xhci, "resume HS port %d\n", port_id); + bus_state->resume_done[faked_port_index] = jiffies + +@@ -1359,6 +1359,10 @@ static void handle_port_status(struct xhci_hcd *xhci, + } + } + ++ if (hcd->speed != HCD_USB3) ++ xhci_test_and_clear_bit(xhci, port_array, faked_port_index, ++ PORT_PLC); ++ + cleanup: + /* Update event ring dequeue pointer before dropping the lock */ + inc_deq(xhci, xhci->event_ring, true); +@@ -1940,8 +1944,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, + int status = -EINPROGRESS; + struct urb_priv *urb_priv; + struct xhci_ep_ctx *ep_ctx; ++ struct list_head *tmp; + u32 trb_comp_code; + int ret = 0; ++ int td_num = 0; + + slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags)); + xdev = xhci->devs[slot_id]; +@@ -1963,6 +1969,12 @@ static int handle_tx_event(struct xhci_hcd *xhci, + return -ENODEV; + } + ++ /* Count current td numbers if ep->skip is set */ ++ if (ep->skip) { ++ list_for_each(tmp, &ep_ring->td_list) ++ td_num++; ++ } ++ + event_dma = le64_to_cpu(event->buffer); + trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len)); + /* Look for common error cases */ +@@ -2074,7 +2086,18 @@ static int handle_tx_event(struct xhci_hcd *xhci, + goto cleanup; + } + ++ /* We've skipped all the TDs on the ep ring when ep->skip set */ ++ if (ep->skip && td_num == 0) { ++ ep->skip = false; ++ xhci_dbg(xhci, "All tds on the ep_ring skipped. " ++ "Clear skip flag.\n"); ++ ret = 0; ++ goto cleanup; ++ } ++ + td = list_entry(ep_ring->td_list.next, struct xhci_td, td_list); ++ if (ep->skip) ++ td_num--; + + /* Is this a TRB in the currently executing TD? */ + event_seg = trb_in_td(ep_ring->deq_seg, ep_ring->dequeue, +@@ -2398,7 +2421,7 @@ irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd) + * prepare_transfer()? + */ + static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring, +- bool consumer, bool more_trbs_coming, ++ bool consumer, bool more_trbs_coming, bool isoc, + u32 field1, u32 field2, u32 field3, u32 field4) + { + struct xhci_generic_trb *trb; +@@ -2408,7 +2431,7 @@ static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring, + trb->field[1] = cpu_to_le32(field2); + trb->field[2] = cpu_to_le32(field3); + trb->field[3] = cpu_to_le32(field4); +- inc_enq(xhci, ring, consumer, more_trbs_coming); ++ inc_enq(xhci, ring, consumer, more_trbs_coming, isoc); + } + + /* +@@ -2416,7 +2439,7 @@ static void queue_trb(struct xhci_hcd *xhci, struct xhci_ring *ring, + * FIXME allocate segments if the ring is full. + */ + static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, +- u32 ep_state, unsigned int num_trbs, gfp_t mem_flags) ++ u32 ep_state, unsigned int num_trbs, bool isoc, gfp_t mem_flags) + { + /* Make sure the endpoint has been added to xHC schedule */ + switch (ep_state) { +@@ -2458,10 +2481,11 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, + next = ring->enqueue; + + while (last_trb(xhci, ring, ring->enq_seg, next)) { +- /* If we're not dealing with 0.95 hardware, +- * clear the chain bit. ++ /* If we're not dealing with 0.95 hardware or isoc rings ++ * on AMD 0.96 host, clear the chain bit. + */ +- if (!xhci_link_trb_quirk(xhci)) ++ if (!xhci_link_trb_quirk(xhci) && !(isoc && ++ (xhci->quirks & XHCI_AMD_0x96_HOST))) + next->link.control &= cpu_to_le32(~TRB_CHAIN); + else + next->link.control |= cpu_to_le32(TRB_CHAIN); +@@ -2494,6 +2518,7 @@ static int prepare_transfer(struct xhci_hcd *xhci, + unsigned int num_trbs, + struct urb *urb, + unsigned int td_index, ++ bool isoc, + gfp_t mem_flags) + { + int ret; +@@ -2511,7 +2536,7 @@ static int prepare_transfer(struct xhci_hcd *xhci, + + ret = prepare_ring(xhci, ep_ring, + le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK, +- num_trbs, mem_flags); ++ num_trbs, isoc, mem_flags); + if (ret) + return ret; + +@@ -2734,7 +2759,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + + trb_buff_len = prepare_transfer(xhci, xhci->devs[slot_id], + ep_index, urb->stream_id, +- num_trbs, urb, 0, mem_flags); ++ num_trbs, urb, 0, false, mem_flags); + if (trb_buff_len < 0) + return trb_buff_len; + +@@ -2829,7 +2854,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + more_trbs_coming = true; + else + more_trbs_coming = false; +- queue_trb(xhci, ep_ring, false, more_trbs_coming, ++ queue_trb(xhci, ep_ring, false, more_trbs_coming, false, + lower_32_bits(addr), + upper_32_bits(addr), + length_field, +@@ -2920,7 +2945,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + + ret = prepare_transfer(xhci, xhci->devs[slot_id], + ep_index, urb->stream_id, +- num_trbs, urb, 0, mem_flags); ++ num_trbs, urb, 0, false, mem_flags); + if (ret < 0) + return ret; + +@@ -2992,7 +3017,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + more_trbs_coming = true; + else + more_trbs_coming = false; +- queue_trb(xhci, ep_ring, false, more_trbs_coming, ++ queue_trb(xhci, ep_ring, false, more_trbs_coming, false, + lower_32_bits(addr), + upper_32_bits(addr), + length_field, +@@ -3052,7 +3077,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + num_trbs++; + ret = prepare_transfer(xhci, xhci->devs[slot_id], + ep_index, urb->stream_id, +- num_trbs, urb, 0, mem_flags); ++ num_trbs, urb, 0, false, mem_flags); + if (ret < 0) + return ret; + +@@ -3085,7 +3110,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + } + } + +- queue_trb(xhci, ep_ring, false, true, ++ queue_trb(xhci, ep_ring, false, true, false, + setup->bRequestType | setup->bRequest << 8 | le16_to_cpu(setup->wValue) << 16, + le16_to_cpu(setup->wIndex) | le16_to_cpu(setup->wLength) << 16, + TRB_LEN(8) | TRB_INTR_TARGET(0), +@@ -3105,7 +3130,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + if (urb->transfer_buffer_length > 0) { + if (setup->bRequestType & USB_DIR_IN) + field |= TRB_DIR_IN; +- queue_trb(xhci, ep_ring, false, true, ++ queue_trb(xhci, ep_ring, false, true, false, + lower_32_bits(urb->transfer_dma), + upper_32_bits(urb->transfer_dma), + length_field, +@@ -3121,7 +3146,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + field = 0; + else + field = TRB_DIR_IN; +- queue_trb(xhci, ep_ring, false, false, ++ queue_trb(xhci, ep_ring, false, false, false, + 0, + 0, + TRB_INTR_TARGET(0), +@@ -3270,7 +3295,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + trbs_per_td = count_isoc_trbs_needed(xhci, urb, i); + + ret = prepare_transfer(xhci, xhci->devs[slot_id], ep_index, +- urb->stream_id, trbs_per_td, urb, i, mem_flags); ++ urb->stream_id, trbs_per_td, urb, i, true, ++ mem_flags); + if (ret < 0) { + if (i == 0) + return ret; +@@ -3340,7 +3366,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, + remainder | + TRB_INTR_TARGET(0); + +- queue_trb(xhci, ep_ring, false, more_trbs_coming, ++ queue_trb(xhci, ep_ring, false, more_trbs_coming, true, + lower_32_bits(addr), + upper_32_bits(addr), + length_field, +@@ -3422,7 +3448,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags, + * Do not insert any td of the urb to the ring if the check failed. + */ + ret = prepare_ring(xhci, ep_ring, le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK, +- num_trbs, mem_flags); ++ num_trbs, true, mem_flags); + if (ret) + return ret; + +@@ -3481,7 +3507,7 @@ static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2, + reserved_trbs++; + + ret = prepare_ring(xhci, xhci->cmd_ring, EP_STATE_RUNNING, +- reserved_trbs, GFP_ATOMIC); ++ reserved_trbs, false, GFP_ATOMIC); + if (ret < 0) { + xhci_err(xhci, "ERR: No room for command on command ring\n"); + if (command_must_succeed) +@@ -3489,8 +3515,8 @@ static int queue_command(struct xhci_hcd *xhci, u32 field1, u32 field2, + "unfailable commands failed.\n"); + return ret; + } +- queue_trb(xhci, xhci->cmd_ring, false, false, field1, field2, field3, +- field4 | xhci->cmd_ring->cycle_state); ++ queue_trb(xhci, xhci->cmd_ring, false, false, false, field1, field2, ++ field3, field4 | xhci->cmd_ring->cycle_state); + return 0; + } + +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index 7ea48b3..fb61e9d 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -1889,6 +1889,12 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) + ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG); + ctrl_ctx->add_flags &= cpu_to_le32(~EP0_FLAG); + ctrl_ctx->drop_flags &= cpu_to_le32(~(SLOT_FLAG | EP0_FLAG)); ++ ++ /* Don't issue the command if there's no endpoints to update. */ ++ if (ctrl_ctx->add_flags == cpu_to_le32(SLOT_FLAG) && ++ ctrl_ctx->drop_flags == 0) ++ return 0; ++ + xhci_dbg(xhci, "New Input Control Context:\n"); + slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx); + xhci_dbg_ctx(xhci, virt_dev->in_ctx, +diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h +index d8bbf5c..49ce76c 100644 +--- a/drivers/usb/host/xhci.h ++++ b/drivers/usb/host/xhci.h +@@ -1311,6 +1311,7 @@ struct xhci_hcd { + #define XHCI_EP_LIMIT_QUIRK (1 << 5) + #define XHCI_BROKEN_MSI (1 << 6) + #define XHCI_RESET_ON_RESUME (1 << 7) ++#define XHCI_AMD_0x96_HOST (1 << 9) + unsigned int num_active_eps; + unsigned int limit_active_eps; + /* There are two roothubs to keep track of bus suspend info for */ +@@ -1565,6 +1566,8 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci, unsigned int slot_id, + unsigned int ep_index, unsigned int stream_id); + + /* xHCI roothub code */ ++void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array, ++ int port_id, u32 port_bit); + int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, + char *buf, u16 wLength); + int xhci_hub_status_data(struct usb_hcd *hcd, char *buf); +diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c +index a09dbd2..a04b2ff 100644 +--- a/drivers/usb/mon/mon_bin.c ++++ b/drivers/usb/mon/mon_bin.c +@@ -1101,7 +1101,7 @@ static long mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg + nevents = mon_bin_queued(rp); + + sp = (struct mon_bin_stats __user *)arg; +- if (put_user(rp->cnt_lost, &sp->dropped)) ++ if (put_user(ndropped, &sp->dropped)) + return -EFAULT; + if (put_user(nevents, &sp->queued)) + return -EFAULT; +diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c +index f968a3d..1b51d43 100644 +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -156,6 +156,7 @@ static struct ftdi_sio_quirk ftdi_8u2232c_quirk = { + * /sys/bus/usb/ftdi_sio/new_id, then send patch/report! + */ + static struct usb_device_id id_table_combined [] = { ++ { USB_DEVICE(FTDI_VID, FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, +@@ -206,6 +207,8 @@ static struct usb_device_id id_table_combined [] = { + { USB_DEVICE(FTDI_VID, FTDI_XF_640_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_XF_642_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_DSS20_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_URBAN_0_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_URBAN_1_PID) }, + { USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_VNHCPCUSB_D_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_MTXORB_0_PID) }, +@@ -744,6 +747,8 @@ static struct usb_device_id id_table_combined [] = { + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, LMI_LM3S_ICDI_BOARD_PID), ++ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_TURTELIZER_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, +diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h +index 19156d1..571fa96 100644 +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -54,6 +54,7 @@ + /* FTDI 2332C Dual channel device, side A=245 FIFO (JTAG), Side B=RS232 UART */ + #define LMI_LM3S_DEVEL_BOARD_PID 0xbcd8 + #define LMI_LM3S_EVAL_BOARD_PID 0xbcd9 ++#define LMI_LM3S_ICDI_BOARD_PID 0xbcda + + #define FTDI_TURTELIZER_PID 0xBDC8 /* JTAG/RS-232 adapter by egnite GmbH */ + +@@ -420,9 +421,11 @@ + #define PROTEGO_SPECIAL_4 0xFC73 /* special/unknown device */ + + /* +- * DSS-20 Sync Station for Sony Ericsson P800 ++ * Sony Ericsson product ids + */ +-#define FTDI_DSS20_PID 0xFC82 ++#define FTDI_DSS20_PID 0xFC82 /* DSS-20 Sync Station for Sony Ericsson P800 */ ++#define FTDI_URBAN_0_PID 0xFC8A /* Sony Ericsson Urban, uart #0 */ ++#define FTDI_URBAN_1_PID 0xFC8B /* Sony Ericsson Urban, uart #1 */ + + /* www.irtrans.de device */ + #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */ +@@ -1159,4 +1162,8 @@ + /* USB-Nano-485*/ + #define FTDI_CTI_NANO_PID 0xF60B + +- ++/* ++ * ZeitControl cardsystems GmbH rfid-readers http://zeitconrol.de ++ */ ++/* TagTracer MIFARE*/ ++#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index fe22e90..89ae1f6 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -475,31 +475,54 @@ enum option_blacklist_reason { + OPTION_BLACKLIST_RESERVED_IF = 2 + }; + ++#define MAX_BL_NUM 8 + struct option_blacklist_info { +- const u32 infolen; /* number of interface numbers on blacklist */ +- const u8 *ifaceinfo; /* pointer to the array holding the numbers */ +- enum option_blacklist_reason reason; ++ /* bitfield of interface numbers for OPTION_BLACKLIST_SENDSETUP */ ++ const unsigned long sendsetup; ++ /* bitfield of interface numbers for OPTION_BLACKLIST_RESERVED_IF */ ++ const unsigned long reserved; + }; + +-static const u8 four_g_w14_no_sendsetup[] = { 0, 1 }; + static const struct option_blacklist_info four_g_w14_blacklist = { +- .infolen = ARRAY_SIZE(four_g_w14_no_sendsetup), +- .ifaceinfo = four_g_w14_no_sendsetup, +- .reason = OPTION_BLACKLIST_SENDSETUP ++ .sendsetup = BIT(0) | BIT(1), + }; + +-static const u8 alcatel_x200_no_sendsetup[] = { 0, 1 }; + static const struct option_blacklist_info alcatel_x200_blacklist = { +- .infolen = ARRAY_SIZE(alcatel_x200_no_sendsetup), +- .ifaceinfo = alcatel_x200_no_sendsetup, +- .reason = OPTION_BLACKLIST_SENDSETUP ++ .sendsetup = BIT(0) | BIT(1), ++}; ++ ++static const struct option_blacklist_info zte_0037_blacklist = { ++ .sendsetup = BIT(0) | BIT(1), + }; + +-static const u8 zte_k3765_z_no_sendsetup[] = { 0, 1, 2 }; + static const struct option_blacklist_info zte_k3765_z_blacklist = { +- .infolen = ARRAY_SIZE(zte_k3765_z_no_sendsetup), +- .ifaceinfo = zte_k3765_z_no_sendsetup, +- .reason = OPTION_BLACKLIST_SENDSETUP ++ .sendsetup = BIT(0) | BIT(1) | BIT(2), ++ .reserved = BIT(4), ++}; ++ ++static const struct option_blacklist_info huawei_cdc12_blacklist = { ++ .reserved = BIT(1) | BIT(2), ++}; ++ ++static const struct option_blacklist_info net_intf1_blacklist = { ++ .reserved = BIT(1), ++}; ++ ++static const struct option_blacklist_info net_intf3_blacklist = { ++ .reserved = BIT(3), ++}; ++ ++static const struct option_blacklist_info net_intf4_blacklist = { ++ .reserved = BIT(4), ++}; ++ ++static const struct option_blacklist_info net_intf5_blacklist = { ++ .reserved = BIT(5), ++}; ++ ++static const struct option_blacklist_info zte_mf626_blacklist = { ++ .sendsetup = BIT(0) | BIT(1), ++ .reserved = BIT(4), + }; + + static const struct usb_device_id option_ids[] = { +@@ -599,12 +622,15 @@ static const struct usb_device_id option_ids[] = { + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) }, +@@ -705,7 +731,8 @@ static const struct usb_device_id option_ids[] = { + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) }, +@@ -720,51 +747,62 @@ static const struct usb_device_id option_ids[] = { + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000f, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, + /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) }, */ + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, +- 0xff, 0xff), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist }, ++ 0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_mf626_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&zte_0037_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0053, 0xff, 0xff, 0xff) }, */ + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) }, +@@ -779,11 +817,13 @@ static const struct usb_device_id option_ids[] = { + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0083, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0087, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff) }, +@@ -1214,10 +1254,35 @@ static void __exit option_exit(void) + module_init(option_init); + module_exit(option_exit); + ++static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason, ++ const struct option_blacklist_info *blacklist) ++{ ++ unsigned long num; ++ const unsigned long *intf_list; ++ ++ if (blacklist) { ++ if (reason == OPTION_BLACKLIST_SENDSETUP) ++ intf_list = &blacklist->sendsetup; ++ else if (reason == OPTION_BLACKLIST_RESERVED_IF) ++ intf_list = &blacklist->reserved; ++ else { ++ BUG_ON(reason); ++ return false; ++ } ++ ++ for_each_set_bit(num, intf_list, MAX_BL_NUM + 1) { ++ if (num == ifnum) ++ return true; ++ } ++ } ++ return false; ++} ++ + static int option_probe(struct usb_serial *serial, + const struct usb_device_id *id) + { + struct usb_wwan_intf_private *data; ++ + /* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */ + if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID && + serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 && +@@ -1230,14 +1295,14 @@ static int option_probe(struct usb_serial *serial, + serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff) + return -ENODEV; + +- /* Don't bind network interfaces on Huawei K3765, K4505 & K4605 */ +- if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID && +- (serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 || +- serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505 || +- serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4605) && +- (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1 || +- serial->interface->cur_altsetting->desc.bInterfaceNumber == 2)) +- return -ENODEV; ++ /* Don't bind reserved interfaces (like network ones) which often have ++ * the same class/subclass/protocol as the serial interfaces. Look at ++ * the Windows driver .INF files for reserved interface numbers. ++ */ ++ if (is_blacklisted( ++ serial->interface->cur_altsetting->desc.bInterfaceNumber, ++ OPTION_BLACKLIST_RESERVED_IF, ++ (const struct option_blacklist_info *) id->driver_info)) + + /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */ + if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID && +@@ -1246,7 +1311,6 @@ static int option_probe(struct usb_serial *serial, + return -ENODEV; + + data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); +- + if (!data) + return -ENOMEM; + data->send_setup = option_send_setup; +@@ -1255,23 +1319,6 @@ static int option_probe(struct usb_serial *serial, + return 0; + } + +-static enum option_blacklist_reason is_blacklisted(const u8 ifnum, +- const struct option_blacklist_info *blacklist) +-{ +- const u8 *info; +- int i; +- +- if (blacklist) { +- info = blacklist->ifaceinfo; +- +- for (i = 0; i < blacklist->infolen; i++) { +- if (info[i] == ifnum) +- return blacklist->reason; +- } +- } +- return OPTION_BLACKLIST_NONE; +-} +- + static void option_instat_callback(struct urb *urb) + { + int err; +@@ -1343,9 +1390,8 @@ static int option_send_setup(struct usb_serial_port *port) + int val = 0; + dbg("%s", __func__); + +- if (is_blacklisted(ifNum, +- (struct option_blacklist_info *) intfdata->private) +- == OPTION_BLACKLIST_SENDSETUP) { ++ if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP, ++ (struct option_blacklist_info *) intfdata->private)) { + dbg("No send_setup on blacklisted interface #%d\n", ifNum); + return -EIO; + } +diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c +index 1d33260..614fabc 100644 +--- a/drivers/usb/serial/pl2303.c ++++ b/drivers/usb/serial/pl2303.c +@@ -92,6 +92,7 @@ static const struct usb_device_id id_table[] = { + { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) }, + { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) }, + { USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) }, ++ { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, + { } /* Terminating entry */ + }; + +diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h +index ca0d237..3d10d7f 100644 +--- a/drivers/usb/serial/pl2303.h ++++ b/drivers/usb/serial/pl2303.h +@@ -148,3 +148,8 @@ + /* WinChipHead USB->RS 232 adapter */ + #define WINCHIPHEAD_VENDOR_ID 0x4348 + #define WINCHIPHEAD_USBSER_PRODUCT_ID 0x5523 ++ ++/* SMART USB Serial Adapter */ ++#define SMART_VENDOR_ID 0x0b8c ++#define SMART_PRODUCT_ID 0x2303 ++ +diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c +index 27f9ae4..b9bb247 100644 +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -28,6 +28,7 @@ static const struct usb_device_id id_table[] = { + {USB_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ + {USB_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */ + {USB_DEVICE(0x03f0, 0x201d)}, /* HP un2400 Gobi QDL Device */ ++ {USB_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */ + {USB_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */ + {USB_DEVICE(0x04da, 0x250c)}, /* Panasonic Gobi QDL device */ + {USB_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */ +@@ -79,10 +80,12 @@ static const struct usb_device_id id_table[] = { + {USB_DEVICE(0x1199, 0x9008)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9009)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x900a)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ ++ {USB_DEVICE(0x1199, 0x9011)}, /* Sierra Wireless Gobi 2000 Modem device (MC8305) */ + {USB_DEVICE(0x16d8, 0x8001)}, /* CMDTech Gobi 2000 QDL device (VU922) */ + {USB_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */ + {USB_DEVICE(0x05c6, 0x9204)}, /* Gobi 2000 QDL device */ + {USB_DEVICE(0x05c6, 0x9205)}, /* Gobi 2000 Modem device */ ++ {USB_DEVICE(0x1199, 0x9013)}, /* Sierra Wireless Gobi 3000 Modem device (MC8355) */ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, id_table); +diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c +index e8ae21b..ff32390 100644 +--- a/drivers/usb/storage/transport.c ++++ b/drivers/usb/storage/transport.c +@@ -691,6 +691,9 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) + int temp_result; + struct scsi_eh_save ses; + int sense_size = US_SENSE_SIZE; ++ struct scsi_sense_hdr sshdr; ++ const u8 *scdd; ++ u8 fm_ili; + + /* device supports and needs bigger sense buffer */ + if (us->fflags & US_FL_SANE_SENSE) +@@ -774,32 +777,30 @@ Retry_Sense: + srb->sense_buffer[7] = (US_SENSE_SIZE - 8); + } + ++ scsi_normalize_sense(srb->sense_buffer, SCSI_SENSE_BUFFERSIZE, ++ &sshdr); ++ + US_DEBUGP("-- Result from auto-sense is %d\n", temp_result); + US_DEBUGP("-- code: 0x%x, key: 0x%x, ASC: 0x%x, ASCQ: 0x%x\n", +- srb->sense_buffer[0], +- srb->sense_buffer[2] & 0xf, +- srb->sense_buffer[12], +- srb->sense_buffer[13]); ++ sshdr.response_code, sshdr.sense_key, ++ sshdr.asc, sshdr.ascq); + #ifdef CONFIG_USB_STORAGE_DEBUG +- usb_stor_show_sense( +- srb->sense_buffer[2] & 0xf, +- srb->sense_buffer[12], +- srb->sense_buffer[13]); ++ usb_stor_show_sense(sshdr.sense_key, sshdr.asc, sshdr.ascq); + #endif + + /* set the result so the higher layers expect this data */ + srb->result = SAM_STAT_CHECK_CONDITION; + ++ scdd = scsi_sense_desc_find(srb->sense_buffer, ++ SCSI_SENSE_BUFFERSIZE, 4); ++ fm_ili = (scdd ? scdd[3] : srb->sense_buffer[2]) & 0xA0; ++ + /* We often get empty sense data. This could indicate that + * everything worked or that there was an unspecified + * problem. We have to decide which. + */ +- if ( /* Filemark 0, ignore EOM, ILI 0, no sense */ +- (srb->sense_buffer[2] & 0xaf) == 0 && +- /* No ASC or ASCQ */ +- srb->sense_buffer[12] == 0 && +- srb->sense_buffer[13] == 0) { +- ++ if (sshdr.sense_key == 0 && sshdr.asc == 0 && sshdr.ascq == 0 && ++ fm_ili == 0) { + /* If things are really okay, then let's show that. + * Zero out the sense buffer so the higher layers + * won't realize we did an unsolicited auto-sense. +@@ -814,7 +815,10 @@ Retry_Sense: + */ + } else { + srb->result = DID_ERROR << 16; +- srb->sense_buffer[2] = HARDWARE_ERROR; ++ if ((sshdr.response_code & 0x72) == 0x72) ++ srb->sense_buffer[1] = HARDWARE_ERROR; ++ else ++ srb->sense_buffer[2] = HARDWARE_ERROR; + } + } + } +diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c +index 0ca0958..c325e69 100644 +--- a/drivers/usb/storage/usb.c ++++ b/drivers/usb/storage/usb.c +@@ -831,12 +831,22 @@ static int usb_stor_scan_thread(void * __us) + + dev_dbg(dev, "device found\n"); + +- set_freezable(); +- /* Wait for the timeout to expire or for a disconnect */ ++ set_freezable_with_signal(); ++ /* ++ * Wait for the timeout to expire or for a disconnect ++ * ++ * We can't freeze in this thread or we risk causing khubd to ++ * fail to freeze, but we can't be non-freezable either. Nor can ++ * khubd freeze while waiting for scanning to complete as it may ++ * hold the device lock, causing a hang when suspending devices. ++ * So we request a fake signal when freezing and use ++ * interruptible sleep to kick us out of our wait early when ++ * freezing happens. ++ */ + if (delay_use > 0) { + dev_dbg(dev, "waiting for device to settle " + "before scanning\n"); +- wait_event_freezable_timeout(us->delay_wait, ++ wait_event_interruptible_timeout(us->delay_wait, + test_bit(US_FLIDX_DONT_SCAN, &us->dflags), + delay_use * HZ); + } +diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c +index caaa27d..cb09aa1f 100644 +--- a/drivers/video/carminefb.c ++++ b/drivers/video/carminefb.c +@@ -32,11 +32,11 @@ + #define CARMINEFB_DEFAULT_VIDEO_MODE 1 + + static unsigned int fb_mode = CARMINEFB_DEFAULT_VIDEO_MODE; +-module_param(fb_mode, uint, 444); ++module_param(fb_mode, uint, 0444); + MODULE_PARM_DESC(fb_mode, "Initial video mode as integer."); + + static char *fb_mode_str; +-module_param(fb_mode_str, charp, 444); ++module_param(fb_mode_str, charp, 0444); + MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters."); + + /* +@@ -46,7 +46,7 @@ MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters."); + * 0b010 Display 1 + */ + static int fb_displays = CARMINE_USE_DISPLAY0 | CARMINE_USE_DISPLAY1; +-module_param(fb_displays, int, 444); ++module_param(fb_displays, int, 0444); + MODULE_PARM_DESC(fb_displays, "Bit mode, which displays are used"); + + struct carmine_hw { +diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c +index 5aac00e..ad93629 100644 +--- a/drivers/video/fbmem.c ++++ b/drivers/video/fbmem.c +@@ -1738,8 +1738,6 @@ void fb_set_suspend(struct fb_info *info, int state) + { + struct fb_event event; + +- if (!lock_fb_info(info)) +- return; + event.info = info; + if (state) { + fb_notifier_call_chain(FB_EVENT_SUSPEND, &event); +@@ -1748,7 +1746,6 @@ void fb_set_suspend(struct fb_info *info, int state) + info->state = FBINFO_STATE_RUNNING; + fb_notifier_call_chain(FB_EVENT_RESUME, &event); + } +- unlock_fb_info(info); + } + + /** +diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c +index 04251ce..67afa9c 100644 +--- a/drivers/video/fbsysfs.c ++++ b/drivers/video/fbsysfs.c +@@ -399,9 +399,12 @@ static ssize_t store_fbstate(struct device *device, + + state = simple_strtoul(buf, &last, 0); + ++ if (!lock_fb_info(fb_info)) ++ return -ENODEV; + console_lock(); + fb_set_suspend(fb_info, (int)state); + console_unlock(); ++ unlock_fb_info(fb_info); + + return count; + } +diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c +index 7d54e2c..647ba98 100644 +--- a/drivers/video/sh_mobile_hdmi.c ++++ b/drivers/video/sh_mobile_hdmi.c +@@ -1111,6 +1111,7 @@ static long sh_hdmi_clk_configure(struct sh_hdmi *hdmi, unsigned long hdmi_rate, + static void sh_hdmi_edid_work_fn(struct work_struct *work) + { + struct sh_hdmi *hdmi = container_of(work, struct sh_hdmi, edid_work.work); ++ struct fb_info *info; + struct sh_mobile_hdmi_info *pdata = hdmi->dev->platform_data; + struct sh_mobile_lcdc_chan *ch; + int ret; +@@ -1123,8 +1124,9 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) + + mutex_lock(&hdmi->mutex); + ++ info = hdmi->info; ++ + if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) { +- struct fb_info *info = hdmi->info; + unsigned long parent_rate = 0, hdmi_rate; + + ret = sh_hdmi_read_edid(hdmi, &hdmi_rate, &parent_rate); +@@ -1148,42 +1150,45 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) + + ch = info->par; + +- console_lock(); ++ if (lock_fb_info(info)) { ++ console_lock(); + +- /* HDMI plug in */ +- if (!sh_hdmi_must_reconfigure(hdmi) && +- info->state == FBINFO_STATE_RUNNING) { +- /* +- * First activation with the default monitor - just turn +- * on, if we run a resume here, the logo disappears +- */ +- if (lock_fb_info(info)) { ++ /* HDMI plug in */ ++ if (!sh_hdmi_must_reconfigure(hdmi) && ++ info->state == FBINFO_STATE_RUNNING) { ++ /* ++ * First activation with the default monitor - just turn ++ * on, if we run a resume here, the logo disappears ++ */ + info->var.width = hdmi->var.width; + info->var.height = hdmi->var.height; + sh_hdmi_display_on(hdmi, info); +- unlock_fb_info(info); ++ } else { ++ /* New monitor or have to wake up */ ++ fb_set_suspend(info, 0); + } +- } else { +- /* New monitor or have to wake up */ +- fb_set_suspend(info, 0); +- } + +- console_unlock(); ++ console_unlock(); ++ unlock_fb_info(info); ++ } + } else { + ret = 0; +- if (!hdmi->info) ++ if (!info) + goto out; + + hdmi->monspec.modedb_len = 0; + fb_destroy_modedb(hdmi->monspec.modedb); + hdmi->monspec.modedb = NULL; + +- console_lock(); ++ if (lock_fb_info(info)) { ++ console_lock(); + +- /* HDMI disconnect */ +- fb_set_suspend(hdmi->info, 1); ++ /* HDMI disconnect */ ++ fb_set_suspend(info, 1); + +- console_unlock(); ++ console_unlock(); ++ unlock_fb_info(info); ++ } + } + + out: +diff --git a/drivers/video/via/via_modesetting.h b/drivers/video/via/via_modesetting.h +index ae35cfd..0138845 100644 +--- a/drivers/video/via/via_modesetting.h ++++ b/drivers/video/via/via_modesetting.h +@@ -28,6 +28,11 @@ + + #include <linux/types.h> + ++ ++#define VIA_PITCH_SIZE (1<<3) ++#define VIA_PITCH_MAX 0x3FF8 ++ ++ + void via_set_primary_address(u32 addr); + void via_set_secondary_address(u32 addr); + void via_set_primary_pitch(u32 pitch); +diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c +index cf43c80..dd1276e 100644 +--- a/drivers/video/via/viafbdev.c ++++ b/drivers/video/via/viafbdev.c +@@ -151,7 +151,8 @@ static void viafb_update_fix(struct fb_info *info) + + info->fix.visual = + bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; +- info->fix.line_length = (info->var.xres_virtual * bpp / 8 + 7) & ~7; ++ info->fix.line_length = ALIGN(info->var.xres_virtual * bpp / 8, ++ VIA_PITCH_SIZE); + } + + static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix, +@@ -238,8 +239,12 @@ static int viafb_check_var(struct fb_var_screeninfo *var, + depth = 24; + + viafb_fill_var_color_info(var, depth); +- line = (var->xres_virtual * var->bits_per_pixel / 8 + 7) & ~7; +- if (line * var->yres_virtual > ppar->memsize) ++ if (var->xres_virtual < var->xres) ++ var->xres_virtual = var->xres; ++ ++ line = ALIGN(var->xres_virtual * var->bits_per_pixel / 8, ++ VIA_PITCH_SIZE); ++ if (line > VIA_PITCH_MAX || line * var->yres_virtual > ppar->memsize) + return -EINVAL; + + /* Based on var passed in to calculate the refresh, +@@ -348,8 +353,9 @@ static int viafb_pan_display(struct fb_var_screeninfo *var, + struct fb_info *info) + { + struct viafb_par *viapar = info->par; +- u32 vram_addr = (var->yoffset * var->xres_virtual + var->xoffset) +- * (var->bits_per_pixel / 8) + viapar->vram_addr; ++ u32 vram_addr = viapar->vram_addr ++ + var->yoffset * info->fix.line_length ++ + var->xoffset * info->var.bits_per_pixel / 8; + + DEBUG_MSG(KERN_DEBUG "viafb_pan_display, address = %d\n", vram_addr); + if (!viafb_dual_fb) { +diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c +index 274c8f3..505b17d 100644 +--- a/drivers/w1/slaves/w1_ds2780.c ++++ b/drivers/w1/slaves/w1_ds2780.c +@@ -26,20 +26,14 @@ + #include "../w1_family.h" + #include "w1_ds2780.h" + +-int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count, +- int io) ++static int w1_ds2780_do_io(struct device *dev, char *buf, int addr, ++ size_t count, int io) + { + struct w1_slave *sl = container_of(dev, struct w1_slave, dev); + +- if (!dev) +- return -ENODEV; ++ if (addr > DS2780_DATA_SIZE || addr < 0) ++ return 0; + +- mutex_lock(&sl->master->mutex); +- +- if (addr > DS2780_DATA_SIZE || addr < 0) { +- count = 0; +- goto out; +- } + count = min_t(int, count, DS2780_DATA_SIZE - addr); + + if (w1_reset_select_slave(sl) == 0) { +@@ -47,7 +41,6 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count, + w1_write_8(sl->master, W1_DS2780_WRITE_DATA); + w1_write_8(sl->master, addr); + w1_write_block(sl->master, buf, count); +- /* XXX w1_write_block returns void, not n_written */ + } else { + w1_write_8(sl->master, W1_DS2780_READ_DATA); + w1_write_8(sl->master, addr); +@@ -55,13 +48,42 @@ int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count, + } + } + +-out: ++ return count; ++} ++ ++int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count, ++ int io) ++{ ++ struct w1_slave *sl = container_of(dev, struct w1_slave, dev); ++ int ret; ++ ++ if (!dev) ++ return -ENODEV; ++ ++ mutex_lock(&sl->master->mutex); ++ ++ ret = w1_ds2780_do_io(dev, buf, addr, count, io); ++ + mutex_unlock(&sl->master->mutex); + +- return count; ++ return ret; + } + EXPORT_SYMBOL(w1_ds2780_io); + ++int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr, size_t count, ++ int io) ++{ ++ int ret; ++ ++ if (!dev) ++ return -ENODEV; ++ ++ ret = w1_ds2780_do_io(dev, buf, addr, count, io); ++ ++ return ret; ++} ++EXPORT_SYMBOL(w1_ds2780_io_nolock); ++ + int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd) + { + struct w1_slave *sl = container_of(dev, struct w1_slave, dev); +diff --git a/drivers/w1/slaves/w1_ds2780.h b/drivers/w1/slaves/w1_ds2780.h +index a1fba79..7373793 100644 +--- a/drivers/w1/slaves/w1_ds2780.h ++++ b/drivers/w1/slaves/w1_ds2780.h +@@ -124,6 +124,8 @@ + + extern int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count, + int io); ++extern int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr, ++ size_t count, int io); + extern int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd); + + #endif /* !_W1_DS2780_H */ +diff --git a/drivers/xen/events.c b/drivers/xen/events.c +index 30df85d..a5493f8 100644 +--- a/drivers/xen/events.c ++++ b/drivers/xen/events.c +@@ -1026,7 +1026,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, + if (irq < 0) + return irq; + +- irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME; ++ irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME; + retval = request_irq(irq, handler, irqflags, devname, dev_id); + if (retval != 0) { + unbind_from_irq(irq); +diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c +index 6e8c15a..84f317e 100644 +--- a/drivers/xen/swiotlb-xen.c ++++ b/drivers/xen/swiotlb-xen.c +@@ -278,9 +278,10 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, + /* + * Ensure that the address returned is DMA'ble + */ +- if (!dma_capable(dev, dev_addr, size)) +- panic("map_single: bounce buffer is not DMA'ble"); +- ++ if (!dma_capable(dev, dev_addr, size)) { ++ swiotlb_tbl_unmap_single(dev, map, size, dir); ++ dev_addr = 0; ++ } + return dev_addr; + } + EXPORT_SYMBOL_GPL(xen_swiotlb_map_page); +diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c +index 303983f..9ba2ac7 100644 +--- a/fs/binfmt_elf.c ++++ b/fs/binfmt_elf.c +@@ -796,7 +796,16 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) + * might try to exec. This is because the brk will + * follow the loader, and is not movable. */ + #if defined(CONFIG_X86) || defined(CONFIG_ARM) +- load_bias = 0; ++ /* Memory randomization might have been switched off ++ * in runtime via sysctl. ++ * If that is the case, retain the original non-zero ++ * load_bias value in order to establish proper ++ * non-randomized mappings. ++ */ ++ if (current->flags & PF_RANDOMIZE) ++ load_bias = 0; ++ else ++ load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); + #else + load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); + #endif +diff --git a/fs/block_dev.c b/fs/block_dev.c +index 194cf66..34503ba 100644 +--- a/fs/block_dev.c ++++ b/fs/block_dev.c +@@ -1075,6 +1075,7 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part); + static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) + { + struct gendisk *disk; ++ struct module *owner; + int ret; + int partno; + int perm = 0; +@@ -1100,6 +1101,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) + disk = get_gendisk(bdev->bd_dev, &partno); + if (!disk) + goto out; ++ owner = disk->fops->owner; + + disk_block_events(disk); + mutex_lock_nested(&bdev->bd_mutex, for_part); +@@ -1127,8 +1129,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) + bdev->bd_disk = NULL; + mutex_unlock(&bdev->bd_mutex); + disk_unblock_events(disk); +- module_put(disk->fops->owner); + put_disk(disk); ++ module_put(owner); + goto restart; + } + } +@@ -1184,8 +1186,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) + goto out_unlock_bdev; + } + /* only one opener holds refs to the module and disk */ +- module_put(disk->fops->owner); + put_disk(disk); ++ module_put(owner); + } + bdev->bd_openers++; + if (for_part) +@@ -1205,8 +1207,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) + out_unlock_bdev: + mutex_unlock(&bdev->bd_mutex); + disk_unblock_events(disk); +- module_put(disk->fops->owner); + put_disk(disk); ++ module_put(owner); + out: + bdput(bdev); + +@@ -1432,14 +1434,15 @@ static int __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) + if (!bdev->bd_openers) { + struct module *owner = disk->fops->owner; + +- put_disk(disk); +- module_put(owner); + disk_put_part(bdev->bd_part); + bdev->bd_part = NULL; + bdev->bd_disk = NULL; + if (bdev != bdev->bd_contains) + victim = bdev->bd_contains; + bdev->bd_contains = NULL; ++ ++ put_disk(disk); ++ module_put(owner); + } + mutex_unlock(&bdev->bd_mutex); + bdput(bdev); +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index 2451627..cb85825 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -2767,10 +2767,10 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info, + + /* + * When the server doesn't allow large posix writes, only allow a wsize of +- * 128k minus the size of the WRITE_AND_X header. That allows for a write up ++ * 2^17-1 minus the size of the WRITE_AND_X header. That allows for a write up + * to the maximum size described by RFC1002. + */ +-#define CIFS_MAX_RFC1002_WSIZE (128 * 1024 - sizeof(WRITE_REQ) + 4) ++#define CIFS_MAX_RFC1002_WSIZE ((1<<17) - 1 - sizeof(WRITE_REQ) + 4) + + /* + * The default wsize is 1M. find_get_pages seems to return a maximum of 256 +diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c +index a7b2dcd..745e5cd 100644 +--- a/fs/cifs/inode.c ++++ b/fs/cifs/inode.c +@@ -562,7 +562,16 @@ int cifs_get_file_info(struct file *filp) + + xid = GetXid(); + rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data); +- if (rc == -EOPNOTSUPP || rc == -EINVAL) { ++ switch (rc) { ++ case 0: ++ cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false); ++ break; ++ case -EREMOTE: ++ cifs_create_dfs_fattr(&fattr, inode->i_sb); ++ rc = 0; ++ break; ++ case -EOPNOTSUPP: ++ case -EINVAL: + /* + * FIXME: legacy server -- fall back to path-based call? + * for now, just skip revalidating and mark inode for +@@ -570,18 +579,14 @@ int cifs_get_file_info(struct file *filp) + */ + rc = 0; + CIFS_I(inode)->time = 0; ++ default: + goto cgfi_exit; +- } else if (rc == -EREMOTE) { +- cifs_create_dfs_fattr(&fattr, inode->i_sb); +- rc = 0; +- } else if (rc) +- goto cgfi_exit; ++ } + + /* + * don't bother with SFU junk here -- just mark inode as needing + * revalidation. + */ +- cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false); + fattr.cf_uniqueid = CIFS_I(inode)->uniqueid; + fattr.cf_flags |= CIFS_FATTR_NEED_REVAL; + cifs_fattr_to_inode(inode, &fattr); +diff --git a/fs/eventpoll.c b/fs/eventpoll.c +index f9cfd16..2acaf60 100644 +--- a/fs/eventpoll.c ++++ b/fs/eventpoll.c +@@ -70,6 +70,15 @@ + * simultaneous inserts (A into B and B into A) from racing and + * constructing a cycle without either insert observing that it is + * going to. ++ * It is necessary to acquire multiple "ep->mtx"es at once in the ++ * case when one epoll fd is added to another. In this case, we ++ * always acquire the locks in the order of nesting (i.e. after ++ * epoll_ctl(e1, EPOLL_CTL_ADD, e2), e1->mtx will always be acquired ++ * before e2->mtx). Since we disallow cycles of epoll file ++ * descriptors, this ensures that the mutexes are well-ordered. In ++ * order to communicate this nesting to lockdep, when walking a tree ++ * of epoll file descriptors, we use the current recursion depth as ++ * the lockdep subkey. + * It is possible to drop the "ep->mtx" and to use the global + * mutex "epmutex" (together with "ep->lock") to have it working, + * but having "ep->mtx" will make the interface more scalable. +@@ -464,13 +473,15 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi) + * @ep: Pointer to the epoll private data structure. + * @sproc: Pointer to the scan callback. + * @priv: Private opaque data passed to the @sproc callback. ++ * @depth: The current depth of recursive f_op->poll calls. + * + * Returns: The same integer error code returned by the @sproc callback. + */ + static int ep_scan_ready_list(struct eventpoll *ep, + int (*sproc)(struct eventpoll *, + struct list_head *, void *), +- void *priv) ++ void *priv, ++ int depth) + { + int error, pwake = 0; + unsigned long flags; +@@ -481,7 +492,7 @@ static int ep_scan_ready_list(struct eventpoll *ep, + * We need to lock this because we could be hit by + * eventpoll_release_file() and epoll_ctl(). + */ +- mutex_lock(&ep->mtx); ++ mutex_lock_nested(&ep->mtx, depth); + + /* + * Steal the ready list, and re-init the original one to the +@@ -670,7 +681,7 @@ static int ep_read_events_proc(struct eventpoll *ep, struct list_head *head, + + static int ep_poll_readyevents_proc(void *priv, void *cookie, int call_nests) + { +- return ep_scan_ready_list(priv, ep_read_events_proc, NULL); ++ return ep_scan_ready_list(priv, ep_read_events_proc, NULL, call_nests + 1); + } + + static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait) +@@ -737,7 +748,7 @@ void eventpoll_release_file(struct file *file) + + ep = epi->ep; + list_del_init(&epi->fllink); +- mutex_lock(&ep->mtx); ++ mutex_lock_nested(&ep->mtx, 0); + ep_remove(ep, epi); + mutex_unlock(&ep->mtx); + } +@@ -1134,7 +1145,7 @@ static int ep_send_events(struct eventpoll *ep, + esed.maxevents = maxevents; + esed.events = events; + +- return ep_scan_ready_list(ep, ep_send_events_proc, &esed); ++ return ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0); + } + + static inline struct timespec ep_set_mstimeout(long ms) +@@ -1267,7 +1278,7 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests) + struct rb_node *rbp; + struct epitem *epi; + +- mutex_lock(&ep->mtx); ++ mutex_lock_nested(&ep->mtx, call_nests + 1); + for (rbp = rb_first(&ep->rbr); rbp; rbp = rb_next(rbp)) { + epi = rb_entry(rbp, struct epitem, rbn); + if (unlikely(is_file_epoll(epi->ffd.file))) { +@@ -1409,7 +1420,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, + } + + +- mutex_lock(&ep->mtx); ++ mutex_lock_nested(&ep->mtx, 0); + + /* + * Try to lookup the file inside our RB tree, Since we grabbed "mtx" +diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h +index 354619a..1a34c1c 100644 +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -175,6 +175,7 @@ struct mpage_da_data { + */ + #define EXT4_IO_END_UNWRITTEN 0x0001 + #define EXT4_IO_END_ERROR 0x0002 ++#define EXT4_IO_END_QUEUED 0x0004 + + struct ext4_io_page { + struct page *p_page; +@@ -357,8 +358,7 @@ struct flex_groups { + + /* Flags that should be inherited by new inodes from their parent. */ + #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\ +- EXT4_SYNC_FL | EXT4_IMMUTABLE_FL | EXT4_APPEND_FL |\ +- EXT4_NODUMP_FL | EXT4_NOATIME_FL |\ ++ EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\ + EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\ + EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL) + +diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c +index c94774c..1265904 100644 +--- a/fs/ext4/inode.c ++++ b/fs/ext4/inode.c +@@ -190,9 +190,6 @@ void ext4_evict_inode(struct inode *inode) + + trace_ext4_evict_inode(inode); + +- mutex_lock(&inode->i_mutex); +- ext4_flush_completed_IO(inode); +- mutex_unlock(&inode->i_mutex); + ext4_ioend_wait(inode); + + if (inode->i_nlink) { +diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c +index 458a394..3d36d5a 100644 +--- a/fs/ext4/namei.c ++++ b/fs/ext4/namei.c +@@ -1589,7 +1589,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry, + dxtrace(dx_show_index("node", frames[1].entries)); + dxtrace(dx_show_index("node", + ((struct dx_node *) bh2->b_data)->entries)); +- err = ext4_handle_dirty_metadata(handle, inode, bh2); ++ err = ext4_handle_dirty_metadata(handle, dir, bh2); + if (err) + goto journal_error; + brelse (bh2); +@@ -1615,7 +1615,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry, + if (err) + goto journal_error; + } +- err = ext4_handle_dirty_metadata(handle, inode, frames[0].bh); ++ err = ext4_handle_dirty_metadata(handle, dir, frames[0].bh); + if (err) { + ext4_std_error(inode->i_sb, err); + goto cleanup; +@@ -1866,7 +1866,7 @@ retry: + ext4_set_de_type(dir->i_sb, de, S_IFDIR); + inode->i_nlink = 2; + BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); +- err = ext4_handle_dirty_metadata(handle, dir, dir_block); ++ err = ext4_handle_dirty_metadata(handle, inode, dir_block); + if (err) + goto out_clear_inode; + err = ext4_mark_inode_dirty(handle, inode); +@@ -2540,7 +2540,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, + PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) = + cpu_to_le32(new_dir->i_ino); + BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata"); +- retval = ext4_handle_dirty_metadata(handle, old_dir, dir_bh); ++ retval = ext4_handle_dirty_metadata(handle, old_inode, dir_bh); + if (retval) { + ext4_std_error(old_dir->i_sb, retval); + goto end_rename; +diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c +index 97e5e98..bd6a85e 100644 +--- a/fs/ext4/page-io.c ++++ b/fs/ext4/page-io.c +@@ -142,7 +142,23 @@ static void ext4_end_io_work(struct work_struct *work) + unsigned long flags; + int ret; + +- mutex_lock(&inode->i_mutex); ++ if (!mutex_trylock(&inode->i_mutex)) { ++ /* ++ * Requeue the work instead of waiting so that the work ++ * items queued after this can be processed. ++ */ ++ queue_work(EXT4_SB(inode->i_sb)->dio_unwritten_wq, &io->work); ++ /* ++ * To prevent the ext4-dio-unwritten thread from keeping ++ * requeueing end_io requests and occupying cpu for too long, ++ * yield the cpu if it sees an end_io request that has already ++ * been requeued. ++ */ ++ if (io->flag & EXT4_IO_END_QUEUED) ++ yield(); ++ io->flag |= EXT4_IO_END_QUEUED; ++ return; ++ } + ret = ext4_end_io_nolock(io); + if (ret < 0) { + mutex_unlock(&inode->i_mutex); +diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c +index c757adc..19fe4e3 100644 +--- a/fs/ext4/xattr.c ++++ b/fs/ext4/xattr.c +@@ -820,8 +820,14 @@ inserted: + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) + goal = goal & EXT4_MAX_BLOCK_FILE_PHYS; + ++ /* ++ * take i_data_sem because we will test ++ * i_delalloc_reserved_flag in ext4_mb_new_blocks ++ */ ++ down_read((&EXT4_I(inode)->i_data_sem)); + block = ext4_new_meta_blocks(handle, inode, goal, 0, + NULL, &error); ++ up_read((&EXT4_I(inode)->i_data_sem)); + if (error) + goto cleanup; + +diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c +index 85c098a..9d71c95 100644 +--- a/fs/hppfs/hppfs.c ++++ b/fs/hppfs/hppfs.c +@@ -16,6 +16,7 @@ + #include <linux/statfs.h> + #include <linux/types.h> + #include <linux/pid_namespace.h> ++#include <linux/namei.h> + #include <asm/uaccess.h> + #include "os.h" + +diff --git a/fs/namei.c b/fs/namei.c +index b456c7a..f7593c0 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -136,7 +136,7 @@ static int do_getname(const char __user *filename, char *page) + return retval; + } + +-static char *getname_flags(const char __user * filename, int flags) ++static char *getname_flags(const char __user *filename, int flags, int *empty) + { + char *tmp, *result; + +@@ -147,6 +147,8 @@ static char *getname_flags(const char __user * filename, int flags) + + result = tmp; + if (retval < 0) { ++ if (retval == -ENOENT && empty) ++ *empty = 1; + if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) { + __putname(tmp); + result = ERR_PTR(retval); +@@ -159,7 +161,7 @@ static char *getname_flags(const char __user * filename, int flags) + + char *getname(const char __user * filename) + { +- return getname_flags(filename, 0); ++ return getname_flags(filename, 0, 0); + } + + #ifdef CONFIG_AUDITSYSCALL +@@ -779,17 +781,20 @@ static int follow_automount(struct path *path, unsigned flags, + if ((flags & LOOKUP_NO_AUTOMOUNT) && !(flags & LOOKUP_CONTINUE)) + return -EISDIR; /* we actually want to stop here */ + +- /* We want to mount if someone is trying to open/create a file of any +- * type under the mountpoint, wants to traverse through the mountpoint +- * or wants to open the mounted directory. ++ /* We don't want to mount if someone's just doing a stat - ++ * unless they're stat'ing a directory and appended a '/' to ++ * the name. + * +- * We don't want to mount if someone's just doing a stat and they've +- * set AT_SYMLINK_NOFOLLOW - unless they're stat'ing a directory and +- * appended a '/' to the name. ++ * We do, however, want to mount if someone wants to open or ++ * create a file of any type under the mountpoint, wants to ++ * traverse through the mountpoint or wants to open the ++ * mounted directory. Also, autofs may mark negative dentries ++ * as being automount points. These will need the attentions ++ * of the daemon to instantiate them before they can be used. + */ +- if (!(flags & LOOKUP_FOLLOW) && +- !(flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY | +- LOOKUP_OPEN | LOOKUP_CREATE))) ++ if (!(flags & (LOOKUP_CONTINUE | LOOKUP_DIRECTORY | ++ LOOKUP_OPEN | LOOKUP_CREATE | LOOKUP_AUTOMOUNT)) && ++ path->dentry->d_inode) + return -EISDIR; + + current->total_link_count++; +@@ -905,7 +910,7 @@ static int follow_managed(struct path *path, unsigned flags) + mntput(path->mnt); + if (ret == -EISDIR) + ret = 0; +- return ret; ++ return ret < 0 ? ret : need_mntput; + } + + int follow_down_one(struct path *path) +@@ -953,6 +958,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path, + break; + path->mnt = mounted; + path->dentry = mounted->mnt_root; ++ nd->flags |= LOOKUP_JUMPED; + nd->seq = read_seqcount_begin(&path->dentry->d_seq); + /* + * Update the inode too. We don't need to re-check the +@@ -1227,6 +1233,8 @@ retry: + path_put_conditional(path, nd); + return err; + } ++ if (err) ++ nd->flags |= LOOKUP_JUMPED; + *inode = path->dentry->d_inode; + return 0; + } +@@ -1747,11 +1755,11 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) + return __lookup_hash(&this, base, NULL); + } + +-int user_path_at(int dfd, const char __user *name, unsigned flags, +- struct path *path) ++int user_path_at_empty(int dfd, const char __user *name, unsigned flags, ++ struct path *path, int *empty) + { + struct nameidata nd; +- char *tmp = getname_flags(name, flags); ++ char *tmp = getname_flags(name, flags, empty); + int err = PTR_ERR(tmp); + if (!IS_ERR(tmp)) { + +@@ -1765,6 +1773,12 @@ int user_path_at(int dfd, const char __user *name, unsigned flags, + return err; + } + ++int user_path_at(int dfd, const char __user *name, unsigned flags, ++ struct path *path) ++{ ++ return user_path_at_empty(dfd, name, flags, path, 0); ++} ++ + static int user_path_parent(int dfd, const char __user *path, + struct nameidata *nd, char **name) + { +@@ -2107,6 +2121,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path, + } + + /* create side of things */ ++ /* ++ * This will *only* deal with leaving RCU mode - LOOKUP_JUMPED has been ++ * cleared when we got to the last component we are about to look up ++ */ + error = complete_walk(nd); + if (error) + return ERR_PTR(error); +@@ -2175,6 +2193,9 @@ static struct file *do_last(struct nameidata *nd, struct path *path, + if (error < 0) + goto exit_dput; + ++ if (error) ++ nd->flags |= LOOKUP_JUMPED; ++ + error = -ENOENT; + if (!path->dentry->d_inode) + goto exit_dput; +@@ -2184,6 +2205,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path, + + path_to_nameidata(path, nd); + nd->inode = path->dentry->d_inode; ++ /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */ ++ error = complete_walk(nd); ++ if (error) ++ goto exit; + error = -EISDIR; + if (S_ISDIR(nd->inode->i_mode)) + goto exit; +diff --git a/fs/namespace.c b/fs/namespace.c +index fe59bd1..537dd96 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1109,6 +1109,7 @@ static int show_vfsstat(struct seq_file *m, void *v) + + /* device */ + if (mnt->mnt_sb->s_op->show_devname) { ++ seq_puts(m, "device "); + err = mnt->mnt_sb->s_op->show_devname(m, mnt); + } else { + if (mnt->mnt_devname) { +@@ -1757,7 +1758,7 @@ static int do_loopback(struct path *path, char *old_name, + return err; + if (!old_name || !*old_name) + return -EINVAL; +- err = kern_path(old_name, LOOKUP_FOLLOW, &old_path); ++ err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); + if (err) + return err; + +diff --git a/fs/nfs/super.c b/fs/nfs/super.c +index ce40e5c..858d31b 100644 +--- a/fs/nfs/super.c ++++ b/fs/nfs/super.c +@@ -2793,7 +2793,7 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt, + goto out_put_mnt_ns; + + ret = vfs_path_lookup(root_mnt->mnt_root, root_mnt, +- export_path, LOOKUP_FOLLOW, nd); ++ export_path, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, nd); + + nfs_referral_loop_unprotect(); + put_mnt_ns(ns_private); +diff --git a/fs/nfs/write.c b/fs/nfs/write.c +index 7271680..f2f80c0 100644 +--- a/fs/nfs/write.c ++++ b/fs/nfs/write.c +@@ -428,7 +428,6 @@ static void + nfs_mark_request_dirty(struct nfs_page *req) + { + __set_page_dirty_nobuffers(req->wb_page); +- __mark_inode_dirty(req->wb_page->mapping->host, I_DIRTY_DATASYNC); + } + + #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) +@@ -762,6 +761,8 @@ int nfs_updatepage(struct file *file, struct page *page, + status = nfs_writepage_setup(ctx, page, offset, count); + if (status < 0) + nfs_set_pageerror(page); ++ else ++ __set_page_dirty_nobuffers(page); + + dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n", + status, (long long)i_size_read(inode)); +@@ -1525,6 +1526,10 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr + int flags = FLUSH_SYNC; + int ret = 0; + ++ /* no commits means nothing needs to be done */ ++ if (!nfsi->ncommit) ++ return ret; ++ + if (wbc->sync_mode == WB_SYNC_NONE) { + /* Don't commit yet if this is a non-blocking flush and there + * are a lot of outstanding writes for this mapping. +@@ -1659,34 +1664,20 @@ out_error: + int nfs_migrate_page(struct address_space *mapping, struct page *newpage, + struct page *page) + { +- struct nfs_page *req; +- int ret; ++ /* ++ * If PagePrivate is set, then the page is currently associated with ++ * an in-progress read or write request. Don't try to migrate it. ++ * ++ * FIXME: we could do this in principle, but we'll need a way to ensure ++ * that we can safely release the inode reference while holding ++ * the page lock. ++ */ ++ if (PagePrivate(page)) ++ return -EBUSY; + + nfs_fscache_release_page(page, GFP_KERNEL); + +- req = nfs_find_and_lock_request(page, false); +- ret = PTR_ERR(req); +- if (IS_ERR(req)) +- goto out; +- +- ret = migrate_page(mapping, newpage, page); +- if (!req) +- goto out; +- if (ret) +- goto out_unlock; +- page_cache_get(newpage); +- spin_lock(&mapping->host->i_lock); +- req->wb_page = newpage; +- SetPagePrivate(newpage); +- set_page_private(newpage, (unsigned long)req); +- ClearPagePrivate(page); +- set_page_private(page, 0); +- spin_unlock(&mapping->host->i_lock); +- page_cache_release(page); +-out_unlock: +- nfs_clear_page_tag_locked(req); +-out: +- return ret; ++ return migrate_page(mapping, newpage, page); + } + #endif + +diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c +index 3a6dbd7..0b8830c 100644 +--- a/fs/nfsd/nfs4proc.c ++++ b/fs/nfsd/nfs4proc.c +@@ -156,6 +156,8 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs + !(open->op_share_access & NFS4_SHARE_ACCESS_WRITE)) + return nfserr_inval; + ++ accmode |= NFSD_MAY_READ_IF_EXEC; ++ + if (open->op_share_access & NFS4_SHARE_ACCESS_READ) + accmode |= NFSD_MAY_READ; + if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) +@@ -682,7 +684,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion); + readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion); + +- if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) || ++ if ((cookie == 1) || (cookie == 2) || + (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE))) + return nfserr_bad_cookie; + +@@ -921,7 +923,7 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + count = 4 + (verify->ve_attrlen >> 2); + buf = kmalloc(count << 2, GFP_KERNEL); + if (!buf) +- return nfserr_resource; ++ return nfserr_jukebox; + + status = nfsd4_encode_fattr(&cstate->current_fh, + cstate->current_fh.fh_export, +diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c +index ffb59ef..be26814 100644 +--- a/fs/nfsd/nfs4recover.c ++++ b/fs/nfsd/nfs4recover.c +@@ -88,7 +88,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) + struct xdr_netobj cksum; + struct hash_desc desc; + struct scatterlist sg; +- __be32 status = nfserr_resource; ++ __be32 status = nfserr_jukebox; + + dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n", + clname->len, clname->data); +diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c +index 3b8ad35..ecd8152 100644 +--- a/fs/nfsd/nfs4state.c ++++ b/fs/nfsd/nfs4state.c +@@ -188,8 +188,15 @@ static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag) + static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) + { + if (atomic_dec_and_test(&fp->fi_access[oflag])) { +- nfs4_file_put_fd(fp, O_RDWR); + nfs4_file_put_fd(fp, oflag); ++ /* ++ * It's also safe to get rid of the RDWR open *if* ++ * we no longer have need of the other kind of access ++ * or if we already have the other kind of open: ++ */ ++ if (fp->fi_fds[1-oflag] ++ || atomic_read(&fp->fi_access[1 - oflag]) == 0) ++ nfs4_file_put_fd(fp, O_RDWR); + } + } + +@@ -1903,7 +1910,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + * of 5 bullet points, labeled as CASE0 - CASE4 below. + */ + unconf = find_unconfirmed_client_by_str(dname, strhashval); +- status = nfserr_resource; ++ status = nfserr_jukebox; + if (!conf) { + /* + * RFC 3530 14.2.33 CASE 4: +@@ -2440,7 +2447,7 @@ renew: + if (open->op_stateowner == NULL) { + sop = alloc_init_open_stateowner(strhashval, clp, open); + if (sop == NULL) +- return nfserr_resource; ++ return nfserr_jukebox; + open->op_stateowner = sop; + } + list_del_init(&sop->so_close_lru); +@@ -2576,7 +2583,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, + + stp = nfs4_alloc_stateid(); + if (stp == NULL) +- return nfserr_resource; ++ return nfserr_jukebox; + + status = nfs4_get_vfs_file(rqstp, fp, cur_fh, open); + if (status) { +@@ -2807,7 +2814,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf + status = nfserr_bad_stateid; + if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR) + goto out; +- status = nfserr_resource; ++ status = nfserr_jukebox; + fp = alloc_init_file(ino); + if (fp == NULL) + goto out; +@@ -3381,8 +3388,9 @@ static inline void nfs4_file_downgrade(struct nfs4_stateid *stp, unsigned int to + int i; + + for (i = 1; i < 4; i++) { +- if (test_bit(i, &stp->st_access_bmap) && !(i & to_access)) { +- nfs4_file_put_access(stp->st_file, i); ++ if (test_bit(i, &stp->st_access_bmap) ++ && ((i & to_access) != i)) { ++ nfs4_file_put_access(stp->st_file, nfs4_access_to_omode(i)); + __clear_bit(i, &stp->st_access_bmap); + } + } +@@ -3413,6 +3421,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, + if (!access_valid(od->od_share_access, cstate->minorversion) + || !deny_valid(od->od_share_deny)) + return nfserr_inval; ++ /* We don't yet support WANT bits: */ ++ od->od_share_access &= NFS4_SHARE_ACCESS_MASK; + + nfs4_lock_state(); + if ((status = nfs4_preprocess_seqid_op(cstate, +@@ -3840,7 +3850,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + /* XXX: Do we need to check for duplicate stateowners on + * the same file, or should they just be allowed (and + * create new stateids)? */ +- status = nfserr_resource; ++ status = nfserr_jukebox; + lock_sop = alloc_init_lock_stateowner(strhashval, + open_sop->so_client, open_stp, lock); + if (lock_sop == NULL) +@@ -3924,9 +3934,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + case (EDEADLK): + status = nfserr_deadlock; + break; +- default: ++ default: + dprintk("NFSD: nfsd4_lock: vfs_lock_file() failed! status %d\n",err); +- status = nfserr_resource; ++ status = nfserrno(err); + break; + } + out: +diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c +index 9901811..6c74097 100644 +--- a/fs/nfsd/nfs4xdr.c ++++ b/fs/nfsd/nfs4xdr.c +@@ -1548,6 +1548,18 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) + \ + save = resp->p; + ++static bool seqid_mutating_err(__be32 err) ++{ ++ /* rfc 3530 section 8.1.5: */ ++ return err != nfserr_stale_clientid && ++ err != nfserr_stale_stateid && ++ err != nfserr_bad_stateid && ++ err != nfserr_bad_seqid && ++ err != nfserr_bad_xdr && ++ err != nfserr_resource && ++ err != nfserr_nofilehandle; ++} ++ + /* + * Routine for encoding the result of a "seqid-mutating" NFSv4 operation. This + * is where sequence id's are incremented, and the replay cache is filled. +diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h +index 6bd2f3c..858c7ba 100644 +--- a/fs/nfsd/state.h ++++ b/fs/nfsd/state.h +@@ -447,12 +447,6 @@ struct nfs4_stateid { + #define WR_STATE 0x00000020 + #define CLOSE_STATE 0x00000040 + +-#define seqid_mutating_err(err) \ +- (((err) != nfserr_stale_clientid) && \ +- ((err) != nfserr_bad_seqid) && \ +- ((err) != nfserr_stale_stateid) && \ +- ((err) != nfserr_bad_stateid)) +- + struct nfsd4_compound_state; + + extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate, +diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c +index fd0acca..acf88ae 100644 +--- a/fs/nfsd/vfs.c ++++ b/fs/nfsd/vfs.c +@@ -2114,7 +2114,8 @@ nfsd_permission(struct svc_rqst *rqstp, struct svc_export *exp, + + /* Allow read access to binaries even when mode 111 */ + if (err == -EACCES && S_ISREG(inode->i_mode) && +- acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE)) ++ (acc == (NFSD_MAY_READ | NFSD_MAY_OWNER_OVERRIDE) || ++ acc == (NFSD_MAY_READ | NFSD_MAY_READ_IF_EXEC))) + err = inode_permission(inode, MAY_EXEC); + + return err? nfserrno(err) : 0; +diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h +index e0bbac0..a22e40e 100644 +--- a/fs/nfsd/vfs.h ++++ b/fs/nfsd/vfs.h +@@ -25,6 +25,7 @@ + #define NFSD_MAY_BYPASS_GSS_ON_ROOT 256 + #define NFSD_MAY_NOT_BREAK_LEASE 512 + #define NFSD_MAY_BYPASS_GSS 1024 ++#define NFSD_MAY_READ_IF_EXEC 2048 + + #define NFSD_MAY_CREATE (NFSD_MAY_EXEC|NFSD_MAY_WRITE) + #define NFSD_MAY_REMOVE (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC) +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 5bff4c6..f039017 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -1920,6 +1920,14 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info) + spin_lock(&files->file_lock); + file = fcheck_files(files, fd); + if (file) { ++ unsigned int f_flags; ++ struct fdtable *fdt; ++ ++ fdt = files_fdtable(files); ++ f_flags = file->f_flags & ~O_CLOEXEC; ++ if (FD_ISSET(fd, fdt->close_on_exec)) ++ f_flags |= O_CLOEXEC; ++ + if (path) { + *path = file->f_path; + path_get(&file->f_path); +@@ -1929,7 +1937,7 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info) + "pos:\t%lli\n" + "flags:\t0%o\n", + (long long) file->f_pos, +- file->f_flags); ++ f_flags); + spin_unlock(&files->file_lock); + put_files_struct(files); + return 0; +diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c +index 5afaa58..c7d4ee6 100644 +--- a/fs/proc/task_mmu.c ++++ b/fs/proc/task_mmu.c +@@ -1039,6 +1039,9 @@ static int show_numa_map(struct seq_file *m, void *v) + seq_printf(m, " stack"); + } + ++ if (is_vm_hugetlb_page(vma)) ++ seq_printf(m, " huge"); ++ + walk_page_range(vma->vm_start, vma->vm_end, &walk); + + if (!md->pages) +diff --git a/fs/quota/quota.c b/fs/quota/quota.c +index b34bdb2..10b6be3 100644 +--- a/fs/quota/quota.c ++++ b/fs/quota/quota.c +@@ -355,7 +355,7 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special, + * resolution (think about autofs) and thus deadlocks could arise. + */ + if (cmds == Q_QUOTAON) { +- ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW, &path); ++ ret = user_path_at(AT_FDCWD, addr, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path); + if (ret) + pathp = ERR_PTR(ret); + else +diff --git a/fs/stat.c b/fs/stat.c +index 9610391..02a6061 100644 +--- a/fs/stat.c ++++ b/fs/stat.c +@@ -296,15 +296,16 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname, + { + struct path path; + int error; ++ int empty = 0; + + if (bufsiz <= 0) + return -EINVAL; + +- error = user_path_at(dfd, pathname, LOOKUP_EMPTY, &path); ++ error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty); + if (!error) { + struct inode *inode = path.dentry->d_inode; + +- error = -EINVAL; ++ error = empty ? -ENOENT : -EINVAL; + if (inode->i_op->readlink) { + error = security_inode_readlink(path.dentry); + if (!error) { +diff --git a/fs/statfs.c b/fs/statfs.c +index 8244924..9cf04a1 100644 +--- a/fs/statfs.c ++++ b/fs/statfs.c +@@ -76,7 +76,7 @@ EXPORT_SYMBOL(vfs_statfs); + int user_statfs(const char __user *pathname, struct kstatfs *st) + { + struct path path; +- int error = user_path(pathname, &path); ++ int error = user_path_at(AT_FDCWD, pathname, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path); + if (!error) { + error = vfs_statfs(&path, st); + path_put(&path); +diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h +index 91567bb..03eb1d6 100644 +--- a/include/drm/drm_dp_helper.h ++++ b/include/drm/drm_dp_helper.h +@@ -72,6 +72,7 @@ + + #define DP_MAIN_LINK_CHANNEL_CODING 0x006 + ++#define DP_EDP_CONFIGURATION_CAP 0x00d + #define DP_TRAINING_AUX_RD_INTERVAL 0x00e + + /* link configuration */ +@@ -133,6 +134,8 @@ + #define DP_MAIN_LINK_CHANNEL_CODING_SET 0x108 + # define DP_SET_ANSI_8B10B (1 << 0) + ++#define DP_EDP_CONFIGURATION_SET 0x10a ++ + #define DP_LANE0_1_STATUS 0x202 + #define DP_LANE2_3_STATUS 0x203 + # define DP_LANE_CR_DONE (1 << 0) +diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h +index 2dfa707..0bfcb76 100644 +--- a/include/linux/ext2_fs.h ++++ b/include/linux/ext2_fs.h +@@ -196,8 +196,8 @@ struct ext2_group_desc + + /* Flags that should be inherited by new inodes from their parent. */ + #define EXT2_FL_INHERITED (EXT2_SECRM_FL | EXT2_UNRM_FL | EXT2_COMPR_FL |\ +- EXT2_SYNC_FL | EXT2_IMMUTABLE_FL | EXT2_APPEND_FL |\ +- EXT2_NODUMP_FL | EXT2_NOATIME_FL | EXT2_COMPRBLK_FL|\ ++ EXT2_SYNC_FL | EXT2_NODUMP_FL |\ ++ EXT2_NOATIME_FL | EXT2_COMPRBLK_FL |\ + EXT2_NOCOMP_FL | EXT2_JOURNAL_DATA_FL |\ + EXT2_NOTAIL_FL | EXT2_DIRSYNC_FL) + +diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h +index 5e06acf..7b14d25 100644 +--- a/include/linux/ext3_fs.h ++++ b/include/linux/ext3_fs.h +@@ -180,8 +180,8 @@ struct ext3_group_desc + + /* Flags that should be inherited by new inodes from their parent. */ + #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ +- EXT3_SYNC_FL | EXT3_IMMUTABLE_FL | EXT3_APPEND_FL |\ +- EXT3_NODUMP_FL | EXT3_NOATIME_FL | EXT3_COMPRBLK_FL|\ ++ EXT3_SYNC_FL | EXT3_NODUMP_FL |\ ++ EXT3_NOATIME_FL | EXT3_COMPRBLK_FL |\ + EXT3_NOCOMPR_FL | EXT3_JOURNAL_DATA_FL |\ + EXT3_NOTAIL_FL | EXT3_DIRSYNC_FL) + +diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h +index f6efed0..b9490bf 100644 +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h +@@ -59,6 +59,8 @@ + * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend + * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set + * IRQF_NO_THREAD - Interrupt cannot be threaded ++ * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device ++ * resume time. + */ + #define IRQF_DISABLED 0x00000020 + #define IRQF_SAMPLE_RANDOM 0x00000040 +@@ -72,6 +74,7 @@ + #define IRQF_NO_SUSPEND 0x00004000 + #define IRQF_FORCE_RESUME 0x00008000 + #define IRQF_NO_THREAD 0x00010000 ++#define IRQF_EARLY_RESUME 0x00020000 + + #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD) + +diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h +index 8cdcc2a1..1feeb52 100644 +--- a/include/linux/io-mapping.h ++++ b/include/linux/io-mapping.h +@@ -117,6 +117,8 @@ io_mapping_unmap(void __iomem *vaddr) + + #else + ++#include <linux/uaccess.h> ++ + /* this struct isn't actually defined anywhere */ + struct io_mapping; + +@@ -138,12 +140,14 @@ static inline void __iomem * + io_mapping_map_atomic_wc(struct io_mapping *mapping, + unsigned long offset) + { ++ pagefault_disable(); + return ((char __force __iomem *) mapping) + offset; + } + + static inline void + io_mapping_unmap_atomic(void __iomem *vaddr) + { ++ pagefault_enable(); + } + + /* Non-atomic map/unmap */ +diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h +index f97672a..265e2c3 100644 +--- a/include/linux/jiffies.h ++++ b/include/linux/jiffies.h +@@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const unsigned long jiffies, + extern unsigned long timeval_to_jiffies(const struct timeval *value); + extern void jiffies_to_timeval(const unsigned long jiffies, + struct timeval *value); +-extern clock_t jiffies_to_clock_t(long x); ++extern clock_t jiffies_to_clock_t(unsigned long x); + extern unsigned long clock_t_to_jiffies(unsigned long x); + extern u64 jiffies_64_to_clock_t(u64 x); + extern u64 nsec_to_clock_t(u64 x); +diff --git a/include/linux/mm.h b/include/linux/mm.h +index ec6e33d..18eea05 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -355,36 +355,50 @@ static inline struct page *compound_head(struct page *page) + return page; + } + ++/* ++ * The atomic page->_mapcount, starts from -1: so that transitions ++ * both from it and to it can be tracked, using atomic_inc_and_test ++ * and atomic_add_negative(-1). ++ */ ++static inline void reset_page_mapcount(struct page *page) ++{ ++ atomic_set(&(page)->_mapcount, -1); ++} ++ ++static inline int page_mapcount(struct page *page) ++{ ++ return atomic_read(&(page)->_mapcount) + 1; ++} ++ + static inline int page_count(struct page *page) + { + return atomic_read(&compound_head(page)->_count); + } + ++static inline void get_huge_page_tail(struct page *page) ++{ ++ /* ++ * __split_huge_page_refcount() cannot run ++ * from under us. ++ */ ++ VM_BUG_ON(page_mapcount(page) < 0); ++ VM_BUG_ON(atomic_read(&page->_count) != 0); ++ atomic_inc(&page->_mapcount); ++} ++ ++extern bool __get_page_tail(struct page *page); ++ + static inline void get_page(struct page *page) + { ++ if (unlikely(PageTail(page))) ++ if (likely(__get_page_tail(page))) ++ return; + /* + * Getting a normal page or the head of a compound page +- * requires to already have an elevated page->_count. Only if +- * we're getting a tail page, the elevated page->_count is +- * required only in the head page, so for tail pages the +- * bugcheck only verifies that the page->_count isn't +- * negative. ++ * requires to already have an elevated page->_count. + */ +- VM_BUG_ON(atomic_read(&page->_count) < !PageTail(page)); ++ VM_BUG_ON(atomic_read(&page->_count) <= 0); + atomic_inc(&page->_count); +- /* +- * Getting a tail page will elevate both the head and tail +- * page->_count(s). +- */ +- if (unlikely(PageTail(page))) { +- /* +- * This is safe only because +- * __split_huge_page_refcount can't run under +- * get_page(). +- */ +- VM_BUG_ON(atomic_read(&page->first_page->_count) <= 0); +- atomic_inc(&page->first_page->_count); +- } + } + + static inline struct page *virt_to_head_page(const void *x) +@@ -803,21 +817,6 @@ static inline pgoff_t page_index(struct page *page) + } + + /* +- * The atomic page->_mapcount, like _count, starts from -1: +- * so that transitions both from it and to it can be tracked, +- * using atomic_inc_and_test and atomic_add_negative(-1). +- */ +-static inline void reset_page_mapcount(struct page *page) +-{ +- atomic_set(&(page)->_mapcount, -1); +-} +- +-static inline int page_mapcount(struct page *page) +-{ +- return atomic_read(&(page)->_mapcount) + 1; +-} +- +-/* + * Return true if this page is mapped into pagetables. + */ + static inline int page_mapped(struct page *page) +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index 027935c..059839c 100644 +--- a/include/linux/mm_types.h ++++ b/include/linux/mm_types.h +@@ -36,10 +36,24 @@ struct page { + * updated asynchronously */ + atomic_t _count; /* Usage count, see below. */ + union { +- atomic_t _mapcount; /* Count of ptes mapped in mms, +- * to show when page is mapped +- * & limit reverse map searches. +- */ ++ /* ++ * Count of ptes mapped in ++ * mms, to show when page is ++ * mapped & limit reverse map ++ * searches. ++ * ++ * Used also for tail pages ++ * refcounting instead of ++ * _count. Tail pages cannot ++ * be mapped and keeping the ++ * tail page _count zero at ++ * all times guarantees ++ * get_page_unless_zero() will ++ * never succeed on tail ++ * pages. ++ */ ++ atomic_t _mapcount; ++ + struct { /* SLUB */ + u16 inuse; + u16 objects; +diff --git a/include/linux/namei.h b/include/linux/namei.h +index eba45ea..82ab16b 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -49,6 +49,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; + #define LOOKUP_FOLLOW 0x0001 + #define LOOKUP_DIRECTORY 0x0002 + #define LOOKUP_CONTINUE 0x0004 ++#define LOOKUP_AUTOMOUNT 0x0008 + + #define LOOKUP_PARENT 0x0010 + #define LOOKUP_REVAL 0x0020 +@@ -67,6 +68,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; + #define LOOKUP_EMPTY 0x4000 + + extern int user_path_at(int, const char __user *, unsigned, struct path *); ++extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty); + + #define user_path(name, path) user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW, path) + #define user_lpath(name, path) user_path_at(AT_FDCWD, name, 0, path) +diff --git a/include/linux/phy.h b/include/linux/phy.h +index 7da5fa8..4d3f63a 100644 +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -418,7 +418,7 @@ struct phy_driver { + + /* + * Requests a Tx timestamp for 'skb'. The phy driver promises +- * to deliver it to the socket's error queue as soon as a ++ * to deliver it using skb_complete_tx_timestamp() as soon as a + * timestamp becomes available. One of the PTP_CLASS_ values + * is passed in 'type'. + */ +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index c0a4f3a..b920a72 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1996,8 +1996,13 @@ static inline bool skb_defer_rx_timestamp(struct sk_buff *skb) + /** + * skb_complete_tx_timestamp() - deliver cloned skb with tx timestamps + * ++ * PHY drivers may accept clones of transmitted packets for ++ * timestamping via their phy_driver.txtstamp method. These drivers ++ * must call this function to return the skb back to the stack, with ++ * or without a timestamp. ++ * + * @skb: clone of the the original outgoing packet +- * @hwtstamps: hardware time stamps ++ * @hwtstamps: hardware time stamps, may be NULL if not available + * + */ + void skb_complete_tx_timestamp(struct sk_buff *skb, +diff --git a/include/linux/tty.h b/include/linux/tty.h +index 6660c41..1ff6b62 100644 +--- a/include/linux/tty.h ++++ b/include/linux/tty.h +@@ -472,7 +472,9 @@ extern void proc_clear_tty(struct task_struct *p); + extern struct tty_struct *get_current_tty(void); + extern void tty_default_fops(struct file_operations *fops); + extern struct tty_struct *alloc_tty_struct(void); +-extern int tty_add_file(struct tty_struct *tty, struct file *file); ++extern int tty_alloc_file(struct file *file); ++extern void tty_add_file(struct tty_struct *tty, struct file *file); ++extern void tty_free_file(struct file *file); + extern void free_tty_struct(struct tty_struct *tty); + extern void initialize_tty_struct(struct tty_struct *tty, + struct tty_driver *driver, int idx); +diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h +index 0097136..c0ecc5a 100644 +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h +@@ -178,7 +178,7 @@ struct usb_hcd { + * this structure. + */ + unsigned long hcd_priv[0] +- __attribute__ ((aligned(sizeof(unsigned long)))); ++ __attribute__ ((aligned(sizeof(s64)))); + }; + + /* 2.4 does this a bit differently ... */ +diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h +index 9332e52..687fb11 100644 +--- a/include/linux/vmalloc.h ++++ b/include/linux/vmalloc.h +@@ -13,6 +13,7 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ + #define VM_MAP 0x00000004 /* vmap()ed pages */ + #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ + #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ ++#define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */ + /* bits [20..32] reserved for arch specific ioremap internals */ + + /* +diff --git a/include/net/flow.h b/include/net/flow.h +index c6d5fe5..32359fd 100644 +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -7,6 +7,7 @@ + #ifndef _NET_FLOW_H + #define _NET_FLOW_H + ++#include <linux/socket.h> + #include <linux/in6.h> + #include <asm/atomic.h> + +@@ -68,7 +69,7 @@ struct flowi4 { + #define fl4_ipsec_spi uli.spi + #define fl4_mh_type uli.mht.type + #define fl4_gre_key uli.gre_key +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + static inline void flowi4_init_output(struct flowi4 *fl4, int oif, + __u32 mark, __u8 tos, __u8 scope, +@@ -112,7 +113,7 @@ struct flowi6 { + #define fl6_ipsec_spi uli.spi + #define fl6_mh_type uli.mht.type + #define fl6_gre_key uli.gre_key +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + struct flowidn { + struct flowi_common __fl_common; +@@ -127,7 +128,7 @@ struct flowidn { + union flowi_uli uli; + #define fld_sport uli.ports.sport + #define fld_dport uli.ports.dport +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + struct flowi { + union { +@@ -161,6 +162,24 @@ static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn) + return container_of(fldn, struct flowi, u.dn); + } + ++typedef unsigned long flow_compare_t; ++ ++static inline size_t flow_key_size(u16 family) ++{ ++ switch (family) { ++ case AF_INET: ++ BUILD_BUG_ON(sizeof(struct flowi4) % sizeof(flow_compare_t)); ++ return sizeof(struct flowi4) / sizeof(flow_compare_t); ++ case AF_INET6: ++ BUILD_BUG_ON(sizeof(struct flowi6) % sizeof(flow_compare_t)); ++ return sizeof(struct flowi6) / sizeof(flow_compare_t); ++ case AF_DECnet: ++ BUILD_BUG_ON(sizeof(struct flowidn) % sizeof(flow_compare_t)); ++ return sizeof(struct flowidn) / sizeof(flow_compare_t); ++ } ++ return 0; ++} ++ + #define FLOW_DIR_IN 0 + #define FLOW_DIR_OUT 1 + #define FLOW_DIR_FWD 2 +diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c +index f76fc00..15e53b1 100644 +--- a/kernel/irq/pm.c ++++ b/kernel/irq/pm.c +@@ -9,6 +9,7 @@ + #include <linux/irq.h> + #include <linux/module.h> + #include <linux/interrupt.h> ++#include <linux/syscore_ops.h> + + #include "internals.h" + +@@ -39,25 +40,58 @@ void suspend_device_irqs(void) + } + EXPORT_SYMBOL_GPL(suspend_device_irqs); + +-/** +- * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() +- * +- * Enable all interrupt lines previously disabled by suspend_device_irqs() that +- * have the IRQS_SUSPENDED flag set. +- */ +-void resume_device_irqs(void) ++static void resume_irqs(bool want_early) + { + struct irq_desc *desc; + int irq; + + for_each_irq_desc(irq, desc) { + unsigned long flags; ++ bool is_early = desc->action && ++ desc->action->flags & IRQF_EARLY_RESUME; ++ ++ if (is_early != want_early) ++ continue; + + raw_spin_lock_irqsave(&desc->lock, flags); + __enable_irq(desc, irq, true); + raw_spin_unlock_irqrestore(&desc->lock, flags); + } + } ++ ++/** ++ * irq_pm_syscore_ops - enable interrupt lines early ++ * ++ * Enable all interrupt lines with %IRQF_EARLY_RESUME set. ++ */ ++static void irq_pm_syscore_resume(void) ++{ ++ resume_irqs(true); ++} ++ ++static struct syscore_ops irq_pm_syscore_ops = { ++ .resume = irq_pm_syscore_resume, ++}; ++ ++static int __init irq_pm_init_ops(void) ++{ ++ register_syscore_ops(&irq_pm_syscore_ops); ++ return 0; ++} ++ ++device_initcall(irq_pm_init_ops); ++ ++/** ++ * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() ++ * ++ * Enable all non-%IRQF_EARLY_RESUME interrupt lines previously ++ * disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag ++ * set as well as those with %IRQF_FORCE_RESUME. ++ */ ++void resume_device_irqs(void) ++{ ++ resume_irqs(false); ++} + EXPORT_SYMBOL_GPL(resume_device_irqs); + + /** +diff --git a/kernel/kmod.c b/kernel/kmod.c +index 47613df..fabfe54 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -114,10 +114,12 @@ int __request_module(bool wait, const char *fmt, ...) + atomic_inc(&kmod_concurrent); + if (atomic_read(&kmod_concurrent) > max_modprobes) { + /* We may be blaming an innocent here, but unlikely */ +- if (kmod_loop_msg++ < 5) ++ if (kmod_loop_msg < 5) { + printk(KERN_ERR + "request_module: runaway loop modprobe %s\n", + module_name); ++ kmod_loop_msg++; ++ } + atomic_dec(&kmod_concurrent); + return -ENOMEM; + } +diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c +index 1c41ba2..449ccc9 100644 +--- a/kernel/power/suspend.c ++++ b/kernel/power/suspend.c +@@ -307,7 +307,7 @@ int enter_state(suspend_state_t state) + */ + int pm_suspend(suspend_state_t state) + { +- if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) ++ if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) + return enter_state(state); + return -EINVAL; + } +diff --git a/kernel/signal.c b/kernel/signal.c +index 415d85d..43fee1c 100644 +--- a/kernel/signal.c ++++ b/kernel/signal.c +@@ -1894,21 +1894,19 @@ static int do_signal_stop(int signr) + */ + if (!(sig->flags & SIGNAL_STOP_STOPPED)) + sig->group_exit_code = signr; +- else +- WARN_ON_ONCE(!task_ptrace(current)); + + current->group_stop &= ~GROUP_STOP_SIGMASK; + current->group_stop |= signr | gstop; + sig->group_stop_count = 1; + for (t = next_thread(current); t != current; + t = next_thread(t)) { +- t->group_stop &= ~GROUP_STOP_SIGMASK; + /* + * Setting state to TASK_STOPPED for a group + * stop is always done with the siglock held, + * so this check has no races. + */ + if (!(t->flags & PF_EXITING) && !task_is_stopped(t)) { ++ t->group_stop &= ~GROUP_STOP_SIGMASK; + t->group_stop |= signr | gstop; + sig->group_stop_count++; + signal_wake_up(t, 0); +diff --git a/kernel/time.c b/kernel/time.c +index 8e8dc6d..d776062 100644 +--- a/kernel/time.c ++++ b/kernel/time.c +@@ -575,7 +575,7 @@ EXPORT_SYMBOL(jiffies_to_timeval); + /* + * Convert jiffies/jiffies_64 to clock_t and back. + */ +-clock_t jiffies_to_clock_t(long x) ++clock_t jiffies_to_clock_t(unsigned long x) + { + #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0 + # if HZ < USER_HZ +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index ee9c921..0731e81a 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -3704,8 +3704,6 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, + if (info->read < PAGE_SIZE) + goto read; + +- info->read = 0; +- + trace_access_lock(info->cpu); + ret = ring_buffer_read_page(info->tr->buffer, + &info->spare, +@@ -3715,6 +3713,8 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, + if (ret < 0) + return 0; + ++ info->read = 0; ++ + read: + size = PAGE_SIZE - info->read; + if (size > count) +diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c +index 70af0a7..ad72a03 100644 +--- a/lib/kobject_uevent.c ++++ b/lib/kobject_uevent.c +@@ -282,7 +282,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, + kobj_bcast_filter, + kobj); + /* ENOBUFS should be handled in userspace */ +- if (retval == -ENOBUFS) ++ if (retval == -ENOBUFS || retval == -ESRCH) + retval = 0; + } else + retval = -ENOMEM; +diff --git a/lib/nlattr.c b/lib/nlattr.c +index ac09f22..a8408b6 100644 +--- a/lib/nlattr.c ++++ b/lib/nlattr.c +@@ -20,6 +20,7 @@ static const u16 nla_attr_minlen[NLA_TYPE_MAX+1] = { + [NLA_U16] = sizeof(u16), + [NLA_U32] = sizeof(u32), + [NLA_U64] = sizeof(u64), ++ [NLA_MSECS] = sizeof(u64), + [NLA_NESTED] = NLA_HDRLEN, + }; + +diff --git a/mm/huge_memory.c b/mm/huge_memory.c +index 81532f2..cc5acf9 100644 +--- a/mm/huge_memory.c ++++ b/mm/huge_memory.c +@@ -989,7 +989,7 @@ struct page *follow_trans_huge_pmd(struct mm_struct *mm, + page += (addr & ~HPAGE_PMD_MASK) >> PAGE_SHIFT; + VM_BUG_ON(!PageCompound(page)); + if (flags & FOLL_GET) +- get_page(page); ++ get_page_foll(page); + + out: + return page; +@@ -1156,6 +1156,7 @@ static void __split_huge_page_refcount(struct page *page) + unsigned long head_index = page->index; + struct zone *zone = page_zone(page); + int zonestat; ++ int tail_count = 0; + + /* prevent PageLRU to go away from under us, and freeze lru stats */ + spin_lock_irq(&zone->lru_lock); +@@ -1164,11 +1165,27 @@ static void __split_huge_page_refcount(struct page *page) + for (i = 1; i < HPAGE_PMD_NR; i++) { + struct page *page_tail = page + i; + +- /* tail_page->_count cannot change */ +- atomic_sub(atomic_read(&page_tail->_count), &page->_count); +- BUG_ON(page_count(page) <= 0); +- atomic_add(page_mapcount(page) + 1, &page_tail->_count); +- BUG_ON(atomic_read(&page_tail->_count) <= 0); ++ /* tail_page->_mapcount cannot change */ ++ BUG_ON(page_mapcount(page_tail) < 0); ++ tail_count += page_mapcount(page_tail); ++ /* check for overflow */ ++ BUG_ON(tail_count < 0); ++ BUG_ON(atomic_read(&page_tail->_count) != 0); ++ /* ++ * tail_page->_count is zero and not changing from ++ * under us. But get_page_unless_zero() may be running ++ * from under us on the tail_page. If we used ++ * atomic_set() below instead of atomic_add(), we ++ * would then run atomic_set() concurrently with ++ * get_page_unless_zero(), and atomic_set() is ++ * implemented in C not using locked ops. spin_unlock ++ * on x86 sometime uses locked ops because of PPro ++ * errata 66, 92, so unless somebody can guarantee ++ * atomic_set() here would be safe on all archs (and ++ * not only on x86), it's safer to use atomic_add(). ++ */ ++ atomic_add(page_mapcount(page) + page_mapcount(page_tail) + 1, ++ &page_tail->_count); + + /* after clearing PageTail the gup refcount can be released */ + smp_mb(); +@@ -1186,10 +1203,7 @@ static void __split_huge_page_refcount(struct page *page) + (1L << PG_uptodate))); + page_tail->flags |= (1L << PG_dirty); + +- /* +- * 1) clear PageTail before overwriting first_page +- * 2) clear PageTail before clearing PageHead for VM_BUG_ON +- */ ++ /* clear PageTail before overwriting first_page */ + smp_wmb(); + + /* +@@ -1206,7 +1220,6 @@ static void __split_huge_page_refcount(struct page *page) + * status is achieved setting a reserved bit in the + * pmd, not by clearing the present bit. + */ +- BUG_ON(page_mapcount(page_tail)); + page_tail->_mapcount = page->_mapcount; + + BUG_ON(page_tail->mapping); +@@ -1223,6 +1236,8 @@ static void __split_huge_page_refcount(struct page *page) + + lru_add_page_tail(zone, page, page_tail); + } ++ atomic_sub(tail_count, &page->_count); ++ BUG_ON(atomic_read(&page->_count) <= 0); + + __dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); + __mod_zone_page_state(zone, NR_ANON_PAGES, HPAGE_PMD_NR); +diff --git a/mm/internal.h b/mm/internal.h +index d071d38..2189af4 100644 +--- a/mm/internal.h ++++ b/mm/internal.h +@@ -37,6 +37,52 @@ static inline void __put_page(struct page *page) + atomic_dec(&page->_count); + } + ++static inline void __get_page_tail_foll(struct page *page, ++ bool get_page_head) ++{ ++ /* ++ * If we're getting a tail page, the elevated page->_count is ++ * required only in the head page and we will elevate the head ++ * page->_count and tail page->_mapcount. ++ * ++ * We elevate page_tail->_mapcount for tail pages to force ++ * page_tail->_count to be zero at all times to avoid getting ++ * false positives from get_page_unless_zero() with ++ * speculative page access (like in ++ * page_cache_get_speculative()) on tail pages. ++ */ ++ VM_BUG_ON(atomic_read(&page->first_page->_count) <= 0); ++ VM_BUG_ON(atomic_read(&page->_count) != 0); ++ VM_BUG_ON(page_mapcount(page) < 0); ++ if (get_page_head) ++ atomic_inc(&page->first_page->_count); ++ atomic_inc(&page->_mapcount); ++} ++ ++/* ++ * This is meant to be called as the FOLL_GET operation of ++ * follow_page() and it must be called while holding the proper PT ++ * lock while the pte (or pmd_trans_huge) is still mapping the page. ++ */ ++static inline void get_page_foll(struct page *page) ++{ ++ if (unlikely(PageTail(page))) ++ /* ++ * This is safe only because ++ * __split_huge_page_refcount() can't run under ++ * get_page_foll() because we hold the proper PT lock. ++ */ ++ __get_page_tail_foll(page, true); ++ else { ++ /* ++ * Getting a normal page or the head of a compound page ++ * requires to already have an elevated page->_count. ++ */ ++ VM_BUG_ON(atomic_read(&page->_count) <= 0); ++ atomic_inc(&page->_count); ++ } ++} ++ + extern unsigned long highest_memmap_pfn; + + /* +diff --git a/mm/memory.c b/mm/memory.c +index d961e19..95a7799 100644 +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -1514,7 +1514,7 @@ split_fallthrough: + } + + if (flags & FOLL_GET) +- get_page(page); ++ get_page_foll(page); + if (flags & FOLL_TOUCH) { + if ((flags & FOLL_WRITE) && + !pte_dirty(pte) && !PageDirty(page)) +diff --git a/mm/swap.c b/mm/swap.c +index 3a442f1..87627f1 100644 +--- a/mm/swap.c ++++ b/mm/swap.c +@@ -78,39 +78,22 @@ static void put_compound_page(struct page *page) + { + if (unlikely(PageTail(page))) { + /* __split_huge_page_refcount can run under us */ +- struct page *page_head = page->first_page; +- smp_rmb(); +- /* +- * If PageTail is still set after smp_rmb() we can be sure +- * that the page->first_page we read wasn't a dangling pointer. +- * See __split_huge_page_refcount() smp_wmb(). +- */ +- if (likely(PageTail(page) && get_page_unless_zero(page_head))) { ++ struct page *page_head = compound_trans_head(page); ++ ++ if (likely(page != page_head && ++ get_page_unless_zero(page_head))) { + unsigned long flags; + /* +- * Verify that our page_head wasn't converted +- * to a a regular page before we got a +- * reference on it. ++ * page_head wasn't a dangling pointer but it ++ * may not be a head page anymore by the time ++ * we obtain the lock. That is ok as long as it ++ * can't be freed from under us. + */ +- if (unlikely(!PageHead(page_head))) { +- /* PageHead is cleared after PageTail */ +- smp_rmb(); +- VM_BUG_ON(PageTail(page)); +- goto out_put_head; +- } +- /* +- * Only run compound_lock on a valid PageHead, +- * after having it pinned with +- * get_page_unless_zero() above. +- */ +- smp_mb(); +- /* page_head wasn't a dangling pointer */ + flags = compound_lock_irqsave(page_head); + if (unlikely(!PageTail(page))) { + /* __split_huge_page_refcount run before us */ + compound_unlock_irqrestore(page_head, flags); + VM_BUG_ON(PageHead(page_head)); +- out_put_head: + if (put_page_testzero(page_head)) + __put_single_page(page_head); + out_put_single: +@@ -121,16 +104,17 @@ static void put_compound_page(struct page *page) + VM_BUG_ON(page_head != page->first_page); + /* + * We can release the refcount taken by +- * get_page_unless_zero now that +- * split_huge_page_refcount is blocked on the +- * compound_lock. ++ * get_page_unless_zero() now that ++ * __split_huge_page_refcount() is blocked on ++ * the compound_lock. + */ + if (put_page_testzero(page_head)) + VM_BUG_ON(1); + /* __split_huge_page_refcount will wait now */ +- VM_BUG_ON(atomic_read(&page->_count) <= 0); +- atomic_dec(&page->_count); ++ VM_BUG_ON(page_mapcount(page) <= 0); ++ atomic_dec(&page->_mapcount); + VM_BUG_ON(atomic_read(&page_head->_count) <= 0); ++ VM_BUG_ON(atomic_read(&page->_count) != 0); + compound_unlock_irqrestore(page_head, flags); + if (put_page_testzero(page_head)) { + if (PageHead(page_head)) +@@ -160,6 +144,45 @@ void put_page(struct page *page) + } + EXPORT_SYMBOL(put_page); + ++/* ++ * This function is exported but must not be called by anything other ++ * than get_page(). It implements the slow path of get_page(). ++ */ ++bool __get_page_tail(struct page *page) ++{ ++ /* ++ * This takes care of get_page() if run on a tail page ++ * returned by one of the get_user_pages/follow_page variants. ++ * get_user_pages/follow_page itself doesn't need the compound ++ * lock because it runs __get_page_tail_foll() under the ++ * proper PT lock that already serializes against ++ * split_huge_page(). ++ */ ++ unsigned long flags; ++ bool got = false; ++ struct page *page_head = compound_trans_head(page); ++ ++ if (likely(page != page_head && get_page_unless_zero(page_head))) { ++ /* ++ * page_head wasn't a dangling pointer but it ++ * may not be a head page anymore by the time ++ * we obtain the lock. That is ok as long as it ++ * can't be freed from under us. ++ */ ++ flags = compound_lock_irqsave(page_head); ++ /* here __split_huge_page_refcount won't run anymore */ ++ if (likely(PageTail(page))) { ++ __get_page_tail_foll(page, false); ++ got = true; ++ } ++ compound_unlock_irqrestore(page_head, flags); ++ if (unlikely(!got)) ++ put_page(page_head); ++ } ++ return got; ++} ++EXPORT_SYMBOL(__get_page_tail); ++ + /** + * put_pages_list() - release a list of pages + * @pages: list of pages threaded on page->lru +diff --git a/mm/vmalloc.c b/mm/vmalloc.c +index 45ece89..65d5fd2 100644 +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -1267,18 +1267,22 @@ EXPORT_SYMBOL_GPL(map_vm_area); + DEFINE_RWLOCK(vmlist_lock); + struct vm_struct *vmlist; + +-static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, ++static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, + unsigned long flags, void *caller) + { +- struct vm_struct *tmp, **p; +- + vm->flags = flags; + vm->addr = (void *)va->va_start; + vm->size = va->va_end - va->va_start; + vm->caller = caller; + va->private = vm; + va->flags |= VM_VM_AREA; ++} ++ ++static void insert_vmalloc_vmlist(struct vm_struct *vm) ++{ ++ struct vm_struct *tmp, **p; + ++ vm->flags &= ~VM_UNLIST; + write_lock(&vmlist_lock); + for (p = &vmlist; (tmp = *p) != NULL; p = &tmp->next) { + if (tmp->addr >= vm->addr) +@@ -1289,6 +1293,13 @@ static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, + write_unlock(&vmlist_lock); + } + ++static void insert_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, ++ unsigned long flags, void *caller) ++{ ++ setup_vmalloc_vm(vm, va, flags, caller); ++ insert_vmalloc_vmlist(vm); ++} ++ + static struct vm_struct *__get_vm_area_node(unsigned long size, + unsigned long align, unsigned long flags, unsigned long start, + unsigned long end, int node, gfp_t gfp_mask, void *caller) +@@ -1327,7 +1338,18 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, + return NULL; + } + +- insert_vmalloc_vm(area, va, flags, caller); ++ /* ++ * When this function is called from __vmalloc_node_range, ++ * we do not add vm_struct to vmlist here to avoid ++ * accessing uninitialized members of vm_struct such as ++ * pages and nr_pages fields. They will be set later. ++ * To distinguish it from others, we use a VM_UNLIST flag. ++ */ ++ if (flags & VM_UNLIST) ++ setup_vmalloc_vm(area, va, flags, caller); ++ else ++ insert_vmalloc_vm(area, va, flags, caller); ++ + return area; + } + +@@ -1395,17 +1417,20 @@ struct vm_struct *remove_vm_area(const void *addr) + va = find_vmap_area((unsigned long)addr); + if (va && va->flags & VM_VM_AREA) { + struct vm_struct *vm = va->private; +- struct vm_struct *tmp, **p; +- /* +- * remove from list and disallow access to this vm_struct +- * before unmap. (address range confliction is maintained by +- * vmap.) +- */ +- write_lock(&vmlist_lock); +- for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next) +- ; +- *p = tmp->next; +- write_unlock(&vmlist_lock); ++ ++ if (!(vm->flags & VM_UNLIST)) { ++ struct vm_struct *tmp, **p; ++ /* ++ * remove from list and disallow access to ++ * this vm_struct before unmap. (address range ++ * confliction is maintained by vmap.) ++ */ ++ write_lock(&vmlist_lock); ++ for (p = &vmlist; (tmp = *p) != vm; p = &tmp->next) ++ ; ++ *p = tmp->next; ++ write_unlock(&vmlist_lock); ++ } + + vmap_debug_free_range(va->va_start, va->va_end); + free_unmap_vmap_area(va); +@@ -1616,8 +1641,8 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, + if (!size || (size >> PAGE_SHIFT) > totalram_pages) + return NULL; + +- area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node, +- gfp_mask, caller); ++ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, ++ start, end, node, gfp_mask, caller); + + if (!area) + return NULL; +@@ -1625,6 +1650,12 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, + addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller); + + /* ++ * In this function, newly allocated vm_struct is not added ++ * to vmlist at __get_vm_area_node(). so, it is added here. ++ */ ++ insert_vmalloc_vmlist(area); ++ ++ /* + * A ref_count = 3 is needed because the vm_struct and vmap_area + * structures allocated in the __get_vm_area_node() function contain + * references to the virtual address of the vmalloc'ed block. +diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c +index 32b8f9f..ff3ed60 100644 +--- a/net/bridge/br_device.c ++++ b/net/bridge/br_device.c +@@ -91,7 +91,6 @@ static int br_dev_open(struct net_device *dev) + { + struct net_bridge *br = netdev_priv(dev); + +- netif_carrier_off(dev); + netdev_update_features(dev); + netif_start_queue(dev); + br_stp_enable_bridge(br); +@@ -108,8 +107,6 @@ static int br_dev_stop(struct net_device *dev) + { + struct net_bridge *br = netdev_priv(dev); + +- netif_carrier_off(dev); +- + br_stp_disable_bridge(br); + br_multicast_stop(br); + +diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c +index 6f156c1..4490873 100644 +--- a/net/bridge/br_if.c ++++ b/net/bridge/br_if.c +@@ -161,9 +161,10 @@ static void del_nbp(struct net_bridge_port *p) + call_rcu(&p->rcu, destroy_nbp_rcu); + } + +-/* called with RTNL */ +-static void del_br(struct net_bridge *br, struct list_head *head) ++/* Delete bridge device */ ++void br_dev_delete(struct net_device *dev, struct list_head *head) + { ++ struct net_bridge *br = netdev_priv(dev); + struct net_bridge_port *p, *n; + + list_for_each_entry_safe(p, n, &br->port_list, list) { +@@ -268,7 +269,7 @@ int br_del_bridge(struct net *net, const char *name) + } + + else +- del_br(netdev_priv(dev), NULL); ++ br_dev_delete(dev, NULL); + + rtnl_unlock(); + return ret; +@@ -445,7 +446,7 @@ void __net_exit br_net_exit(struct net *net) + rtnl_lock(); + for_each_netdev(net, dev) + if (dev->priv_flags & IFF_EBRIDGE) +- del_br(netdev_priv(dev), &list); ++ br_dev_delete(dev, &list); + + unregister_netdevice_many(&list); + rtnl_unlock(); +diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c +index ffb0dc4..2c16055 100644 +--- a/net/bridge/br_netlink.c ++++ b/net/bridge/br_netlink.c +@@ -208,6 +208,7 @@ static struct rtnl_link_ops br_link_ops __read_mostly = { + .priv_size = sizeof(struct net_bridge), + .setup = br_dev_setup, + .validate = br_validate, ++ .dellink = br_dev_delete, + }; + + int __init br_netlink_init(void) +diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h +index 78cc364..857a021 100644 +--- a/net/bridge/br_private.h ++++ b/net/bridge/br_private.h +@@ -294,6 +294,7 @@ static inline int br_is_root_bridge(const struct net_bridge *br) + + /* br_device.c */ + extern void br_dev_setup(struct net_device *dev); ++extern void br_dev_delete(struct net_device *dev, struct list_head *list); + extern netdev_tx_t br_dev_xmit(struct sk_buff *skb, + struct net_device *dev); + #ifdef CONFIG_NET_POLL_CONTROLLER +diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c +index 682c0fe..dbdaa95 100644 +--- a/net/caif/caif_dev.c ++++ b/net/caif/caif_dev.c +@@ -209,8 +209,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, + enum cfcnfg_phy_preference pref; + enum cfcnfg_phy_type phy_type; + struct cfcnfg *cfg; +- struct caif_device_entry_list *caifdevs = +- caif_device_list(dev_net(dev)); ++ struct caif_device_entry_list *caifdevs; + + if (dev->type != ARPHRD_CAIF) + return 0; +@@ -219,6 +218,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, + if (cfg == NULL) + return 0; + ++ caifdevs = caif_device_list(dev_net(dev)); ++ + switch (what) { + case NETDEV_REGISTER: + caifd = caif_device_alloc(dev); +diff --git a/net/can/bcm.c b/net/can/bcm.c +index 184a657..c6cc66f 100644 +--- a/net/can/bcm.c ++++ b/net/can/bcm.c +@@ -343,6 +343,18 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head, + } + } + ++static void bcm_tx_start_timer(struct bcm_op *op) ++{ ++ if (op->kt_ival1.tv64 && op->count) ++ hrtimer_start(&op->timer, ++ ktime_add(ktime_get(), op->kt_ival1), ++ HRTIMER_MODE_ABS); ++ else if (op->kt_ival2.tv64) ++ hrtimer_start(&op->timer, ++ ktime_add(ktime_get(), op->kt_ival2), ++ HRTIMER_MODE_ABS); ++} ++ + static void bcm_tx_timeout_tsklet(unsigned long data) + { + struct bcm_op *op = (struct bcm_op *)data; +@@ -364,26 +376,12 @@ static void bcm_tx_timeout_tsklet(unsigned long data) + + bcm_send_to_user(op, &msg_head, NULL, 0); + } +- } +- +- if (op->kt_ival1.tv64 && (op->count > 0)) { +- +- /* send (next) frame */ + bcm_can_tx(op); +- hrtimer_start(&op->timer, +- ktime_add(ktime_get(), op->kt_ival1), +- HRTIMER_MODE_ABS); + +- } else { +- if (op->kt_ival2.tv64) { ++ } else if (op->kt_ival2.tv64) ++ bcm_can_tx(op); + +- /* send (next) frame */ +- bcm_can_tx(op); +- hrtimer_start(&op->timer, +- ktime_add(ktime_get(), op->kt_ival2), +- HRTIMER_MODE_ABS); +- } +- } ++ bcm_tx_start_timer(op); + } + + /* +@@ -963,23 +961,20 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, + hrtimer_cancel(&op->timer); + } + +- if ((op->flags & STARTTIMER) && +- ((op->kt_ival1.tv64 && op->count) || op->kt_ival2.tv64)) { +- ++ if (op->flags & STARTTIMER) { ++ hrtimer_cancel(&op->timer); + /* spec: send can_frame when starting timer */ + op->flags |= TX_ANNOUNCE; +- +- if (op->kt_ival1.tv64 && (op->count > 0)) { +- /* op->count-- is done in bcm_tx_timeout_handler */ +- hrtimer_start(&op->timer, op->kt_ival1, +- HRTIMER_MODE_REL); +- } else +- hrtimer_start(&op->timer, op->kt_ival2, +- HRTIMER_MODE_REL); + } + +- if (op->flags & TX_ANNOUNCE) ++ if (op->flags & TX_ANNOUNCE) { + bcm_can_tx(op); ++ if (op->count) ++ op->count--; ++ } ++ ++ if (op->flags & STARTTIMER) ++ bcm_tx_start_timer(op); + + return msg_head->nframes * CFSIZ + MHSIZ; + } +diff --git a/net/core/dev.c b/net/core/dev.c +index 9c58c1e..f14f601 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -6105,6 +6105,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char + */ + call_netdevice_notifiers(NETDEV_UNREGISTER, dev); + call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev); ++ rtmsg_ifinfo(RTM_DELLINK, dev, ~0U); + + /* + * Flush the unicast and multicast chains +diff --git a/net/core/flow.c b/net/core/flow.c +index 990703b..a6bda2a 100644 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -172,29 +172,26 @@ static void flow_new_hash_rnd(struct flow_cache *fc, + + static u32 flow_hash_code(struct flow_cache *fc, + struct flow_cache_percpu *fcp, +- const struct flowi *key) ++ const struct flowi *key, ++ size_t keysize) + { + const u32 *k = (const u32 *) key; ++ const u32 length = keysize * sizeof(flow_compare_t) / sizeof(u32); + +- return jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) ++ return jhash2(k, length, fcp->hash_rnd) + & (flow_cache_hash_size(fc) - 1); + } + +-typedef unsigned long flow_compare_t; +- + /* I hear what you're saying, use memcmp. But memcmp cannot make +- * important assumptions that we can here, such as alignment and +- * constant size. ++ * important assumptions that we can here, such as alignment. + */ +-static int flow_key_compare(const struct flowi *key1, const struct flowi *key2) ++static int flow_key_compare(const struct flowi *key1, const struct flowi *key2, ++ size_t keysize) + { + const flow_compare_t *k1, *k1_lim, *k2; +- const int n_elem = sizeof(struct flowi) / sizeof(flow_compare_t); +- +- BUILD_BUG_ON(sizeof(struct flowi) % sizeof(flow_compare_t)); + + k1 = (const flow_compare_t *) key1; +- k1_lim = k1 + n_elem; ++ k1_lim = k1 + keysize; + + k2 = (const flow_compare_t *) key2; + +@@ -215,6 +212,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, + struct flow_cache_entry *fle, *tfle; + struct hlist_node *entry; + struct flow_cache_object *flo; ++ size_t keysize; + unsigned int hash; + + local_bh_disable(); +@@ -222,6 +220,11 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, + + fle = NULL; + flo = NULL; ++ ++ keysize = flow_key_size(family); ++ if (!keysize) ++ goto nocache; ++ + /* Packet really early in init? Making flow_cache_init a + * pre-smp initcall would solve this. --RR */ + if (!fcp->hash_table) +@@ -230,11 +233,11 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, + if (fcp->hash_rnd_recalc) + flow_new_hash_rnd(fc, fcp); + +- hash = flow_hash_code(fc, fcp, key); ++ hash = flow_hash_code(fc, fcp, key, keysize); + hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { + if (tfle->family == family && + tfle->dir == dir && +- flow_key_compare(key, &tfle->key) == 0) { ++ flow_key_compare(key, &tfle->key, keysize) == 0) { + fle = tfle; + break; + } +@@ -248,7 +251,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, + if (fle) { + fle->family = family; + fle->dir = dir; +- memcpy(&fle->key, key, sizeof(*key)); ++ memcpy(&fle->key, key, keysize * sizeof(flow_compare_t)); + fle->object = NULL; + hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); + fcp->hash_count++; +diff --git a/net/core/sock.c b/net/core/sock.c +index 6e81978..aebb419 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -1257,6 +1257,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) + /* It is still raw copy of parent, so invalidate + * destructor and make plain sk_free() */ + newsk->sk_destruct = NULL; ++ bh_unlock_sock(newsk); + sk_free(newsk); + newsk = NULL; + goto out; +diff --git a/net/core/timestamping.c b/net/core/timestamping.c +index 7e7ca37..97d036a 100644 +--- a/net/core/timestamping.c ++++ b/net/core/timestamping.c +@@ -57,9 +57,13 @@ void skb_clone_tx_timestamp(struct sk_buff *skb) + case PTP_CLASS_V2_VLAN: + phydev = skb->dev->phydev; + if (likely(phydev->drv->txtstamp)) { ++ if (!atomic_inc_not_zero(&sk->sk_refcnt)) ++ return; + clone = skb_clone(skb, GFP_ATOMIC); +- if (!clone) ++ if (!clone) { ++ sock_put(sk); + return; ++ } + clone->sk = sk; + phydev->drv->txtstamp(phydev, clone, type); + } +@@ -76,8 +80,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, + struct sock_exterr_skb *serr; + int err; + +- if (!hwtstamps) ++ if (!hwtstamps) { ++ sock_put(sk); ++ kfree_skb(skb); + return; ++ } + + *skb_hwtstamps(skb) = *hwtstamps; + serr = SKB_EXT_ERR(skb); +@@ -86,6 +93,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, + serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; + skb->sk = NULL; + err = sock_queue_err_skb(sk, skb); ++ sock_put(sk); + if (err) + kfree_skb(skb); + } +diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c +index b6771f9..c68040f 100644 +--- a/net/ipv4/tcp_input.c ++++ b/net/ipv4/tcp_input.c +@@ -1380,9 +1380,7 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb, + + BUG_ON(!pcount); + +- /* Tweak before seqno plays */ +- if (!tcp_is_fack(tp) && tcp_is_sack(tp) && tp->lost_skb_hint && +- !before(TCP_SKB_CB(tp->lost_skb_hint)->seq, TCP_SKB_CB(skb)->seq)) ++ if (skb == tp->lost_skb_hint) + tp->lost_cnt_hint += pcount; + + TCP_SKB_CB(prev)->end_seq += shifted; +diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c +index b3e6956..69790aa 100644 +--- a/net/ipv4/tcp_ipv4.c ++++ b/net/ipv4/tcp_ipv4.c +@@ -909,18 +909,21 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, + } + sk_nocaps_add(sk, NETIF_F_GSO_MASK); + } +- if (tcp_alloc_md5sig_pool(sk) == NULL) { ++ ++ md5sig = tp->md5sig_info; ++ if (md5sig->entries4 == 0 && ++ tcp_alloc_md5sig_pool(sk) == NULL) { + kfree(newkey); + return -ENOMEM; + } +- md5sig = tp->md5sig_info; + + if (md5sig->alloced4 == md5sig->entries4) { + keys = kmalloc((sizeof(*keys) * + (md5sig->entries4 + 1)), GFP_ATOMIC); + if (!keys) { + kfree(newkey); +- tcp_free_md5sig_pool(); ++ if (md5sig->entries4 == 0) ++ tcp_free_md5sig_pool(); + return -ENOMEM; + } + +@@ -964,6 +967,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr) + kfree(tp->md5sig_info->keys4); + tp->md5sig_info->keys4 = NULL; + tp->md5sig_info->alloced4 = 0; ++ tcp_free_md5sig_pool(); + } else if (tp->md5sig_info->entries4 != i) { + /* Need to do some manipulation */ + memmove(&tp->md5sig_info->keys4[i], +@@ -971,7 +975,6 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr) + (tp->md5sig_info->entries4 - i) * + sizeof(struct tcp4_md5sig_key)); + } +- tcp_free_md5sig_pool(); + return 0; + } + } +diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c +index 981e43e..581fe0a 100644 +--- a/net/ipv4/xfrm4_policy.c ++++ b/net/ipv4/xfrm4_policy.c +@@ -79,13 +79,13 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, + struct rtable *rt = (struct rtable *)xdst->route; + const struct flowi4 *fl4 = &fl->u.ip4; + +- rt->rt_key_dst = fl4->daddr; +- rt->rt_key_src = fl4->saddr; +- rt->rt_key_tos = fl4->flowi4_tos; +- rt->rt_route_iif = fl4->flowi4_iif; +- rt->rt_iif = fl4->flowi4_iif; +- rt->rt_oif = fl4->flowi4_oif; +- rt->rt_mark = fl4->flowi4_mark; ++ xdst->u.rt.rt_key_dst = fl4->daddr; ++ xdst->u.rt.rt_key_src = fl4->saddr; ++ xdst->u.rt.rt_key_tos = fl4->flowi4_tos; ++ xdst->u.rt.rt_route_iif = fl4->flowi4_iif; ++ xdst->u.rt.rt_iif = fl4->flowi4_iif; ++ xdst->u.rt.rt_oif = fl4->flowi4_oif; ++ xdst->u.rt.rt_mark = fl4->flowi4_mark; + + xdst->u.dst.dev = dev; + dev_hold(dev); +diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c +index 7c43e86..296510a 100644 +--- a/net/ipv6/tcp_ipv6.c ++++ b/net/ipv6/tcp_ipv6.c +@@ -605,7 +605,8 @@ static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer, + } + sk_nocaps_add(sk, NETIF_F_GSO_MASK); + } +- if (tcp_alloc_md5sig_pool(sk) == NULL) { ++ if (tp->md5sig_info->entries6 == 0 && ++ tcp_alloc_md5sig_pool(sk) == NULL) { + kfree(newkey); + return -ENOMEM; + } +@@ -614,8 +615,9 @@ static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer, + (tp->md5sig_info->entries6 + 1)), GFP_ATOMIC); + + if (!keys) { +- tcp_free_md5sig_pool(); + kfree(newkey); ++ if (tp->md5sig_info->entries6 == 0) ++ tcp_free_md5sig_pool(); + return -ENOMEM; + } + +@@ -661,6 +663,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer) + kfree(tp->md5sig_info->keys6); + tp->md5sig_info->keys6 = NULL; + tp->md5sig_info->alloced6 = 0; ++ tcp_free_md5sig_pool(); + } else { + /* shrink the database */ + if (tp->md5sig_info->entries6 != i) +@@ -669,7 +672,6 @@ static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer) + (tp->md5sig_info->entries6 - i) + * sizeof (tp->md5sig_info->keys6[0])); + } +- tcp_free_md5sig_pool(); + return 0; + } + } +@@ -1407,6 +1409,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, + newtp->af_specific = &tcp_sock_ipv6_mapped_specific; + #endif + ++ newnp->ipv6_ac_list = NULL; ++ newnp->ipv6_fl_list = NULL; + newnp->pktoptions = NULL; + newnp->opt = NULL; + newnp->mcast_oif = inet6_iif(skb); +@@ -1471,6 +1475,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, + First: no IPv4 options. + */ + newinet->inet_opt = NULL; ++ newnp->ipv6_ac_list = NULL; + newnp->ipv6_fl_list = NULL; + + /* Clone RX bits */ +diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c +index ed8a233..71c292e 100644 +--- a/net/l2tp/l2tp_core.c ++++ b/net/l2tp/l2tp_core.c +@@ -1045,8 +1045,10 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len + headroom = NET_SKB_PAD + sizeof(struct iphdr) + + uhlen + hdr_len; + old_headroom = skb_headroom(skb); +- if (skb_cow_head(skb, headroom)) ++ if (skb_cow_head(skb, headroom)) { ++ dev_kfree_skb(skb); + goto abort; ++ } + + new_headroom = skb_headroom(skb); + skb_orphan(skb); +diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c +index be70c70..143a006 100644 +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -1798,7 +1798,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb) + * so in that case userspace will have to deal with it. + */ + +- if (wk->offchan_tx.wait && wk->offchan_tx.frame) ++ if (wk->offchan_tx.wait && !wk->offchan_tx.status) + cfg80211_mgmt_tx_status(wk->sdata->dev, + (unsigned long) wk->offchan_tx.frame, + wk->ie, wk->ie_len, false, GFP_KERNEL); +diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h +index 090b0ec..3fdac77 100644 +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -328,6 +328,7 @@ struct ieee80211_work { + struct { + struct sk_buff *frame; + u32 wait; ++ bool status; + } offchan_tx; + }; + +@@ -372,6 +373,7 @@ struct ieee80211_if_managed { + + unsigned long timers_running; /* used for quiesce/restart */ + bool powersave; /* powersave requested for this iface */ ++ bool broken_ap; /* AP is broken -- turn off powersave */ + enum ieee80211_smps_mode req_smps, /* requested smps mode */ + ap_smps, /* smps mode AP thinks we're in */ + driver_smps_mode; /* smps mode request */ +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index 7a334fd..1563250 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -613,6 +613,9 @@ static bool ieee80211_powersave_allowed(struct ieee80211_sub_if_data *sdata) + if (!mgd->powersave) + return false; + ++ if (mgd->broken_ap) ++ return false; ++ + if (!mgd->associated) + return false; + +@@ -1450,10 +1453,21 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, + capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info); + + if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14))) +- printk(KERN_DEBUG "%s: invalid aid value %d; bits 15:14 not " +- "set\n", sdata->name, aid); ++ printk(KERN_DEBUG ++ "%s: invalid AID value 0x%x; bits 15:14 not set\n", ++ sdata->name, aid); + aid &= ~(BIT(15) | BIT(14)); + ++ ifmgd->broken_ap = false; ++ ++ if (aid == 0 || aid > IEEE80211_MAX_AID) { ++ printk(KERN_DEBUG ++ "%s: invalid AID value %d (out of range), turn off PS\n", ++ sdata->name, aid); ++ aid = 0; ++ ifmgd->broken_ap = true; ++ } ++ + pos = mgmt->u.assoc_resp.variable; + ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems); + +diff --git a/net/mac80211/status.c b/net/mac80211/status.c +index 1658efa..04cdbaf 100644 +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -336,7 +336,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) + continue; + if (wk->offchan_tx.frame != skb) + continue; +- wk->offchan_tx.frame = NULL; ++ wk->offchan_tx.status = true; + break; + } + rcu_read_unlock(); +diff --git a/net/mac80211/work.c b/net/mac80211/work.c +index d2e7f0e..52b758d 100644 +--- a/net/mac80211/work.c ++++ b/net/mac80211/work.c +@@ -553,7 +553,7 @@ ieee80211_offchannel_tx(struct ieee80211_work *wk) + /* + * After this, offchan_tx.frame remains but now is no + * longer a valid pointer -- we still need it as the +- * cookie for canceling this work. ++ * cookie for canceling this work/status matching. + */ + ieee80211_tx_skb(wk->sdata, wk->offchan_tx.frame); + +@@ -1060,14 +1060,13 @@ static void ieee80211_work_work(struct work_struct *work) + continue; + if (wk->chan != local->tmp_channel) + continue; +- if (ieee80211_work_ct_coexists(wk->chan_type, +- local->tmp_channel_type)) ++ if (!ieee80211_work_ct_coexists(wk->chan_type, ++ local->tmp_channel_type)) + continue; + remain_off_channel = true; + } + + if (!remain_off_channel && local->tmp_channel) { +- bool on_oper_chan = ieee80211_cfg_on_oper_channel(local); + local->tmp_channel = NULL; + /* If tmp_channel wasn't operating channel, then + * we need to go back on-channel. +@@ -1077,7 +1076,7 @@ static void ieee80211_work_work(struct work_struct *work) + * we still need to do a hardware config. Currently, + * we cannot be here while scanning, however. + */ +- if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan) ++ if (!ieee80211_cfg_on_oper_channel(local)) + ieee80211_hw_config(local, 0); + + /* At the least, we need to disable offchannel_ps, +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index c0c3cda..fafb968 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -654,7 +654,10 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, + return 0; + + drop_n_acct: +- po->stats.tp_drops = atomic_inc_return(&sk->sk_drops); ++ spin_lock(&sk->sk_receive_queue.lock); ++ po->stats.tp_drops++; ++ atomic_inc(&sk->sk_drops); ++ spin_unlock(&sk->sk_receive_queue.lock); + + drop_n_restore: + if (skb_head != skb->data && skb_shared(skb)) { +diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c +index 4cb70dc..e50502d 100644 +--- a/net/sunrpc/auth_unix.c ++++ b/net/sunrpc/auth_unix.c +@@ -129,6 +129,9 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags) + for (i = 0; i < groups ; i++) + if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i)) + return 0; ++ if (groups < NFS_NGROUPS && ++ cred->uc_gids[groups] != NOGROUP) ++ return 0; + return 1; + } + +diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c +index 5fdf10d..b1a3cee 100644 +--- a/scripts/kconfig/menu.c ++++ b/scripts/kconfig/menu.c +@@ -596,11 +596,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) + struct symbol *sym = menu->sym; + + if (menu_has_help(menu)) { +- if (sym->name) { ++ if (sym->name) + str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); +- str_append(help, _(menu_get_help(menu))); +- str_append(help, "\n"); +- } ++ str_append(help, _(menu_get_help(menu))); ++ str_append(help, "\n"); + } else { + str_append(help, nohelp_text); + } +diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c +index cf1fa36..3c2381c 100644 +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -136,6 +136,7 @@ struct conexant_spec { + unsigned int thinkpad:1; + unsigned int hp_laptop:1; + unsigned int asus:1; ++ unsigned int single_adc_amp:1; + + unsigned int adc_switching:1; + +@@ -4205,6 +4206,8 @@ static int cx_auto_add_capture_volume(struct hda_codec *codec, hda_nid_t nid, + int idx = get_input_connection(codec, adc_nid, nid); + if (idx < 0) + continue; ++ if (spec->single_adc_amp) ++ idx = 0; + return cx_auto_add_volume_idx(codec, label, pfx, + cidx, adc_nid, HDA_INPUT, idx); + } +@@ -4245,14 +4248,21 @@ static int cx_auto_build_input_controls(struct hda_codec *codec) + struct hda_input_mux *imux = &spec->private_imux; + const char *prev_label; + int input_conn[HDA_MAX_NUM_INPUTS]; +- int i, err, cidx; ++ int i, j, err, cidx; + int multi_connection; + ++ if (!imux->num_items) ++ return 0; ++ + multi_connection = 0; + for (i = 0; i < imux->num_items; i++) { + cidx = get_input_connection(codec, spec->imux_info[i].adc, + spec->imux_info[i].pin); +- input_conn[i] = (spec->imux_info[i].adc << 8) | cidx; ++ if (cidx < 0) ++ continue; ++ input_conn[i] = spec->imux_info[i].adc; ++ if (!spec->single_adc_amp) ++ input_conn[i] |= cidx << 8; + if (i > 0 && input_conn[i] != input_conn[0]) + multi_connection = 1; + } +@@ -4281,6 +4291,15 @@ static int cx_auto_build_input_controls(struct hda_codec *codec) + err = cx_auto_add_capture_volume(codec, nid, + "Capture", "", cidx); + } else { ++ bool dup_found = false; ++ for (j = 0; j < i; j++) { ++ if (input_conn[j] == input_conn[i]) { ++ dup_found = true; ++ break; ++ } ++ } ++ if (dup_found) ++ continue; + err = cx_auto_add_capture_volume(codec, nid, + label, " Capture", cidx); + } +@@ -4357,6 +4376,13 @@ static int patch_conexant_auto(struct hda_codec *codec) + return -ENOMEM; + codec->spec = spec; + codec->pin_amp_workaround = 1; ++ ++ switch (codec->vendor_id) { ++ case 0x14f15045: ++ spec->single_adc_amp = 1; ++ break; ++ } ++ + err = cx_auto_search_adcs(codec); + if (err < 0) + return err; +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 4c7cd6b..e7dc034 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2088,25 +2088,27 @@ static void alc_auto_init_digital(struct hda_codec *codec) + static void alc_auto_parse_digital(struct hda_codec *codec) + { + struct alc_spec *spec = codec->spec; +- int i, err; ++ int i, err, nums; + hda_nid_t dig_nid; + + /* support multiple SPDIFs; the secondary is set up as a slave */ ++ nums = 0; + for (i = 0; i < spec->autocfg.dig_outs; i++) { + err = snd_hda_get_connections(codec, + spec->autocfg.dig_out_pins[i], + &dig_nid, 1); +- if (err < 0) ++ if (err <= 0) + continue; +- if (!i) { ++ if (!nums) { + spec->multiout.dig_out_nid = dig_nid; + spec->dig_out_type = spec->autocfg.dig_out_type[0]; + } else { + spec->multiout.slave_dig_outs = spec->slave_dig_outs; +- if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1) ++ if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1) + break; +- spec->slave_dig_outs[i - 1] = dig_nid; ++ spec->slave_dig_outs[nums - 1] = dig_nid; + } ++ nums++; + } + + if (spec->autocfg.dig_in_pin) { +@@ -20126,6 +20128,8 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { + .patch = patch_alc882 }, + { .id = 0x10ec0662, .rev = 0x100101, .name = "ALC662 rev1", + .patch = patch_alc662 }, ++ { .id = 0x10ec0662, .rev = 0x100300, .name = "ALC662 rev3", ++ .patch = patch_alc662 }, + { .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 }, + { .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 }, + { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 }, +diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c +index 5c42f3e..5d2e97a 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -5425,9 +5425,7 @@ static void stac92hd8x_fill_auto_spec(struct hda_codec *codec) + static int patch_stac92hd83xxx(struct hda_codec *codec) + { + struct sigmatel_spec *spec; +- hda_nid_t conn[STAC92HD83_DAC_COUNT + 1]; + int err; +- int num_dacs; + + spec = kzalloc(sizeof(*spec), GFP_KERNEL); + if (spec == NULL) +@@ -5467,26 +5465,8 @@ again: + stac92xx_set_config_regs(codec, + stac92hd83xxx_brd_tbl[spec->board_config]); + +- switch (codec->vendor_id) { +- case 0x111d76d1: +- case 0x111d76d9: +- case 0x111d76df: +- case 0x111d76e5: +- case 0x111d7666: +- case 0x111d7667: +- case 0x111d7668: +- case 0x111d7669: +- case 0x111d76e3: +- case 0x111d7604: +- case 0x111d76d4: +- case 0x111d7605: +- case 0x111d76d5: +- case 0x111d76e7: +- if (spec->board_config == STAC_92HD83XXX_PWR_REF) +- break; ++ if (spec->board_config != STAC_92HD83XXX_PWR_REF) + spec->num_pwrs = 0; +- break; +- } + + codec->patch_ops = stac92xx_patch_ops; + +@@ -5506,7 +5486,11 @@ again: + } + #endif + +- err = stac92xx_parse_auto_config(codec, 0x1d, 0); ++ /* 92HD65/66 series has S/PDIF-IN */ ++ if (codec->vendor_id >= 0x111d76e8 && codec->vendor_id <= 0x111d76f3) ++ err = stac92xx_parse_auto_config(codec, 0x1d, 0x22); ++ else ++ err = stac92xx_parse_auto_config(codec, 0x1d, 0); + if (!err) { + if (spec->board_config < 0) { + printk(KERN_WARNING "hda_codec: No auto-config is " +@@ -5522,22 +5506,6 @@ again: + return err; + } + +- /* docking output support */ +- num_dacs = snd_hda_get_connections(codec, 0xF, +- conn, STAC92HD83_DAC_COUNT + 1) - 1; +- /* skip non-DAC connections */ +- while (num_dacs >= 0 && +- (get_wcaps_type(get_wcaps(codec, conn[num_dacs])) +- != AC_WID_AUD_OUT)) +- num_dacs--; +- /* set port E and F to select the last DAC */ +- if (num_dacs >= 0) { +- snd_hda_codec_write_cache(codec, 0xE, 0, +- AC_VERB_SET_CONNECT_SEL, num_dacs); +- snd_hda_codec_write_cache(codec, 0xF, 0, +- AC_VERB_SET_CONNECT_SEL, num_dacs); +- } +- + codec->proc_widget_hook = stac92hd_proc_hook; + + return 0; +@@ -6405,6 +6373,18 @@ static const struct hda_codec_preset snd_hda_preset_sigmatel[] = { + { .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76e8, .name = "92HD66B1X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76e9, .name = "92HD66B2X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76ea, .name = "92HD66B3X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76eb, .name = "92HD66C1X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76ec, .name = "92HD66C2X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76ed, .name = "92HD66C3X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76ee, .name = "92HD66B1X3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76ef, .name = "92HD66B2X3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76f0, .name = "92HD66B3X3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76f1, .name = "92HD66C1X3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76f2, .name = "92HD66C2X3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76f3, .name = "92HD66C3/65", .patch = patch_stac92hd83xxx}, + {} /* terminator */ + }; + +diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c +index e1a214e..65abd09 100644 +--- a/sound/soc/codecs/ak4535.c ++++ b/sound/soc/codecs/ak4535.c +@@ -40,11 +40,11 @@ struct ak4535_priv { + /* + * ak4535 register cache + */ +-static const u16 ak4535_reg[AK4535_CACHEREGNUM] = { +- 0x0000, 0x0080, 0x0000, 0x0003, +- 0x0002, 0x0000, 0x0011, 0x0001, +- 0x0000, 0x0040, 0x0036, 0x0010, +- 0x0000, 0x0000, 0x0057, 0x0000, ++static const u8 ak4535_reg[AK4535_CACHEREGNUM] = { ++ 0x00, 0x80, 0x00, 0x03, ++ 0x02, 0x00, 0x11, 0x01, ++ 0x00, 0x40, 0x36, 0x10, ++ 0x00, 0x00, 0x57, 0x00, + }; + + /* +diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c +index 65f4604..79c1b3d 100644 +--- a/sound/soc/codecs/ak4642.c ++++ b/sound/soc/codecs/ak4642.c +@@ -162,17 +162,17 @@ struct ak4642_priv { + /* + * ak4642 register cache + */ +-static const u16 ak4642_reg[AK4642_CACHEREGNUM] = { +- 0x0000, 0x0000, 0x0001, 0x0000, +- 0x0002, 0x0000, 0x0000, 0x0000, +- 0x00e1, 0x00e1, 0x0018, 0x0000, +- 0x00e1, 0x0018, 0x0011, 0x0008, +- 0x0000, 0x0000, 0x0000, 0x0000, +- 0x0000, 0x0000, 0x0000, 0x0000, +- 0x0000, 0x0000, 0x0000, 0x0000, +- 0x0000, 0x0000, 0x0000, 0x0000, +- 0x0000, 0x0000, 0x0000, 0x0000, +- 0x0000, ++static const u8 ak4642_reg[AK4642_CACHEREGNUM] = { ++ 0x00, 0x00, 0x01, 0x00, ++ 0x02, 0x00, 0x00, 0x00, ++ 0xe1, 0xe1, 0x18, 0x00, ++ 0xe1, 0x18, 0x11, 0x08, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, ++ 0x00, + }; + + /* +diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c +index a537e4a..1dae5c4 100644 +--- a/sound/soc/codecs/wm8711.c ++++ b/sound/soc/codecs/wm8711.c +@@ -150,7 +150,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream, + { + struct snd_soc_codec *codec = dai->codec; + struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); +- u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc; ++ u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3; + int i = get_coeff(wm8711->sysclk, params_rate(params)); + u16 srate = (coeff_div[i].sr << 2) | + (coeff_div[i].bosr << 1) | coeff_div[i].usb; +@@ -231,7 +231,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) + { + struct snd_soc_codec *codec = codec_dai->codec; +- u16 iface = 0; ++ u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c; + + /* set master/slave audio interface */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { +diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c +index 25af901..c173aee 100644 +--- a/sound/soc/codecs/wm8741.c ++++ b/sound/soc/codecs/wm8741.c +@@ -337,10 +337,10 @@ static int wm8741_set_dai_fmt(struct snd_soc_dai *codec_dai, + iface |= 0x0004; + break; + case SND_SOC_DAIFMT_DSP_A: +- iface |= 0x0003; ++ iface |= 0x000C; + break; + case SND_SOC_DAIFMT_DSP_B: +- iface |= 0x0013; ++ iface |= 0x001C; + break; + default: + return -EINVAL; +diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c +index 9b3bba4..0fce199 100644 +--- a/sound/soc/codecs/wm8904.c ++++ b/sound/soc/codecs/wm8904.c +@@ -868,7 +868,7 @@ SOC_ENUM("Right Capture Mode", rin_mode), + SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0, + WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0), + SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0, +- WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0), ++ WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1), + + SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0), + SOC_ENUM("High Pass Filter Mode", hpf_mode), +diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c +index 25580e3..d4ecb3f 100644 +--- a/sound/soc/codecs/wm8940.c ++++ b/sound/soc/codecs/wm8940.c +@@ -472,6 +472,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec, + break; + } + ++ codec->dapm.bias_level = level; ++ + return ret; + } + +diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c +index 5e05eed..4a0f666 100644 +--- a/sound/soc/codecs/wm8962.c ++++ b/sound/soc/codecs/wm8962.c +@@ -1957,7 +1957,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re + + static int wm8962_reset(struct snd_soc_codec *codec) + { +- return snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243); ++ int ret; ++ ++ ret = snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243); ++ if (ret != 0) ++ return ret; ++ ++ return snd_soc_write(codec, WM8962_PLL_SOFTWARE_RESET, 0); + } + + static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0); +@@ -2018,7 +2024,6 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); +- u16 *reg_cache = codec->reg_cache; + int ret; + + /* Apply the update (if any) */ +@@ -2027,16 +2032,19 @@ static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol, + return 0; + + /* If the left PGA is enabled hit that VU bit... */ +- if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTL_PGA_ENA) +- return snd_soc_write(codec, WM8962_SPKOUTL_VOLUME, +- reg_cache[WM8962_SPKOUTL_VOLUME]); ++ ret = snd_soc_read(codec, WM8962_PWR_MGMT_2); ++ if (ret & WM8962_SPKOUTL_PGA_ENA) { ++ snd_soc_write(codec, WM8962_SPKOUTL_VOLUME, ++ snd_soc_read(codec, WM8962_SPKOUTL_VOLUME)); ++ return 1; ++ } + + /* ...otherwise the right. The VU is stereo. */ +- if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_SPKOUTR_PGA_ENA) +- return snd_soc_write(codec, WM8962_SPKOUTR_VOLUME, +- reg_cache[WM8962_SPKOUTR_VOLUME]); ++ if (ret & WM8962_SPKOUTR_PGA_ENA) ++ snd_soc_write(codec, WM8962_SPKOUTR_VOLUME, ++ snd_soc_read(codec, WM8962_SPKOUTR_VOLUME)); + +- return 0; ++ return 1; + } + + static const char *cap_hpf_mode_text[] = { +@@ -2336,7 +2344,6 @@ static int out_pga_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) + { + struct snd_soc_codec *codec = w->codec; +- u16 *reg_cache = codec->reg_cache; + int reg; + + switch (w->shift) { +@@ -2359,7 +2366,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w, + + switch (event) { + case SND_SOC_DAPM_POST_PMU: +- return snd_soc_write(codec, reg, reg_cache[reg]); ++ return snd_soc_write(codec, reg, snd_soc_read(codec, reg)); + default: + BUG(); + return -EINVAL; +@@ -3027,9 +3034,9 @@ static int wm8962_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) + int aif0 = 0; + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { +- case SND_SOC_DAIFMT_DSP_A: +- aif0 |= WM8962_LRCLK_INV; + case SND_SOC_DAIFMT_DSP_B: ++ aif0 |= WM8962_LRCLK_INV | 3; ++ case SND_SOC_DAIFMT_DSP_A: + aif0 |= 3; + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { +@@ -3822,6 +3829,11 @@ static int wm8962_probe(struct snd_soc_codec *codec) + */ + snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0); + ++ /* Ensure that the oscillator and PLLs are disabled */ ++ snd_soc_update_bits(codec, WM8962_PLL2, ++ WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA, ++ 0); ++ + regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); + + if (pdata) { +diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c +index 83014a7..fb9f08a 100644 +--- a/sound/soc/codecs/wm8994.c ++++ b/sound/soc/codecs/wm8994.c +@@ -1266,7 +1266,7 @@ SND_SOC_DAPM_MUX("AIF2DAC Mux", SND_SOC_NOPM, 0, 0, &aif2dac_mux), + SND_SOC_DAPM_MUX("AIF2ADC Mux", SND_SOC_NOPM, 0, 0, &aif2adc_mux), + + SND_SOC_DAPM_AIF_IN("AIF3DACDAT", "AIF3 Playback", 0, SND_SOC_NOPM, 0, 0), +-SND_SOC_DAPM_AIF_IN("AIF3ADCDAT", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0), ++SND_SOC_DAPM_AIF_OUT("AIF3ADCDAT", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0), + + SND_SOC_DAPM_SUPPLY("TOCLK", WM8994_CLOCKING_1, 4, 0, NULL, 0), + +diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c +index fb5d68f..96c381e 100644 +--- a/sound/usb/misc/ua101.c ++++ b/sound/usb/misc/ua101.c +@@ -459,7 +459,8 @@ static void kill_stream_urbs(struct ua101_stream *stream) + unsigned int i; + + for (i = 0; i < stream->queue_length; ++i) +- usb_kill_urb(&stream->urbs[i]->urb); ++ if (stream->urbs[i]) ++ usb_kill_urb(&stream->urbs[i]->urb); + } + + static int enable_iso_interface(struct ua101 *ua, unsigned int intf_index) +@@ -484,6 +485,9 @@ static void disable_iso_interface(struct ua101 *ua, unsigned int intf_index) + { + struct usb_host_interface *alts; + ++ if (!ua->intf[intf_index]) ++ return; ++ + alts = ua->intf[intf_index]->cur_altsetting; + if (alts->desc.bAlternateSetting != 0) { + int err = usb_set_interface(ua->dev, +@@ -1144,27 +1148,37 @@ static void free_stream_urbs(struct ua101_stream *stream) + { + unsigned int i; + +- for (i = 0; i < stream->queue_length; ++i) ++ for (i = 0; i < stream->queue_length; ++i) { + kfree(stream->urbs[i]); ++ stream->urbs[i] = NULL; ++ } + } + + static void free_usb_related_resources(struct ua101 *ua, + struct usb_interface *interface) + { + unsigned int i; ++ struct usb_interface *intf; + ++ mutex_lock(&ua->mutex); + free_stream_urbs(&ua->capture); + free_stream_urbs(&ua->playback); ++ mutex_unlock(&ua->mutex); + free_stream_buffers(ua, &ua->capture); + free_stream_buffers(ua, &ua->playback); + +- for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) +- if (ua->intf[i]) { +- usb_set_intfdata(ua->intf[i], NULL); +- if (ua->intf[i] != interface) ++ for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) { ++ mutex_lock(&ua->mutex); ++ intf = ua->intf[i]; ++ ua->intf[i] = NULL; ++ mutex_unlock(&ua->mutex); ++ if (intf) { ++ usb_set_intfdata(intf, NULL); ++ if (intf != interface) + usb_driver_release_interface(&ua101_driver, +- ua->intf[i]); ++ intf); + } ++ } + } + + static void ua101_card_free(struct snd_card *card) +diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c +index f022316..8c50da8 100644 +--- a/tools/perf/util/probe-event.c ++++ b/tools/perf/util/probe-event.c +@@ -1869,8 +1869,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) + + pr_debug("Writing event: %s\n", buf); + ret = write(fd, buf, strlen(buf)); +- if (ret < 0) ++ if (ret < 0) { ++ ret = -errno; + goto error; ++ } + + printf("Remove event: %s\n", ent->s); + return 0; diff --git a/3.0.8/4420_grsecurity-2.2.2-3.0.8-201110250925.patch b/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch index 6dd81e4..036623b 100644 --- a/3.0.8/4420_grsecurity-2.2.2-3.0.8-201110250925.patch +++ b/3.0.9/4420_grsecurity-2.2.2-3.0.9-201111121310.patch @@ -1,6 +1,6 @@ -diff -urNp linux-3.0.8/arch/alpha/include/asm/elf.h linux-3.0.8/arch/alpha/include/asm/elf.h ---- linux-3.0.8/arch/alpha/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/alpha/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/alpha/include/asm/elf.h linux-3.0.9/arch/alpha/include/asm/elf.h +--- linux-3.0.9/arch/alpha/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/alpha/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -15,9 +15,9 @@ diff -urNp linux-3.0.8/arch/alpha/include/asm/elf.h linux-3.0.8/arch/alpha/inclu /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-3.0.8/arch/alpha/include/asm/pgtable.h linux-3.0.8/arch/alpha/include/asm/pgtable.h ---- linux-3.0.8/arch/alpha/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/alpha/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/alpha/include/asm/pgtable.h linux-3.0.9/arch/alpha/include/asm/pgtable.h +--- linux-3.0.9/arch/alpha/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/alpha/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500 @@ -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) @@ -36,9 +36,9 @@ diff -urNp linux-3.0.8/arch/alpha/include/asm/pgtable.h linux-3.0.8/arch/alpha/i #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-3.0.8/arch/alpha/kernel/module.c linux-3.0.8/arch/alpha/kernel/module.c ---- linux-3.0.8/arch/alpha/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/alpha/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/alpha/kernel/module.c linux-3.0.9/arch/alpha/kernel/module.c +--- linux-3.0.9/arch/alpha/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/alpha/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -48,9 +48,9 @@ diff -urNp linux-3.0.8/arch/alpha/kernel/module.c linux-3.0.8/arch/alpha/kernel/ got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-3.0.8/arch/alpha/kernel/osf_sys.c linux-3.0.8/arch/alpha/kernel/osf_sys.c ---- linux-3.0.8/arch/alpha/kernel/osf_sys.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/alpha/kernel/osf_sys.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/alpha/kernel/osf_sys.c linux-3.0.9/arch/alpha/kernel/osf_sys.c +--- linux-3.0.9/arch/alpha/kernel/osf_sys.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/alpha/kernel/osf_sys.c 2011-11-12 12:47:13.000000000 -0500 @@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a /* At this point: (!vma || addr < vma->vm_end). */ if (limit - len < addr) @@ -82,9 +82,9 @@ diff -urNp linux-3.0.8/arch/alpha/kernel/osf_sys.c linux-3.0.8/arch/alpha/kernel if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-3.0.8/arch/alpha/mm/fault.c linux-3.0.8/arch/alpha/mm/fault.c ---- linux-3.0.8/arch/alpha/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/alpha/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/alpha/mm/fault.c linux-3.0.9/arch/alpha/mm/fault.c +--- linux-3.0.9/arch/alpha/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/alpha/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -241,9 +241,9 @@ diff -urNp linux-3.0.8/arch/alpha/mm/fault.c linux-3.0.8/arch/alpha/mm/fault.c } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-3.0.8/arch/arm/include/asm/elf.h linux-3.0.8/arch/arm/include/asm/elf.h ---- linux-3.0.8/arch/arm/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/include/asm/elf.h linux-3.0.9/arch/arm/include/asm/elf.h +--- linux-3.0.9/arch/arm/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -116,7 +116,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. */ @@ -271,9 +271,9 @@ diff -urNp linux-3.0.8/arch/arm/include/asm/elf.h linux-3.0.8/arch/arm/include/a extern int vectors_user_mapping(void); #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping() #define ARCH_HAS_SETUP_ADDITIONAL_PAGES -diff -urNp linux-3.0.8/arch/arm/include/asm/kmap_types.h linux-3.0.8/arch/arm/include/asm/kmap_types.h ---- linux-3.0.8/arch/arm/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/include/asm/kmap_types.h linux-3.0.9/arch/arm/include/asm/kmap_types.h +--- linux-3.0.9/arch/arm/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -21,6 +21,7 @@ enum km_type { KM_L1_CACHE, KM_L2_CACHE, @@ -282,9 +282,9 @@ diff -urNp linux-3.0.8/arch/arm/include/asm/kmap_types.h linux-3.0.8/arch/arm/in KM_TYPE_NR }; -diff -urNp linux-3.0.8/arch/arm/include/asm/uaccess.h linux-3.0.8/arch/arm/include/asm/uaccess.h ---- linux-3.0.8/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/include/asm/uaccess.h linux-3.0.9/arch/arm/include/asm/uaccess.h +--- linux-3.0.9/arch/arm/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -22,6 +22,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -340,9 +340,9 @@ diff -urNp linux-3.0.8/arch/arm/include/asm/uaccess.h linux-3.0.8/arch/arm/inclu if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-3.0.8/arch/arm/kernel/armksyms.c linux-3.0.8/arch/arm/kernel/armksyms.c ---- linux-3.0.8/arch/arm/kernel/armksyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/kernel/armksyms.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/kernel/armksyms.c linux-3.0.9/arch/arm/kernel/armksyms.c +--- linux-3.0.9/arch/arm/kernel/armksyms.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/kernel/armksyms.c 2011-11-12 12:47:13.000000000 -0500 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user); #ifdef CONFIG_MMU EXPORT_SYMBOL(copy_page); @@ -354,9 +354,9 @@ diff -urNp linux-3.0.8/arch/arm/kernel/armksyms.c linux-3.0.8/arch/arm/kernel/ar EXPORT_SYMBOL(__clear_user); EXPORT_SYMBOL(__get_user_1); -diff -urNp linux-3.0.8/arch/arm/kernel/process.c linux-3.0.8/arch/arm/kernel/process.c ---- linux-3.0.8/arch/arm/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9/arch/arm/kernel/process.c +--- linux-3.0.9/arch/arm/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -28,7 +28,6 @@ #include <linux/tick.h> #include <linux/utsname.h> @@ -378,9 +378,9 @@ diff -urNp linux-3.0.8/arch/arm/kernel/process.c linux-3.0.8/arch/arm/kernel/pro #ifdef CONFIG_MMU /* * The vectors page is always readable from user space for the -diff -urNp linux-3.0.8/arch/arm/kernel/traps.c linux-3.0.8/arch/arm/kernel/traps.c ---- linux-3.0.8/arch/arm/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9/arch/arm/kernel/traps.c +--- linux-3.0.9/arch/arm/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500 @@ -257,6 +257,8 @@ static int __die(const char *str, int er static DEFINE_SPINLOCK(die_lock); @@ -400,9 +400,9 @@ diff -urNp linux-3.0.8/arch/arm/kernel/traps.c linux-3.0.8/arch/arm/kernel/traps if (ret != NOTIFY_STOP) do_exit(SIGSEGV); } -diff -urNp linux-3.0.8/arch/arm/lib/copy_from_user.S linux-3.0.8/arch/arm/lib/copy_from_user.S ---- linux-3.0.8/arch/arm/lib/copy_from_user.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/lib/copy_from_user.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/lib/copy_from_user.S linux-3.0.9/arch/arm/lib/copy_from_user.S +--- linux-3.0.9/arch/arm/lib/copy_from_user.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/lib/copy_from_user.S 2011-11-12 12:47:13.000000000 -0500 @@ -16,7 +16,7 @@ /* * Prototype: @@ -426,9 +426,9 @@ diff -urNp linux-3.0.8/arch/arm/lib/copy_from_user.S linux-3.0.8/arch/arm/lib/co .pushsection .fixup,"ax" .align 0 -diff -urNp linux-3.0.8/arch/arm/lib/copy_to_user.S linux-3.0.8/arch/arm/lib/copy_to_user.S ---- linux-3.0.8/arch/arm/lib/copy_to_user.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/lib/copy_to_user.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/lib/copy_to_user.S linux-3.0.9/arch/arm/lib/copy_to_user.S +--- linux-3.0.9/arch/arm/lib/copy_to_user.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/lib/copy_to_user.S 2011-11-12 12:47:13.000000000 -0500 @@ -16,7 +16,7 @@ /* * Prototype: @@ -452,9 +452,9 @@ diff -urNp linux-3.0.8/arch/arm/lib/copy_to_user.S linux-3.0.8/arch/arm/lib/copy ENDPROC(__copy_to_user_std) .pushsection .fixup,"ax" -diff -urNp linux-3.0.8/arch/arm/lib/uaccess.S linux-3.0.8/arch/arm/lib/uaccess.S ---- linux-3.0.8/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/lib/uaccess.S linux-3.0.9/arch/arm/lib/uaccess.S +--- linux-3.0.9/arch/arm/lib/uaccess.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/lib/uaccess.S 2011-11-12 12:47:13.000000000 -0500 @@ -20,7 +20,7 @@ #define PAGE_SHIFT 12 @@ -508,9 +508,9 @@ diff -urNp linux-3.0.8/arch/arm/lib/uaccess.S linux-3.0.8/arch/arm/lib/uaccess.S .pushsection .fixup,"ax" .align 0 -diff -urNp linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c ---- linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c +--- linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/lib/uaccess_with_memcpy.c 2011-11-12 12:47:13.000000000 -0500 @@ -103,7 +103,7 @@ out: } @@ -520,9 +520,9 @@ diff -urNp linux-3.0.8/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.8/arch/arm/l { /* * This test is stubbed out of the main function above to keep -diff -urNp linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c ---- linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c +--- linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/mach-ux500/mbox-db5500.c 2011-11-12 12:47:13.000000000 -0500 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev return sprintf(buf, "0x%X\n", mbox_value); } @@ -532,9 +532,9 @@ diff -urNp linux-3.0.8/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.8/arch/arm/ma static int mbox_show(struct seq_file *s, void *data) { -diff -urNp linux-3.0.8/arch/arm/mm/fault.c linux-3.0.8/arch/arm/mm/fault.c ---- linux-3.0.8/arch/arm/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/mm/fault.c linux-3.0.9/arch/arm/mm/fault.c +--- linux-3.0.9/arch/arm/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk, } #endif @@ -583,9 +583,9 @@ diff -urNp linux-3.0.8/arch/arm/mm/fault.c linux-3.0.8/arch/arm/mm/fault.c /* * First Level Translation Fault Handler * -diff -urNp linux-3.0.8/arch/arm/mm/mmap.c linux-3.0.8/arch/arm/mm/mmap.c ---- linux-3.0.8/arch/arm/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/arm/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/arm/mm/mmap.c linux-3.0.9/arch/arm/mm/mmap.c +--- linux-3.0.9/arch/arm/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/arm/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -635,9 +635,9 @@ diff -urNp linux-3.0.8/arch/arm/mm/mmap.c linux-3.0.8/arch/arm/mm/mmap.c /* * Remember the place where we stopped the search: */ -diff -urNp linux-3.0.8/arch/avr32/include/asm/elf.h linux-3.0.8/arch/avr32/include/asm/elf.h ---- linux-3.0.8/arch/avr32/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/avr32/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/avr32/include/asm/elf.h linux-3.0.9/arch/avr32/include/asm/elf.h +--- linux-3.0.9/arch/avr32/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/avr32/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -84,8 +84,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. */ @@ -654,9 +654,9 @@ diff -urNp linux-3.0.8/arch/avr32/include/asm/elf.h linux-3.0.8/arch/avr32/inclu /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-3.0.8/arch/avr32/include/asm/kmap_types.h linux-3.0.8/arch/avr32/include/asm/kmap_types.h ---- linux-3.0.8/arch/avr32/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/avr32/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/avr32/include/asm/kmap_types.h linux-3.0.9/arch/avr32/include/asm/kmap_types.h +--- linux-3.0.9/arch/avr32/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/avr32/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -667,9 +667,9 @@ diff -urNp linux-3.0.8/arch/avr32/include/asm/kmap_types.h linux-3.0.8/arch/avr3 }; #undef D -diff -urNp linux-3.0.8/arch/avr32/mm/fault.c linux-3.0.8/arch/avr32/mm/fault.c ---- linux-3.0.8/arch/avr32/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/avr32/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/avr32/mm/fault.c linux-3.0.9/arch/avr32/mm/fault.c +--- linux-3.0.9/arch/avr32/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/avr32/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -711,9 +711,9 @@ diff -urNp linux-3.0.8/arch/avr32/mm/fault.c linux-3.0.8/arch/avr32/mm/fault.c if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-3.0.8/arch/frv/include/asm/kmap_types.h linux-3.0.8/arch/frv/include/asm/kmap_types.h ---- linux-3.0.8/arch/frv/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/frv/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/frv/include/asm/kmap_types.h linux-3.0.9/arch/frv/include/asm/kmap_types.h +--- linux-3.0.9/arch/frv/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/frv/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -722,9 +722,9 @@ diff -urNp linux-3.0.8/arch/frv/include/asm/kmap_types.h linux-3.0.8/arch/frv/in KM_TYPE_NR }; -diff -urNp linux-3.0.8/arch/frv/mm/elf-fdpic.c linux-3.0.8/arch/frv/mm/elf-fdpic.c ---- linux-3.0.8/arch/frv/mm/elf-fdpic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/frv/mm/elf-fdpic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/frv/mm/elf-fdpic.c linux-3.0.9/arch/frv/mm/elf-fdpic.c +--- linux-3.0.9/arch/frv/mm/elf-fdpic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/frv/mm/elf-fdpic.c 2011-11-12 12:47:13.000000000 -0500 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str if (addr) { addr = PAGE_ALIGN(addr); @@ -753,9 +753,9 @@ diff -urNp linux-3.0.8/arch/frv/mm/elf-fdpic.c linux-3.0.8/arch/frv/mm/elf-fdpic goto success; addr = vma->vm_end; } -diff -urNp linux-3.0.8/arch/ia64/include/asm/elf.h linux-3.0.8/arch/ia64/include/asm/elf.h ---- linux-3.0.8/arch/ia64/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/include/asm/elf.h linux-3.0.9/arch/ia64/include/asm/elf.h +--- linux-3.0.9/arch/ia64/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -42,6 +42,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -770,9 +770,9 @@ diff -urNp linux-3.0.8/arch/ia64/include/asm/elf.h linux-3.0.8/arch/ia64/include #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-3.0.8/arch/ia64/include/asm/pgtable.h linux-3.0.8/arch/ia64/include/asm/pgtable.h ---- linux-3.0.8/arch/ia64/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/include/asm/pgtable.h linux-3.0.9/arch/ia64/include/asm/pgtable.h +--- linux-3.0.9/arch/ia64/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500 @@ -12,7 +12,7 @@ * David Mosberger-Tang <davidm@hpl.hp.com> */ @@ -800,9 +800,9 @@ diff -urNp linux-3.0.8/arch/ia64/include/asm/pgtable.h linux-3.0.8/arch/ia64/inc #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-3.0.8/arch/ia64/include/asm/spinlock.h linux-3.0.8/arch/ia64/include/asm/spinlock.h ---- linux-3.0.8/arch/ia64/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/include/asm/spinlock.h linux-3.0.9/arch/ia64/include/asm/spinlock.h +--- linux-3.0.9/arch/ia64/include/asm/spinlock.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/include/asm/spinlock.h 2011-11-12 12:47:13.000000000 -0500 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi unsigned short *p = (unsigned short *)&lock->lock + 1, tmp; @@ -812,9 +812,9 @@ diff -urNp linux-3.0.8/arch/ia64/include/asm/spinlock.h linux-3.0.8/arch/ia64/in } static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock) -diff -urNp linux-3.0.8/arch/ia64/include/asm/uaccess.h linux-3.0.8/arch/ia64/include/asm/uaccess.h ---- linux-3.0.8/arch/ia64/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/include/asm/uaccess.h linux-3.0.9/arch/ia64/include/asm/uaccess.h +--- linux-3.0.9/arch/ia64/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -833,9 +833,9 @@ diff -urNp linux-3.0.8/arch/ia64/include/asm/uaccess.h linux-3.0.8/arch/ia64/inc __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-3.0.8/arch/ia64/kernel/module.c linux-3.0.8/arch/ia64/kernel/module.c ---- linux-3.0.8/arch/ia64/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/kernel/module.c linux-3.0.9/arch/ia64/kernel/module.c +--- linux-3.0.9/arch/ia64/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -924,9 +924,9 @@ diff -urNp linux-3.0.8/arch/ia64/kernel/module.c linux-3.0.8/arch/ia64/kernel/mo mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-3.0.8/arch/ia64/kernel/sys_ia64.c linux-3.0.8/arch/ia64/kernel/sys_ia64.c ---- linux-3.0.8/arch/ia64/kernel/sys_ia64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/kernel/sys_ia64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/kernel/sys_ia64.c linux-3.0.9/arch/ia64/kernel/sys_ia64.c +--- linux-3.0.9/arch/ia64/kernel/sys_ia64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/kernel/sys_ia64.c 2011-11-12 12:47:13.000000000 -0500 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -959,9 +959,9 @@ diff -urNp linux-3.0.8/arch/ia64/kernel/sys_ia64.c linux-3.0.8/arch/ia64/kernel/ /* Remember the address where we stopped this search: */ mm->free_area_cache = addr + len; return addr; -diff -urNp linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S ---- linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S +--- linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/kernel/vmlinux.lds.S 2011-11-12 12:47:13.000000000 -0500 @@ -199,7 +199,7 @@ SECTIONS { /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -971,9 +971,9 @@ diff -urNp linux-3.0.8/arch/ia64/kernel/vmlinux.lds.S linux-3.0.8/arch/ia64/kern /* * ensure percpu data fits * into percpu page size -diff -urNp linux-3.0.8/arch/ia64/mm/fault.c linux-3.0.8/arch/ia64/mm/fault.c ---- linux-3.0.8/arch/ia64/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9/arch/ia64/mm/fault.c +--- linux-3.0.9/arch/ia64/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1023,9 +1023,9 @@ diff -urNp linux-3.0.8/arch/ia64/mm/fault.c linux-3.0.8/arch/ia64/mm/fault.c /* * If for any reason at all we couldn't handle the fault, make * sure we exit gracefully rather than endlessly redo the -diff -urNp linux-3.0.8/arch/ia64/mm/hugetlbpage.c linux-3.0.8/arch/ia64/mm/hugetlbpage.c ---- linux-3.0.8/arch/ia64/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/mm/hugetlbpage.c linux-3.0.9/arch/ia64/mm/hugetlbpage.c +--- linux-3.0.9/arch/ia64/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area( /* At this point: (!vmm || addr < vmm->vm_end). */ if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) @@ -1035,9 +1035,9 @@ diff -urNp linux-3.0.8/arch/ia64/mm/hugetlbpage.c linux-3.0.8/arch/ia64/mm/huget return addr; addr = ALIGN(vmm->vm_end, HPAGE_SIZE); } -diff -urNp linux-3.0.8/arch/ia64/mm/init.c linux-3.0.8/arch/ia64/mm/init.c ---- linux-3.0.8/arch/ia64/mm/init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/ia64/mm/init.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/ia64/mm/init.c linux-3.0.9/arch/ia64/mm/init.c +--- linux-3.0.9/arch/ia64/mm/init.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/ia64/mm/init.c 2011-11-12 12:47:13.000000000 -0500 @@ -120,6 +120,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; @@ -1058,9 +1058,9 @@ diff -urNp linux-3.0.8/arch/ia64/mm/init.c linux-3.0.8/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-3.0.8/arch/m32r/lib/usercopy.c linux-3.0.8/arch/m32r/lib/usercopy.c ---- linux-3.0.8/arch/m32r/lib/usercopy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/m32r/lib/usercopy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/m32r/lib/usercopy.c linux-3.0.9/arch/m32r/lib/usercopy.c +--- linux-3.0.9/arch/m32r/lib/usercopy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/m32r/lib/usercopy.c 2011-11-12 12:47:13.000000000 -0500 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1081,9 +1081,9 @@ diff -urNp linux-3.0.8/arch/m32r/lib/usercopy.c linux-3.0.8/arch/m32r/lib/userco prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-3.0.8/arch/mips/include/asm/elf.h linux-3.0.8/arch/mips/include/asm/elf.h ---- linux-3.0.8/arch/mips/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/include/asm/elf.h linux-3.0.9/arch/mips/include/asm/elf.h +--- linux-3.0.9/arch/mips/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -372,13 +372,16 @@ extern const char *__elf_platform; #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1105,9 +1105,9 @@ diff -urNp linux-3.0.8/arch/mips/include/asm/elf.h linux-3.0.8/arch/mips/include -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_ELF_H */ -diff -urNp linux-3.0.8/arch/mips/include/asm/page.h linux-3.0.8/arch/mips/include/asm/page.h ---- linux-3.0.8/arch/mips/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/include/asm/page.h linux-3.0.9/arch/mips/include/asm/page.h +--- linux-3.0.9/arch/mips/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500 @@ -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; @@ -1117,9 +1117,9 @@ diff -urNp linux-3.0.8/arch/mips/include/asm/page.h linux-3.0.8/arch/mips/includ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-3.0.8/arch/mips/include/asm/system.h linux-3.0.8/arch/mips/include/asm/system.h ---- linux-3.0.8/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/include/asm/system.h linux-3.0.9/arch/mips/include/asm/system.h +--- linux-3.0.9/arch/mips/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1128,9 +1128,9 @@ diff -urNp linux-3.0.8/arch/mips/include/asm/system.h linux-3.0.8/arch/mips/incl +#define arch_align_stack(x) ((x) & ~0xfUL) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c ---- linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c +--- linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/kernel/binfmt_elfn32.c 2011-11-12 12:47:13.000000000 -0500 @@ -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) @@ -1145,9 +1145,9 @@ diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfn32.c linux-3.0.8/arch/mips/ke #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c ---- linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c +--- linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/kernel/binfmt_elfo32.c 2011-11-12 12:47:13.000000000 -0500 @@ -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) @@ -1162,9 +1162,9 @@ diff -urNp linux-3.0.8/arch/mips/kernel/binfmt_elfo32.c linux-3.0.8/arch/mips/ke #include <asm/processor.h> /* -diff -urNp linux-3.0.8/arch/mips/kernel/process.c linux-3.0.8/arch/mips/kernel/process.c ---- linux-3.0.8/arch/mips/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/kernel/process.c linux-3.0.9/arch/mips/kernel/process.c +--- linux-3.0.9/arch/mips/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1181,9 +1181,9 @@ diff -urNp linux-3.0.8/arch/mips/kernel/process.c linux-3.0.8/arch/mips/kernel/p - - return sp & ALMASK; -} -diff -urNp linux-3.0.8/arch/mips/mm/fault.c linux-3.0.8/arch/mips/mm/fault.c ---- linux-3.0.8/arch/mips/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/mm/fault.c linux-3.0.9/arch/mips/mm/fault.c +--- linux-3.0.9/arch/mips/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -28,6 +28,23 @@ #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> @@ -1208,9 +1208,9 @@ diff -urNp linux-3.0.8/arch/mips/mm/fault.c linux-3.0.8/arch/mips/mm/fault.c /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-3.0.8/arch/mips/mm/mmap.c linux-3.0.8/arch/mips/mm/mmap.c ---- linux-3.0.8/arch/mips/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/mips/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/mips/mm/mmap.c linux-3.0.9/arch/mips/mm/mmap.c +--- linux-3.0.9/arch/mips/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/mips/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500 @@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1272,9 +1272,9 @@ diff -urNp linux-3.0.8/arch/mips/mm/mmap.c linux-3.0.8/arch/mips/mm/mmap.c - - return ret; -} -diff -urNp linux-3.0.8/arch/parisc/include/asm/elf.h linux-3.0.8/arch/parisc/include/asm/elf.h ---- linux-3.0.8/arch/parisc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/include/asm/elf.h linux-3.0.9/arch/parisc/include/asm/elf.h +--- linux-3.0.9/arch/parisc/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1289,9 +1289,9 @@ diff -urNp linux-3.0.8/arch/parisc/include/asm/elf.h linux-3.0.8/arch/parisc/inc /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-3.0.8/arch/parisc/include/asm/pgtable.h linux-3.0.8/arch/parisc/include/asm/pgtable.h ---- linux-3.0.8/arch/parisc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/include/asm/pgtable.h linux-3.0.9/arch/parisc/include/asm/pgtable.h +--- linux-3.0.9/arch/parisc/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500 @@ -210,6 +210,17 @@ struct vm_area_struct; #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1310,9 +1310,9 @@ diff -urNp linux-3.0.8/arch/parisc/include/asm/pgtable.h linux-3.0.8/arch/parisc #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC) #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX) -diff -urNp linux-3.0.8/arch/parisc/kernel/module.c linux-3.0.8/arch/parisc/kernel/module.c ---- linux-3.0.8/arch/parisc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/kernel/module.c linux-3.0.9/arch/parisc/kernel/module.c +--- linux-3.0.9/arch/parisc/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -98,16 +98,38 @@ /* three functions to determine where in the module core @@ -1413,9 +1413,9 @@ diff -urNp linux-3.0.8/arch/parisc/kernel/module.c linux-3.0.8/arch/parisc/kerne DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-3.0.8/arch/parisc/kernel/sys_parisc.c linux-3.0.8/arch/parisc/kernel/sys_parisc.c ---- linux-3.0.8/arch/parisc/kernel/sys_parisc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/kernel/sys_parisc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/kernel/sys_parisc.c linux-3.0.9/arch/parisc/kernel/sys_parisc.c +--- linux-3.0.9/arch/parisc/kernel/sys_parisc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/kernel/sys_parisc.c 2011-11-12 12:47:13.000000000 -0500 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u /* At this point: (!vma || addr < vma->vm_end). */ if (TASK_SIZE - len < addr) @@ -1443,9 +1443,9 @@ diff -urNp linux-3.0.8/arch/parisc/kernel/sys_parisc.c linux-3.0.8/arch/parisc/k if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-3.0.8/arch/parisc/kernel/traps.c linux-3.0.8/arch/parisc/kernel/traps.c ---- linux-3.0.8/arch/parisc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/kernel/traps.c linux-3.0.9/arch/parisc/kernel/traps.c +--- linux-3.0.9/arch/parisc/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1457,9 +1457,9 @@ diff -urNp linux-3.0.8/arch/parisc/kernel/traps.c linux-3.0.8/arch/parisc/kernel fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-3.0.8/arch/parisc/mm/fault.c linux-3.0.8/arch/parisc/mm/fault.c ---- linux-3.0.8/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/parisc/mm/fault.c linux-3.0.9/arch/parisc/mm/fault.c +--- linux-3.0.9/arch/parisc/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/parisc/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1629,9 +1629,9 @@ diff -urNp linux-3.0.8/arch/parisc/mm/fault.c linux-3.0.8/arch/parisc/mm/fault.c /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-3.0.8/arch/powerpc/include/asm/elf.h linux-3.0.8/arch/powerpc/include/asm/elf.h ---- linux-3.0.8/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/elf.h linux-3.0.9/arch/powerpc/include/asm/elf.h +--- linux-3.0.9/arch/powerpc/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -178,8 +178,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. */ @@ -1664,9 +1664,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/elf.h linux-3.0.8/arch/powerpc/i #endif /* __KERNEL__ */ /* -diff -urNp linux-3.0.8/arch/powerpc/include/asm/kmap_types.h linux-3.0.8/arch/powerpc/include/asm/kmap_types.h ---- linux-3.0.8/arch/powerpc/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/kmap_types.h linux-3.0.9/arch/powerpc/include/asm/kmap_types.h +--- linux-3.0.9/arch/powerpc/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -27,6 +27,7 @@ enum km_type { KM_PPC_SYNC_PAGE, KM_PPC_SYNC_ICACHE, @@ -1675,9 +1675,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/kmap_types.h linux-3.0.8/arch/po KM_TYPE_NR }; -diff -urNp linux-3.0.8/arch/powerpc/include/asm/mman.h linux-3.0.8/arch/powerpc/include/asm/mman.h ---- linux-3.0.8/arch/powerpc/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/mman.h linux-3.0.9/arch/powerpc/include/asm/mman.h +--- linux-3.0.9/arch/powerpc/include/asm/mman.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/mman.h 2011-11-12 12:47:13.000000000 -0500 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm } #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot) @@ -1687,9 +1687,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/mman.h linux-3.0.8/arch/powerpc/ { return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0); } -diff -urNp linux-3.0.8/arch/powerpc/include/asm/page_64.h linux-3.0.8/arch/powerpc/include/asm/page_64.h ---- linux-3.0.8/arch/powerpc/include/asm/page_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/page_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/page_64.h linux-3.0.9/arch/powerpc/include/asm/page_64.h +--- linux-3.0.9/arch/powerpc/include/asm/page_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/page_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -155,15 +155,18 @@ do { \ * stack by default, so in the absence of a PT_GNU_STACK program header * we turn execute permission off. @@ -1711,9 +1711,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/page_64.h linux-3.0.8/arch/power #include <asm-generic/getorder.h> -diff -urNp linux-3.0.8/arch/powerpc/include/asm/page.h linux-3.0.8/arch/powerpc/include/asm/page.h ---- linux-3.0.8/arch/powerpc/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/page.h linux-3.0.9/arch/powerpc/include/asm/page.h +--- linux-3.0.9/arch/powerpc/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -1736,9 +1736,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/page.h linux-3.0.8/arch/powerpc/ #ifndef __ASSEMBLY__ #undef STRICT_MM_TYPECHECKS -diff -urNp linux-3.0.8/arch/powerpc/include/asm/pgtable.h linux-3.0.8/arch/powerpc/include/asm/pgtable.h ---- linux-3.0.8/arch/powerpc/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/pgtable.h linux-3.0.9/arch/powerpc/include/asm/pgtable.h +--- linux-3.0.9/arch/powerpc/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500 @@ -2,6 +2,7 @@ #define _ASM_POWERPC_PGTABLE_H #ifdef __KERNEL__ @@ -1747,9 +1747,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/pgtable.h linux-3.0.8/arch/power #ifndef __ASSEMBLY__ #include <asm/processor.h> /* For TASK_SIZE */ #include <asm/mmu.h> -diff -urNp linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h ---- linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h +--- linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/pte-hash32.h 2011-11-12 12:47:13.000000000 -0500 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -1758,9 +1758,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/pte-hash32.h linux-3.0.8/arch/po #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-3.0.8/arch/powerpc/include/asm/reg.h linux-3.0.8/arch/powerpc/include/asm/reg.h ---- linux-3.0.8/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/reg.h linux-3.0.9/arch/powerpc/include/asm/reg.h +--- linux-3.0.9/arch/powerpc/include/asm/reg.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/reg.h 2011-11-12 12:47:13.000000000 -0500 @@ -209,6 +209,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -1769,9 +1769,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/reg.h linux-3.0.8/arch/powerpc/i #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-3.0.8/arch/powerpc/include/asm/system.h linux-3.0.8/arch/powerpc/include/asm/system.h ---- linux-3.0.8/arch/powerpc/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/system.h linux-3.0.9/arch/powerpc/include/asm/system.h +--- linux-3.0.9/arch/powerpc/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #endif @@ -1781,9 +1781,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/system.h linux-3.0.8/arch/powerp /* Used in very early kernel initialization. */ extern unsigned long reloc_offset(void); -diff -urNp linux-3.0.8/arch/powerpc/include/asm/uaccess.h linux-3.0.8/arch/powerpc/include/asm/uaccess.h ---- linux-3.0.8/arch/powerpc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/include/asm/uaccess.h linux-3.0.9/arch/powerpc/include/asm/uaccess.h +--- linux-3.0.9/arch/powerpc/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -13,6 +13,8 @@ #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -1961,9 +1961,9 @@ diff -urNp linux-3.0.8/arch/powerpc/include/asm/uaccess.h linux-3.0.8/arch/power extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S ---- linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S +--- linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/exceptions-64e.S 2011-11-12 12:47:13.000000000 -0500 @@ -567,6 +567,7 @@ storage_fault_common: std r14,_DAR(r1) std r15,_DSISR(r1) @@ -1982,9 +1982,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64e.S linux-3.0.8/arch/pow addi r3,r1,STACK_FRAME_OVERHEAD ld r4,_DAR(r1) bl .bad_page_fault -diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S ---- linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S +--- linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/exceptions-64s.S 2011-11-12 12:47:13.000000000 -0500 @@ -956,10 +956,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) @@ -1997,9 +1997,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/exceptions-64s.S linux-3.0.8/arch/pow mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD lwz r4,_DAR(r1) -diff -urNp linux-3.0.8/arch/powerpc/kernel/module_32.c linux-3.0.8/arch/powerpc/kernel/module_32.c ---- linux-3.0.8/arch/powerpc/kernel/module_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/module_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/module_32.c linux-3.0.9/arch/powerpc/kernel/module_32.c +--- linux-3.0.9/arch/powerpc/kernel/module_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/module_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2029,9 +2029,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/module_32.c linux-3.0.8/arch/powerpc/ /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-3.0.8/arch/powerpc/kernel/module.c linux-3.0.8/arch/powerpc/kernel/module.c ---- linux-3.0.8/arch/powerpc/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/module.c linux-3.0.9/arch/powerpc/kernel/module.c +--- linux-3.0.9/arch/powerpc/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -31,11 +31,24 @@ LIST_HEAD(module_bug_list); @@ -2071,9 +2071,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/module.c linux-3.0.8/arch/powerpc/ker static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name) -diff -urNp linux-3.0.8/arch/powerpc/kernel/process.c linux-3.0.8/arch/powerpc/kernel/process.c ---- linux-3.0.8/arch/powerpc/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/process.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/process.c linux-3.0.9/arch/powerpc/kernel/process.c +--- linux-3.0.9/arch/powerpc/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing @@ -2166,9 +2166,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/process.c linux-3.0.8/arch/powerpc/ke - - return ret; -} -diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_32.c linux-3.0.8/arch/powerpc/kernel/signal_32.c ---- linux-3.0.8/arch/powerpc/kernel/signal_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/signal_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_32.c linux-3.0.9/arch/powerpc/kernel/signal_32.c +--- linux-3.0.9/arch/powerpc/kernel/signal_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/signal_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2178,9 +2178,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_32.c linux-3.0.8/arch/powerpc/ if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_64.c linux-3.0.8/arch/powerpc/kernel/signal_64.c ---- linux-3.0.8/arch/powerpc/kernel/signal_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/signal_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/signal_64.c linux-3.0.9/arch/powerpc/kernel/signal_64.c +--- linux-3.0.9/arch/powerpc/kernel/signal_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/signal_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2190,9 +2190,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/signal_64.c linux-3.0.8/arch/powerpc/ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-3.0.8/arch/powerpc/kernel/traps.c linux-3.0.8/arch/powerpc/kernel/traps.c ---- linux-3.0.8/arch/powerpc/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/traps.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/traps.c linux-3.0.9/arch/powerpc/kernel/traps.c +--- linux-3.0.9/arch/powerpc/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void) static inline void pmac_backlight_unblank(void) { } #endif @@ -2211,9 +2211,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/traps.c linux-3.0.8/arch/powerpc/kern oops_exit(); do_exit(err); -diff -urNp linux-3.0.8/arch/powerpc/kernel/vdso.c linux-3.0.8/arch/powerpc/kernel/vdso.c ---- linux-3.0.8/arch/powerpc/kernel/vdso.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/kernel/vdso.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/kernel/vdso.c linux-3.0.9/arch/powerpc/kernel/vdso.c +--- linux-3.0.9/arch/powerpc/kernel/vdso.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/kernel/vdso.c 2011-11-12 12:47:13.000000000 -0500 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2240,9 +2240,9 @@ diff -urNp linux-3.0.8/arch/powerpc/kernel/vdso.c linux-3.0.8/arch/powerpc/kerne if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-3.0.8/arch/powerpc/lib/usercopy_64.c linux-3.0.8/arch/powerpc/lib/usercopy_64.c ---- linux-3.0.8/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/lib/usercopy_64.c linux-3.0.9/arch/powerpc/lib/usercopy_64.c +--- linux-3.0.9/arch/powerpc/lib/usercopy_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/lib/usercopy_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2274,9 +2274,9 @@ diff -urNp linux-3.0.8/arch/powerpc/lib/usercopy_64.c linux-3.0.8/arch/powerpc/l -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-3.0.8/arch/powerpc/mm/fault.c linux-3.0.8/arch/powerpc/mm/fault.c ---- linux-3.0.8/arch/powerpc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/mm/fault.c linux-3.0.9/arch/powerpc/mm/fault.c +--- linux-3.0.9/arch/powerpc/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -32,6 +32,10 @@ #include <linux/perf_event.h> #include <linux/magic.h> @@ -2381,9 +2381,9 @@ diff -urNp linux-3.0.8/arch/powerpc/mm/fault.c linux-3.0.8/arch/powerpc/mm/fault _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-3.0.8/arch/powerpc/mm/mmap_64.c linux-3.0.8/arch/powerpc/mm/mmap_64.c ---- linux-3.0.8/arch/powerpc/mm/mmap_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/mm/mmap_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/mm/mmap_64.c linux-3.0.9/arch/powerpc/mm/mmap_64.c +--- linux-3.0.9/arch/powerpc/mm/mmap_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/mm/mmap_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2407,9 +2407,9 @@ diff -urNp linux-3.0.8/arch/powerpc/mm/mmap_64.c linux-3.0.8/arch/powerpc/mm/mma mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.8/arch/powerpc/mm/slice.c linux-3.0.8/arch/powerpc/mm/slice.c ---- linux-3.0.8/arch/powerpc/mm/slice.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/powerpc/mm/slice.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/powerpc/mm/slice.c linux-3.0.9/arch/powerpc/mm/slice.c +--- linux-3.0.9/arch/powerpc/mm/slice.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/powerpc/mm/slice.c 2011-11-12 12:47:13.000000000 -0500 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ if ((mm->task_size - len) < addr) return 0; @@ -2476,9 +2476,9 @@ diff -urNp linux-3.0.8/arch/powerpc/mm/slice.c linux-3.0.8/arch/powerpc/mm/slice /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-3.0.8/arch/s390/include/asm/elf.h linux-3.0.8/arch/s390/include/asm/elf.h ---- linux-3.0.8/arch/s390/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/include/asm/elf.h linux-3.0.9/arch/s390/include/asm/elf.h +--- linux-3.0.9/arch/s390/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled; 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. */ @@ -2504,9 +2504,9 @@ diff -urNp linux-3.0.8/arch/s390/include/asm/elf.h linux-3.0.8/arch/s390/include -#define arch_randomize_brk arch_randomize_brk - #endif -diff -urNp linux-3.0.8/arch/s390/include/asm/system.h linux-3.0.8/arch/s390/include/asm/system.h ---- linux-3.0.8/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/include/asm/system.h linux-3.0.9/arch/s390/include/asm/system.h +--- linux-3.0.9/arch/s390/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co extern void (*_machine_halt)(void); extern void (*_machine_power_off)(void); @@ -2516,9 +2516,9 @@ diff -urNp linux-3.0.8/arch/s390/include/asm/system.h linux-3.0.8/arch/s390/incl static inline int tprot(unsigned long addr) { -diff -urNp linux-3.0.8/arch/s390/include/asm/uaccess.h linux-3.0.8/arch/s390/include/asm/uaccess.h ---- linux-3.0.8/arch/s390/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/include/asm/uaccess.h linux-3.0.9/arch/s390/include/asm/uaccess.h +--- linux-3.0.9/arch/s390/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -235,6 +235,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2551,9 +2551,9 @@ diff -urNp linux-3.0.8/arch/s390/include/asm/uaccess.h linux-3.0.8/arch/s390/inc if (unlikely(sz != -1 && sz < n)) { copy_from_user_overflow(); return n; -diff -urNp linux-3.0.8/arch/s390/kernel/module.c linux-3.0.8/arch/s390/kernel/module.c ---- linux-3.0.8/arch/s390/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/kernel/module.c linux-3.0.9/arch/s390/kernel/module.c +--- linux-3.0.9/arch/s390/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2625,9 +2625,9 @@ diff -urNp linux-3.0.8/arch/s390/kernel/module.c linux-3.0.8/arch/s390/kernel/mo rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-3.0.8/arch/s390/kernel/process.c linux-3.0.8/arch/s390/kernel/process.c ---- linux-3.0.8/arch/s390/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/kernel/process.c linux-3.0.9/arch/s390/kernel/process.c +--- linux-3.0.9/arch/s390/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru } return 0; @@ -2668,9 +2668,9 @@ diff -urNp linux-3.0.8/arch/s390/kernel/process.c linux-3.0.8/arch/s390/kernel/p - return base; - return ret; -} -diff -urNp linux-3.0.8/arch/s390/kernel/setup.c linux-3.0.8/arch/s390/kernel/setup.c ---- linux-3.0.8/arch/s390/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/kernel/setup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/kernel/setup.c linux-3.0.9/arch/s390/kernel/setup.c +--- linux-3.0.9/arch/s390/kernel/setup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/kernel/setup.c 2011-11-12 12:47:13.000000000 -0500 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char * } early_param("mem", early_parse_mem); @@ -2680,9 +2680,9 @@ diff -urNp linux-3.0.8/arch/s390/kernel/setup.c linux-3.0.8/arch/s390/kernel/set EXPORT_SYMBOL_GPL(user_mode); static int set_amode_and_uaccess(unsigned long user_amode, -diff -urNp linux-3.0.8/arch/s390/mm/mmap.c linux-3.0.8/arch/s390/mm/mmap.c ---- linux-3.0.8/arch/s390/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/s390/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/s390/mm/mmap.c linux-3.0.9/arch/s390/mm/mmap.c +--- linux-3.0.9/arch/s390/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/s390/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2729,9 +2729,9 @@ diff -urNp linux-3.0.8/arch/s390/mm/mmap.c linux-3.0.8/arch/s390/mm/mmap.c mm->get_unmapped_area = s390_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.8/arch/score/include/asm/system.h linux-3.0.8/arch/score/include/asm/system.h ---- linux-3.0.8/arch/score/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/score/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/score/include/asm/system.h linux-3.0.9/arch/score/include/asm/system.h +--- linux-3.0.9/arch/score/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/score/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -17,7 +17,7 @@ do { \ #define finish_arch_switch(prev) do {} while (0) @@ -2741,9 +2741,9 @@ diff -urNp linux-3.0.8/arch/score/include/asm/system.h linux-3.0.8/arch/score/in #define mb() barrier() #define rmb() barrier() -diff -urNp linux-3.0.8/arch/score/kernel/process.c linux-3.0.8/arch/score/kernel/process.c ---- linux-3.0.8/arch/score/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/score/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/score/kernel/process.c linux-3.0.9/arch/score/kernel/process.c +--- linux-3.0.9/arch/score/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/score/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru return task_pt_regs(task)->cp0_epc; @@ -2753,9 +2753,9 @@ diff -urNp linux-3.0.8/arch/score/kernel/process.c linux-3.0.8/arch/score/kernel -{ - return sp; -} -diff -urNp linux-3.0.8/arch/sh/mm/mmap.c linux-3.0.8/arch/sh/mm/mmap.c ---- linux-3.0.8/arch/sh/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sh/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sh/mm/mmap.c linux-3.0.9/arch/sh/mm/mmap.c +--- linux-3.0.9/arch/sh/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sh/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str addr = PAGE_ALIGN(addr); @@ -2830,9 +2830,9 @@ diff -urNp linux-3.0.8/arch/sh/mm/mmap.c linux-3.0.8/arch/sh/mm/mmap.c bottomup: /* -diff -urNp linux-3.0.8/arch/sparc/include/asm/atomic_64.h linux-3.0.8/arch/sparc/include/asm/atomic_64.h ---- linux-3.0.8/arch/sparc/include/asm/atomic_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/atomic_64.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/atomic_64.h linux-3.0.9/arch/sparc/include/asm/atomic_64.h +--- linux-3.0.9/arch/sparc/include/asm/atomic_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/atomic_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -14,18 +14,40 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3025,9 +3025,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/atomic_64.h linux-3.0.8/arch/sparc } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-3.0.8/arch/sparc/include/asm/cache.h linux-3.0.8/arch/sparc/include/asm/cache.h ---- linux-3.0.8/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/cache.h linux-3.0.9/arch/sparc/include/asm/cache.h +--- linux-3.0.9/arch/sparc/include/asm/cache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/cache.h 2011-11-12 12:47:13.000000000 -0500 @@ -10,7 +10,7 @@ #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) @@ -3037,9 +3037,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/cache.h linux-3.0.8/arch/sparc/inc #ifdef CONFIG_SPARC32 #define SMP_CACHE_BYTES_SHIFT 5 -diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_32.h linux-3.0.8/arch/sparc/include/asm/elf_32.h ---- linux-3.0.8/arch/sparc/include/asm/elf_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/elf_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_32.h linux-3.0.9/arch/sparc/include/asm/elf_32.h +--- linux-3.0.9/arch/sparc/include/asm/elf_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/elf_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -114,6 +114,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3054,9 +3054,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_32.h linux-3.0.8/arch/sparc/in /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_64.h linux-3.0.8/arch/sparc/include/asm/elf_64.h ---- linux-3.0.8/arch/sparc/include/asm/elf_64.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/elf_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/elf_64.h linux-3.0.9/arch/sparc/include/asm/elf_64.h +--- linux-3.0.9/arch/sparc/include/asm/elf_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/elf_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -180,6 +180,13 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3071,9 +3071,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/elf_64.h linux-3.0.8/arch/sparc/in extern unsigned long sparc64_elf_hwcap; #define ELF_HWCAP sparc64_elf_hwcap -diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtable_32.h linux-3.0.8/arch/sparc/include/asm/pgtable_32.h ---- linux-3.0.8/arch/sparc/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtable_32.h linux-3.0.9/arch/sparc/include/asm/pgtable_32.h +--- linux-3.0.9/arch/sparc/include/asm/pgtable_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/pgtable_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3105,9 +3105,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtable_32.h linux-3.0.8/arch/spar extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h ---- linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h +--- linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/pgtsrmmu.h 2011-11-12 12:47:13.000000000 -0500 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3122,9 +3122,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.8/arch/sparc/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-3.0.8/arch/sparc/include/asm/spinlock_64.h linux-3.0.8/arch/sparc/include/asm/spinlock_64.h ---- linux-3.0.8/arch/sparc/include/asm/spinlock_64.h 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/spinlock_64.h 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/spinlock_64.h linux-3.0.9/arch/sparc/include/asm/spinlock_64.h +--- linux-3.0.9/arch/sparc/include/asm/spinlock_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/spinlock_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags( /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ @@ -3222,9 +3222,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/spinlock_64.h linux-3.0.8/arch/spa { unsigned long mask, tmp1, tmp2, result; -diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_32.h linux-3.0.8/arch/sparc/include/asm/thread_info_32.h ---- linux-3.0.8/arch/sparc/include/asm/thread_info_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/thread_info_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_32.h linux-3.0.9/arch/sparc/include/asm/thread_info_32.h +--- linux-3.0.9/arch/sparc/include/asm/thread_info_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/thread_info_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -50,6 +50,8 @@ struct thread_info { unsigned long w_saved; @@ -3234,9 +3234,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_32.h linux-3.0.8/arch/ }; /* -diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_64.h linux-3.0.8/arch/sparc/include/asm/thread_info_64.h ---- linux-3.0.8/arch/sparc/include/asm/thread_info_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/thread_info_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/thread_info_64.h linux-3.0.9/arch/sparc/include/asm/thread_info_64.h +--- linux-3.0.9/arch/sparc/include/asm/thread_info_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/thread_info_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -63,6 +63,8 @@ struct thread_info { struct pt_regs *kern_una_regs; unsigned int kern_una_insn; @@ -3246,9 +3246,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/thread_info_64.h linux-3.0.8/arch/ unsigned long fpregs[0] __attribute__ ((aligned(64))); }; -diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_32.h linux-3.0.8/arch/sparc/include/asm/uaccess_32.h ---- linux-3.0.8/arch/sparc/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/uaccess_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_32.h linux-3.0.9/arch/sparc/include/asm/uaccess_32.h +--- linux-3.0.9/arch/sparc/include/asm/uaccess_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/uaccess_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -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) @@ -3300,9 +3300,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_32.h linux-3.0.8/arch/spar return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_64.h linux-3.0.8/arch/sparc/include/asm/uaccess_64.h ---- linux-3.0.8/arch/sparc/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/uaccess_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess_64.h linux-3.0.9/arch/sparc/include/asm/uaccess_64.h +--- linux-3.0.9/arch/sparc/include/asm/uaccess_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/uaccess_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3345,9 +3345,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess_64.h linux-3.0.8/arch/spar if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess.h linux-3.0.8/arch/sparc/include/asm/uaccess.h ---- linux-3.0.8/arch/sparc/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/include/asm/uaccess.h linux-3.0.9/arch/sparc/include/asm/uaccess.h +--- linux-3.0.9/arch/sparc/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -1,5 +1,13 @@ #ifndef ___ASM_SPARC_UACCESS_H #define ___ASM_SPARC_UACCESS_H @@ -3362,9 +3362,9 @@ diff -urNp linux-3.0.8/arch/sparc/include/asm/uaccess.h linux-3.0.8/arch/sparc/i #if defined(__sparc__) && defined(__arch64__) #include <asm/uaccess_64.h> #else -diff -urNp linux-3.0.8/arch/sparc/kernel/Makefile linux-3.0.8/arch/sparc/kernel/Makefile ---- linux-3.0.8/arch/sparc/kernel/Makefile 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/Makefile 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/Makefile linux-3.0.9/arch/sparc/kernel/Makefile +--- linux-3.0.9/arch/sparc/kernel/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -3,7 +3,7 @@ # @@ -3374,9 +3374,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/Makefile linux-3.0.8/arch/sparc/kernel/ extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-3.0.8/arch/sparc/kernel/process_32.c linux-3.0.8/arch/sparc/kernel/process_32.c ---- linux-3.0.8/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/process_32.c linux-3.0.9/arch/sparc/kernel/process_32.c +--- linux-3.0.9/arch/sparc/kernel/process_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/process_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp) rw->ins[4], rw->ins[5], rw->ins[6], @@ -3412,9 +3412,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/process_32.c linux-3.0.8/arch/sparc/ker fp = rw->ins[6]; } while (++count < 16); printk("\n"); -diff -urNp linux-3.0.8/arch/sparc/kernel/process_64.c linux-3.0.8/arch/sparc/kernel/process_64.c ---- linux-3.0.8/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/process_64.c linux-3.0.9/arch/sparc/kernel/process_64.c +--- linux-3.0.9/arch/sparc/kernel/process_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/process_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); @@ -3450,9 +3450,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/process_64.c linux-3.0.8/arch/sparc/ker (void *) gp->tpc, (void *) gp->o7, (void *) gp->i7, -diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c ---- linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c +--- linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/sys_sparc_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3471,9 +3471,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_32.c linux-3.0.8/arch/sparc/k return addr; addr = vmm->vm_end; if (flags & MAP_SHARED) -diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c ---- linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c +--- linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/sys_sparc_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -3621,9 +3621,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/sys_sparc_64.c linux-3.0.8/arch/sparc/k mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.8/arch/sparc/kernel/traps_32.c linux-3.0.8/arch/sparc/kernel/traps_32.c ---- linux-3.0.8/arch/sparc/kernel/traps_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/traps_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/traps_32.c linux-3.0.9/arch/sparc/kernel/traps_32.c +--- linux-3.0.9/arch/sparc/kernel/traps_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/traps_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t") #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t") @@ -3653,9 +3653,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/traps_32.c linux-3.0.8/arch/sparc/kerne do_exit(SIGSEGV); } -diff -urNp linux-3.0.8/arch/sparc/kernel/traps_64.c linux-3.0.8/arch/sparc/kernel/traps_64.c ---- linux-3.0.8/arch/sparc/kernel/traps_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/traps_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/traps_64.c linux-3.0.9/arch/sparc/kernel/traps_64.c +--- linux-3.0.9/arch/sparc/kernel/traps_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/traps_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_ i + 1, p->trapstack[i].tstate, p->trapstack[i].tpc, @@ -3793,9 +3793,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/traps_64.c linux-3.0.8/arch/sparc/kerne do_exit(SIGSEGV); } EXPORT_SYMBOL(die_if_kernel); -diff -urNp linux-3.0.8/arch/sparc/kernel/unaligned_64.c linux-3.0.8/arch/sparc/kernel/unaligned_64.c ---- linux-3.0.8/arch/sparc/kernel/unaligned_64.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/arch/sparc/kernel/unaligned_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/kernel/unaligned_64.c linux-3.0.9/arch/sparc/kernel/unaligned_64.c +--- linux-3.0.9/arch/sparc/kernel/unaligned_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/kernel/unaligned_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); @@ -3805,9 +3805,9 @@ diff -urNp linux-3.0.8/arch/sparc/kernel/unaligned_64.c linux-3.0.8/arch/sparc/k regs->tpc, (void *) regs->tpc); } } -diff -urNp linux-3.0.8/arch/sparc/lib/atomic_64.S linux-3.0.8/arch/sparc/lib/atomic_64.S ---- linux-3.0.8/arch/sparc/lib/atomic_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/lib/atomic_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/lib/atomic_64.S linux-3.0.9/arch/sparc/lib/atomic_64.S +--- linux-3.0.9/arch/sparc/lib/atomic_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/lib/atomic_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -4042,9 +4042,9 @@ diff -urNp linux-3.0.8/arch/sparc/lib/atomic_64.S linux-3.0.8/arch/sparc/lib/ato casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, BACKOFF_LABEL(2f, 1b) -diff -urNp linux-3.0.8/arch/sparc/lib/ksyms.c linux-3.0.8/arch/sparc/lib/ksyms.c ---- linux-3.0.8/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/lib/ksyms.c linux-3.0.9/arch/sparc/lib/ksyms.c +--- linux-3.0.9/arch/sparc/lib/ksyms.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/lib/ksyms.c 2011-11-12 12:47:13.000000000 -0500 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -4064,9 +4064,9 @@ diff -urNp linux-3.0.8/arch/sparc/lib/ksyms.c linux-3.0.8/arch/sparc/lib/ksyms.c EXPORT_SYMBOL(atomic64_sub_ret); /* Atomic bit operations. */ -diff -urNp linux-3.0.8/arch/sparc/lib/Makefile linux-3.0.8/arch/sparc/lib/Makefile ---- linux-3.0.8/arch/sparc/lib/Makefile 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/arch/sparc/lib/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/lib/Makefile linux-3.0.9/arch/sparc/lib/Makefile +--- linux-3.0.9/arch/sparc/lib/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/lib/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -2,7 +2,7 @@ # @@ -4076,9 +4076,9 @@ diff -urNp linux-3.0.8/arch/sparc/lib/Makefile linux-3.0.8/arch/sparc/lib/Makefi lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o lib-$(CONFIG_SPARC32) += memcpy.o memset.o -diff -urNp linux-3.0.8/arch/sparc/Makefile linux-3.0.8/arch/sparc/Makefile ---- linux-3.0.8/arch/sparc/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/Makefile 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/Makefile linux-3.0.9/arch/sparc/Makefile +--- linux-3.0.9/arch/sparc/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -4088,9 +4088,9 @@ diff -urNp linux-3.0.8/arch/sparc/Makefile linux-3.0.8/arch/sparc/Makefile VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-3.0.8/arch/sparc/mm/fault_32.c linux-3.0.8/arch/sparc/mm/fault_32.c ---- linux-3.0.8/arch/sparc/mm/fault_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/fault_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/fault_32.c linux-3.0.9/arch/sparc/mm/fault_32.c +--- linux-3.0.9/arch/sparc/mm/fault_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/fault_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -22,6 +22,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4395,9 +4395,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/fault_32.c linux-3.0.8/arch/sparc/mm/fault_ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-3.0.8/arch/sparc/mm/fault_64.c linux-3.0.8/arch/sparc/mm/fault_64.c ---- linux-3.0.8/arch/sparc/mm/fault_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/fault_64.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/fault_64.c linux-3.0.9/arch/sparc/mm/fault_64.c +--- linux-3.0.9/arch/sparc/mm/fault_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/fault_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -21,6 +21,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -4905,9 +4905,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/fault_64.c linux-3.0.8/arch/sparc/mm/fault_ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-3.0.8/arch/sparc/mm/hugetlbpage.c linux-3.0.8/arch/sparc/mm/hugetlbpage.c ---- linux-3.0.8/arch/sparc/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/hugetlbpage.c linux-3.0.9/arch/sparc/mm/hugetlbpage.c +--- linux-3.0.9/arch/sparc/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500 @@ -68,7 +68,7 @@ full_search: } return -ENOMEM; @@ -4967,9 +4967,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/hugetlbpage.c linux-3.0.8/arch/sparc/mm/hug return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-3.0.8/arch/sparc/mm/init_32.c linux-3.0.8/arch/sparc/mm/init_32.c ---- linux-3.0.8/arch/sparc/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/init_32.c linux-3.0.9/arch/sparc/mm/init_32.c +--- linux-3.0.9/arch/sparc/mm/init_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/init_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -316,6 +316,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -5004,9 +5004,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/init_32.c linux-3.0.8/arch/sparc/mm/init_32 protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-3.0.8/arch/sparc/mm/Makefile linux-3.0.8/arch/sparc/mm/Makefile ---- linux-3.0.8/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/Makefile linux-3.0.9/arch/sparc/mm/Makefile +--- linux-3.0.9/arch/sparc/mm/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -2,7 +2,7 @@ # @@ -5016,9 +5016,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/Makefile linux-3.0.8/arch/sparc/mm/Makefile obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-3.0.8/arch/sparc/mm/srmmu.c linux-3.0.8/arch/sparc/mm/srmmu.c ---- linux-3.0.8/arch/sparc/mm/srmmu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/sparc/mm/srmmu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/sparc/mm/srmmu.c linux-3.0.9/arch/sparc/mm/srmmu.c +--- linux-3.0.9/arch/sparc/mm/srmmu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/sparc/mm/srmmu.c 2011-11-12 12:47:13.000000000 -0500 @@ -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)); @@ -5033,9 +5033,9 @@ diff -urNp linux-3.0.8/arch/sparc/mm/srmmu.c linux-3.0.8/arch/sparc/mm/srmmu.c BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-3.0.8/arch/um/include/asm/kmap_types.h linux-3.0.8/arch/um/include/asm/kmap_types.h ---- linux-3.0.8/arch/um/include/asm/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/include/asm/kmap_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/include/asm/kmap_types.h linux-3.0.9/arch/um/include/asm/kmap_types.h +--- linux-3.0.9/arch/um/include/asm/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/include/asm/kmap_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -5044,9 +5044,9 @@ diff -urNp linux-3.0.8/arch/um/include/asm/kmap_types.h linux-3.0.8/arch/um/incl KM_TYPE_NR }; -diff -urNp linux-3.0.8/arch/um/include/asm/page.h linux-3.0.8/arch/um/include/asm/page.h ---- linux-3.0.8/arch/um/include/asm/page.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/include/asm/page.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/include/asm/page.h linux-3.0.9/arch/um/include/asm/page.h +--- linux-3.0.9/arch/um/include/asm/page.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/include/asm/page.h 2011-11-12 12:47:13.000000000 -0500 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -5057,9 +5057,9 @@ diff -urNp linux-3.0.8/arch/um/include/asm/page.h linux-3.0.8/arch/um/include/as #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-3.0.8/arch/um/kernel/process.c linux-3.0.8/arch/um/kernel/process.c ---- linux-3.0.8/arch/um/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/kernel/process.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/kernel/process.c linux-3.0.9/arch/um/kernel/process.c +--- linux-3.0.9/arch/um/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -404,22 +404,6 @@ int singlestepping(void * t) return 2; } @@ -5083,9 +5083,9 @@ diff -urNp linux-3.0.8/arch/um/kernel/process.c linux-3.0.8/arch/um/kernel/proce unsigned long get_wchan(struct task_struct *p) { unsigned long stack_page, sp, ip; -diff -urNp linux-3.0.8/arch/um/Makefile linux-3.0.8/arch/um/Makefile ---- linux-3.0.8/arch/um/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/Makefile 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/Makefile linux-3.0.9/arch/um/Makefile +--- linux-3.0.9/arch/um/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINE $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \ $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 @@ -5097,9 +5097,9 @@ diff -urNp linux-3.0.8/arch/um/Makefile linux-3.0.8/arch/um/Makefile include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) #This will adjust *FLAGS accordingly to the platform. -diff -urNp linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h ---- linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h +--- linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/sys-i386/shared/sysdep/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -17,7 +17,7 @@ # define AT_VECTOR_SIZE_ARCH 1 #endif @@ -5109,9 +5109,9 @@ diff -urNp linux-3.0.8/arch/um/sys-i386/shared/sysdep/system.h linux-3.0.8/arch/ void default_idle(void); -diff -urNp linux-3.0.8/arch/um/sys-i386/syscalls.c linux-3.0.8/arch/um/sys-i386/syscalls.c ---- linux-3.0.8/arch/um/sys-i386/syscalls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/sys-i386/syscalls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/sys-i386/syscalls.c linux-3.0.9/arch/um/sys-i386/syscalls.c +--- linux-3.0.9/arch/um/sys-i386/syscalls.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/sys-i386/syscalls.c 2011-11-12 12:47:13.000000000 -0500 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -5134,9 +5134,9 @@ diff -urNp linux-3.0.8/arch/um/sys-i386/syscalls.c linux-3.0.8/arch/um/sys-i386/ /* * The prototype on i386 is: * -diff -urNp linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h ---- linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h +--- linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/um/sys-x86_64/shared/sysdep/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -17,7 +17,7 @@ # define AT_VECTOR_SIZE_ARCH 1 #endif @@ -5146,9 +5146,9 @@ diff -urNp linux-3.0.8/arch/um/sys-x86_64/shared/sysdep/system.h linux-3.0.8/arc void default_idle(void); -diff -urNp linux-3.0.8/arch/x86/boot/bitops.h linux-3.0.8/arch/x86/boot/bitops.h ---- linux-3.0.8/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/bitops.h linux-3.0.9/arch/x86/boot/bitops.h +--- linux-3.0.9/arch/x86/boot/bitops.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/bitops.h 2011-11-12 12:47:13.000000000 -0500 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -5167,9 +5167,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/bitops.h linux-3.0.8/arch/x86/boot/bitops.h } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-3.0.8/arch/x86/boot/boot.h linux-3.0.8/arch/x86/boot/boot.h ---- linux-3.0.8/arch/x86/boot/boot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/boot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/boot.h linux-3.0.9/arch/x86/boot/boot.h +--- linux-3.0.9/arch/x86/boot/boot.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/boot.h 2011-11-12 12:47:13.000000000 -0500 @@ -85,7 +85,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5188,9 +5188,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/boot.h linux-3.0.8/arch/x86/boot/boot.h : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_32.S linux-3.0.8/arch/x86/boot/compressed/head_32.S ---- linux-3.0.8/arch/x86/boot/compressed/head_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/compressed/head_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_32.S linux-3.0.9/arch/x86/boot/compressed/head_32.S +--- linux-3.0.9/arch/x86/boot/compressed/head_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/compressed/head_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5219,9 +5219,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_32.S linux-3.0.8/arch/x86/b addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_64.S linux-3.0.8/arch/x86/boot/compressed/head_64.S ---- linux-3.0.8/arch/x86/boot/compressed/head_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/compressed/head_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/compressed/head_64.S linux-3.0.9/arch/x86/boot/compressed/head_64.S +--- linux-3.0.9/arch/x86/boot/compressed/head_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/compressed/head_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -5240,9 +5240,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/compressed/head_64.S linux-3.0.8/arch/x86/b #endif /* Target address to relocate to for decompression */ -diff -urNp linux-3.0.8/arch/x86/boot/compressed/Makefile linux-3.0.8/arch/x86/boot/compressed/Makefile ---- linux-3.0.8/arch/x86/boot/compressed/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/compressed/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/compressed/Makefile linux-3.0.9/arch/x86/boot/compressed/Makefile +--- linux-3.0.9/arch/x86/boot/compressed/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/compressed/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(call cc-option,-ffreestanding) @@ -5253,9 +5253,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/compressed/Makefile linux-3.0.8/arch/x86/bo KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-3.0.8/arch/x86/boot/compressed/misc.c linux-3.0.8/arch/x86/boot/compressed/misc.c ---- linux-3.0.8/arch/x86/boot/compressed/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/compressed/misc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/compressed/misc.c linux-3.0.9/arch/x86/boot/compressed/misc.c +--- linux-3.0.9/arch/x86/boot/compressed/misc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/compressed/misc.c 2011-11-12 12:47:13.000000000 -0500 @@ -310,7 +310,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5274,9 +5274,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/compressed/misc.c linux-3.0.8/arch/x86/boot error("Wrong destination address"); #endif -diff -urNp linux-3.0.8/arch/x86/boot/compressed/relocs.c linux-3.0.8/arch/x86/boot/compressed/relocs.c ---- linux-3.0.8/arch/x86/boot/compressed/relocs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/compressed/relocs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/compressed/relocs.c linux-3.0.9/arch/x86/boot/compressed/relocs.c +--- linux-3.0.9/arch/x86/boot/compressed/relocs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/compressed/relocs.c 2011-11-12 12:47:13.000000000 -0500 @@ -13,8 +13,11 @@ static void die(char *fmt, ...); @@ -5469,9 +5469,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/compressed/relocs.c linux-3.0.8/arch/x86/bo read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-3.0.8/arch/x86/boot/cpucheck.c linux-3.0.8/arch/x86/boot/cpucheck.c ---- linux-3.0.8/arch/x86/boot/cpucheck.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/cpucheck.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/cpucheck.c linux-3.0.9/arch/x86/boot/cpucheck.c +--- linux-3.0.9/arch/x86/boot/cpucheck.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/cpucheck.c 2011-11-12 12:47:13.000000000 -0500 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5567,9 +5567,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/cpucheck.c linux-3.0.8/arch/x86/boot/cpuche err = check_flags(); } -diff -urNp linux-3.0.8/arch/x86/boot/header.S linux-3.0.8/arch/x86/boot/header.S ---- linux-3.0.8/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/header.S linux-3.0.9/arch/x86/boot/header.S +--- linux-3.0.9/arch/x86/boot/header.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/header.S 2011-11-12 12:47:13.000000000 -0500 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5579,9 +5579,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/header.S linux-3.0.8/arch/x86/boot/header.S #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-3.0.8/arch/x86/boot/Makefile linux-3.0.8/arch/x86/boot/Makefile ---- linux-3.0.8/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/Makefile linux-3.0.9/arch/x86/boot/Makefile +--- linux-3.0.9/arch/x86/boot/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) @@ -5592,9 +5592,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/Makefile linux-3.0.8/arch/x86/boot/Makefile KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-3.0.8/arch/x86/boot/memory.c linux-3.0.8/arch/x86/boot/memory.c ---- linux-3.0.8/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/memory.c linux-3.0.9/arch/x86/boot/memory.c +--- linux-3.0.9/arch/x86/boot/memory.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/memory.c 2011-11-12 12:47:13.000000000 -0500 @@ -19,7 +19,7 @@ static int detect_memory_e820(void) @@ -5604,9 +5604,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/memory.c linux-3.0.8/arch/x86/boot/memory.c struct biosregs ireg, oreg; struct e820entry *desc = boot_params.e820_map; static struct e820entry buf; /* static so it is zeroed */ -diff -urNp linux-3.0.8/arch/x86/boot/video.c linux-3.0.8/arch/x86/boot/video.c ---- linux-3.0.8/arch/x86/boot/video.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/video.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/video.c linux-3.0.9/arch/x86/boot/video.c +--- linux-3.0.9/arch/x86/boot/video.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/video.c 2011-11-12 12:47:13.000000000 -0500 @@ -96,7 +96,7 @@ static void store_mode_params(void) static unsigned int get_entry(void) { @@ -5616,9 +5616,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/video.c linux-3.0.8/arch/x86/boot/video.c int key; unsigned int v; -diff -urNp linux-3.0.8/arch/x86/boot/video-vesa.c linux-3.0.8/arch/x86/boot/video-vesa.c ---- linux-3.0.8/arch/x86/boot/video-vesa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/boot/video-vesa.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/boot/video-vesa.c linux-3.0.9/arch/x86/boot/video-vesa.c +--- linux-3.0.9/arch/x86/boot/video-vesa.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/boot/video-vesa.c 2011-11-12 12:47:13.000000000 -0500 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5627,9 +5627,9 @@ diff -urNp linux-3.0.8/arch/x86/boot/video-vesa.c linux-3.0.8/arch/x86/boot/vide } /* -diff -urNp linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S ---- linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S +--- linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/crypto/aes-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -8,6 +8,8 @@ * including this sentence is retained in full. */ @@ -5648,9 +5648,9 @@ diff -urNp linux-3.0.8/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.8/arch/x86/ #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \ movq r1,r2; \ movq r3,r4; \ -diff -urNp linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S ---- linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S +--- linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/crypto/salsa20-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -1,3 +1,5 @@ +#include <asm/alternative-asm.h> + @@ -5679,9 +5679,9 @@ diff -urNp linux-3.0.8/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.8/arch/ mov %rsi,%rdx + pax_force_retaddr ret -diff -urNp linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S ---- linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S +--- linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/crypto/twofish-x86_64-asm_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -21,6 +21,7 @@ .text @@ -5704,9 +5704,9 @@ diff -urNp linux-3.0.8/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.8/arch/ movq $1,%rax + pax_force_retaddr ret -diff -urNp linux-3.0.8/arch/x86/ia32/ia32_aout.c linux-3.0.8/arch/x86/ia32/ia32_aout.c ---- linux-3.0.8/arch/x86/ia32/ia32_aout.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/ia32/ia32_aout.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/ia32/ia32_aout.c linux-3.0.9/arch/x86/ia32/ia32_aout.c +--- linux-3.0.9/arch/x86/ia32/ia32_aout.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/ia32/ia32_aout.c 2011-11-12 12:47:13.000000000 -0500 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st unsigned long dump_start, dump_size; struct user32 dump; @@ -5716,9 +5716,9 @@ diff -urNp linux-3.0.8/arch/x86/ia32/ia32_aout.c linux-3.0.8/arch/x86/ia32/ia32_ fs = get_fs(); set_fs(KERNEL_DS); has_dumped = 1; -diff -urNp linux-3.0.8/arch/x86/ia32/ia32entry.S linux-3.0.8/arch/x86/ia32/ia32entry.S ---- linux-3.0.8/arch/x86/ia32/ia32entry.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/ia32/ia32entry.S 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/ia32/ia32entry.S linux-3.0.9/arch/x86/ia32/ia32entry.S +--- linux-3.0.9/arch/x86/ia32/ia32entry.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/ia32/ia32entry.S 2011-11-12 12:47:13.000000000 -0500 @@ -13,7 +13,9 @@ #include <asm/thread_info.h> #include <asm/segment.h> @@ -5905,9 +5905,9 @@ diff -urNp linux-3.0.8/arch/x86/ia32/ia32entry.S linux-3.0.8/arch/x86/ia32/ia32e ret CFI_ENDPROC -diff -urNp linux-3.0.8/arch/x86/ia32/ia32_signal.c linux-3.0.8/arch/x86/ia32/ia32_signal.c ---- linux-3.0.8/arch/x86/ia32/ia32_signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/ia32/ia32_signal.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/ia32/ia32_signal.c linux-3.0.9/arch/x86/ia32/ia32_signal.c +--- linux-3.0.9/arch/x86/ia32/ia32_signal.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/ia32/ia32_signal.c 2011-11-12 12:47:13.000000000 -0500 @@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const } seg = get_fs(); @@ -5984,9 +5984,9 @@ diff -urNp linux-3.0.8/arch/x86/ia32/ia32_signal.c linux-3.0.8/arch/x86/ia32/ia3 } put_user_catch(err); if (err) -diff -urNp linux-3.0.8/arch/x86/ia32/sys_ia32.c linux-3.0.8/arch/x86/ia32/sys_ia32.c ---- linux-3.0.8/arch/x86/ia32/sys_ia32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/ia32/sys_ia32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/ia32/sys_ia32.c linux-3.0.9/arch/x86/ia32/sys_ia32.c +--- linux-3.0.9/arch/x86/ia32/sys_ia32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/ia32/sys_ia32.c 2011-11-12 12:47:13.000000000 -0500 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign */ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat) @@ -6054,9 +6054,9 @@ diff -urNp linux-3.0.8/arch/x86/ia32/sys_ia32.c linux-3.0.8/arch/x86/ia32/sys_ia count); set_fs(old_fs); -diff -urNp linux-3.0.8/arch/x86/include/asm/alternative-asm.h linux-3.0.8/arch/x86/include/asm/alternative-asm.h ---- linux-3.0.8/arch/x86/include/asm/alternative-asm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/alternative-asm.h 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/alternative-asm.h linux-3.0.9/arch/x86/include/asm/alternative-asm.h +--- linux-3.0.9/arch/x86/include/asm/alternative-asm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/alternative-asm.h 2011-11-12 12:47:13.000000000 -0500 @@ -15,6 +15,20 @@ .endm #endif @@ -6078,9 +6078,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/alternative-asm.h linux-3.0.8/arch/x .macro altinstruction_entry orig alt feature orig_len alt_len .align 8 .quad \orig -diff -urNp linux-3.0.8/arch/x86/include/asm/alternative.h linux-3.0.8/arch/x86/include/asm/alternative.h ---- linux-3.0.8/arch/x86/include/asm/alternative.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/alternative.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/alternative.h linux-3.0.9/arch/x86/include/asm/alternative.h +--- linux-3.0.9/arch/x86/include/asm/alternative.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/alternative.h 2011-11-12 12:47:13.000000000 -0500 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese ".section .discard,\"aw\",@progbits\n" \ " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \ @@ -6090,9 +6090,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/alternative.h linux-3.0.8/arch/x86/i "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-3.0.8/arch/x86/include/asm/apic.h linux-3.0.8/arch/x86/include/asm/apic.h ---- linux-3.0.8/arch/x86/include/asm/apic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/apic.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/apic.h linux-3.0.9/arch/x86/include/asm/apic.h +--- linux-3.0.9/arch/x86/include/asm/apic.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/apic.h 2011-11-12 12:47:13.000000000 -0500 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo #ifdef CONFIG_X86_LOCAL_APIC @@ -6102,9 +6102,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/apic.h linux-3.0.8/arch/x86/include/ extern int local_apic_timer_c2_ok; extern int disable_apic; -diff -urNp linux-3.0.8/arch/x86/include/asm/apm.h linux-3.0.8/arch/x86/include/asm/apm.h ---- linux-3.0.8/arch/x86/include/asm/apm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/apm.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/apm.h linux-3.0.9/arch/x86/include/asm/apm.h +--- linux-3.0.9/arch/x86/include/asm/apm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/apm.h 2011-11-12 12:47:13.000000000 -0500 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -6123,9 +6123,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/apm.h linux-3.0.8/arch/x86/include/a "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_32.h linux-3.0.8/arch/x86/include/asm/atomic64_32.h ---- linux-3.0.8/arch/x86/include/asm/atomic64_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/atomic64_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_32.h linux-3.0.9/arch/x86/include/asm/atomic64_32.h +--- linux-3.0.9/arch/x86/include/asm/atomic64_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/atomic64_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -12,6 +12,14 @@ typedef struct { u64 __aligned(8) counter; } atomic64_t; @@ -6275,9 +6275,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_32.h linux-3.0.8/arch/x86/i * atomic64_sub - subtract the atomic64 variable * @i: integer value to subtract * @v: pointer to type atomic64_t -diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_64.h linux-3.0.8/arch/x86/include/asm/atomic64_64.h ---- linux-3.0.8/arch/x86/include/asm/atomic64_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/atomic64_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/atomic64_64.h linux-3.0.9/arch/x86/include/asm/atomic64_64.h +--- linux-3.0.9/arch/x86/include/asm/atomic64_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/atomic64_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -18,7 +18,19 @@ */ static inline long atomic64_read(const atomic64_t *v) @@ -6599,9 +6599,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/atomic64_64.h linux-3.0.8/arch/x86/i } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-3.0.8/arch/x86/include/asm/atomic.h linux-3.0.8/arch/x86/include/asm/atomic.h ---- linux-3.0.8/arch/x86/include/asm/atomic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/atomic.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/atomic.h linux-3.0.9/arch/x86/include/asm/atomic.h +--- linux-3.0.9/arch/x86/include/asm/atomic.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/atomic.h 2011-11-12 12:47:13.000000000 -0500 @@ -22,7 +22,18 @@ */ static inline int atomic_read(const atomic_t *v) @@ -7014,9 +7014,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/atomic.h linux-3.0.8/arch/x86/includ /* * atomic_dec_if_positive - decrement by 1 if old value positive * @v: pointer of type atomic_t -diff -urNp linux-3.0.8/arch/x86/include/asm/bitops.h linux-3.0.8/arch/x86/include/asm/bitops.h ---- linux-3.0.8/arch/x86/include/asm/bitops.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/bitops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/bitops.h linux-3.0.9/arch/x86/include/asm/bitops.h +--- linux-3.0.9/arch/x86/include/asm/bitops.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/bitops.h 2011-11-12 12:47:13.000000000 -0500 @@ -38,7 +38,7 @@ * a mask operation on a byte. */ @@ -7026,9 +7026,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/bitops.h linux-3.0.8/arch/x86/includ #define CONST_MASK(nr) (1 << ((nr) & 7)) /** -diff -urNp linux-3.0.8/arch/x86/include/asm/boot.h linux-3.0.8/arch/x86/include/asm/boot.h ---- linux-3.0.8/arch/x86/include/asm/boot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/boot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/boot.h linux-3.0.9/arch/x86/include/asm/boot.h +--- linux-3.0.9/arch/x86/include/asm/boot.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/boot.h 2011-11-12 12:47:13.000000000 -0500 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -7046,9 +7046,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/boot.h linux-3.0.8/arch/x86/include/ /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-3.0.8/arch/x86/include/asm/cacheflush.h linux-3.0.8/arch/x86/include/asm/cacheflush.h ---- linux-3.0.8/arch/x86/include/asm/cacheflush.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/cacheflush.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/cacheflush.h linux-3.0.9/arch/x86/include/asm/cacheflush.h +--- linux-3.0.9/arch/x86/include/asm/cacheflush.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/cacheflush.h 2011-11-12 12:47:13.000000000 -0500 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem unsigned long pg_flags = pg->flags & _PGMT_MASK; @@ -7058,9 +7058,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/cacheflush.h linux-3.0.8/arch/x86/in else if (pg_flags == _PGMT_WC) return _PAGE_CACHE_WC; else if (pg_flags == _PGMT_UC_MINUS) -diff -urNp linux-3.0.8/arch/x86/include/asm/cache.h linux-3.0.8/arch/x86/include/asm/cache.h ---- linux-3.0.8/arch/x86/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/cache.h linux-3.0.9/arch/x86/include/asm/cache.h +--- linux-3.0.9/arch/x86/include/asm/cache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/cache.h 2011-11-12 12:47:13.000000000 -0500 @@ -5,12 +5,13 @@ /* L1 cache line size */ @@ -7077,9 +7077,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/cache.h linux-3.0.8/arch/x86/include #ifdef CONFIG_X86_VSMP #ifdef CONFIG_SMP -diff -urNp linux-3.0.8/arch/x86/include/asm/checksum_32.h linux-3.0.8/arch/x86/include/asm/checksum_32.h ---- linux-3.0.8/arch/x86/include/asm/checksum_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/checksum_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/checksum_32.h linux-3.0.9/arch/x86/include/asm/checksum_32.h +--- linux-3.0.9/arch/x86/include/asm/checksum_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/checksum_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -7113,9 +7113,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/checksum_32.h linux-3.0.8/arch/x86/i len, sum, NULL, err_ptr); if (len) -diff -urNp linux-3.0.8/arch/x86/include/asm/cpufeature.h linux-3.0.8/arch/x86/include/asm/cpufeature.h ---- linux-3.0.8/arch/x86/include/asm/cpufeature.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/cpufeature.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/cpufeature.h linux-3.0.9/arch/x86/include/asm/cpufeature.h +--- linux-3.0.9/arch/x86/include/asm/cpufeature.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/cpufeature.h 2011-11-12 12:47:13.000000000 -0500 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ @@ -7125,9 +7125,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/cpufeature.h linux-3.0.8/arch/x86/in "3: movb $1,%0\n" "4:\n" ".previous\n" -diff -urNp linux-3.0.8/arch/x86/include/asm/desc_defs.h linux-3.0.8/arch/x86/include/asm/desc_defs.h ---- linux-3.0.8/arch/x86/include/asm/desc_defs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/desc_defs.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/desc_defs.h linux-3.0.9/arch/x86/include/asm/desc_defs.h +--- linux-3.0.9/arch/x86/include/asm/desc_defs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/desc_defs.h 2011-11-12 12:47:13.000000000 -0500 @@ -31,6 +31,12 @@ struct desc_struct { unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; @@ -7141,9 +7141,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/desc_defs.h linux-3.0.8/arch/x86/inc }; } __attribute__((packed)); -diff -urNp linux-3.0.8/arch/x86/include/asm/desc.h linux-3.0.8/arch/x86/include/asm/desc.h ---- linux-3.0.8/arch/x86/include/asm/desc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/desc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/desc.h linux-3.0.9/arch/x86/include/asm/desc.h +--- linux-3.0.9/arch/x86/include/asm/desc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/desc.h 2011-11-12 12:47:13.000000000 -0500 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -7322,9 +7322,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/desc.h linux-3.0.8/arch/x86/include/ +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/e820.h linux-3.0.8/arch/x86/include/asm/e820.h ---- linux-3.0.8/arch/x86/include/asm/e820.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/e820.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/e820.h linux-3.0.9/arch/x86/include/asm/e820.h +--- linux-3.0.9/arch/x86/include/asm/e820.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/e820.h 2011-11-12 12:47:13.000000000 -0500 @@ -69,7 +69,7 @@ struct e820map { #define ISA_START_ADDRESS 0xa0000 #define ISA_END_ADDRESS 0x100000 @@ -7334,9 +7334,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/e820.h linux-3.0.8/arch/x86/include/ #define BIOS_END 0x00100000 #define BIOS_ROM_BASE 0xffe00000 -diff -urNp linux-3.0.8/arch/x86/include/asm/elf.h linux-3.0.8/arch/x86/include/asm/elf.h ---- linux-3.0.8/arch/x86/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/elf.h linux-3.0.9/arch/x86/include/asm/elf.h +--- linux-3.0.9/arch/x86/include/asm/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/elf.h 2011-11-12 12:47:13.000000000 -0500 @@ -237,7 +237,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. */ @@ -7391,9 +7391,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/elf.h linux-3.0.8/arch/x86/include/a -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/emergency-restart.h linux-3.0.8/arch/x86/include/asm/emergency-restart.h ---- linux-3.0.8/arch/x86/include/asm/emergency-restart.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/emergency-restart.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/emergency-restart.h linux-3.0.9/arch/x86/include/asm/emergency-restart.h +--- linux-3.0.9/arch/x86/include/asm/emergency-restart.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/emergency-restart.h 2011-11-12 12:47:13.000000000 -0500 @@ -15,6 +15,6 @@ enum reboot_type { extern enum reboot_type reboot_type; @@ -7402,9 +7402,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/emergency-restart.h linux-3.0.8/arch +extern void machine_emergency_restart(void) __noreturn; #endif /* _ASM_X86_EMERGENCY_RESTART_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/futex.h linux-3.0.8/arch/x86/include/asm/futex.h ---- linux-3.0.8/arch/x86/include/asm/futex.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/futex.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/futex.h linux-3.0.9/arch/x86/include/asm/futex.h +--- linux-3.0.9/arch/x86/include/asm/futex.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/futex.h 2011-11-12 12:47:13.000000000 -0500 @@ -12,16 +12,18 @@ #include <asm/system.h> @@ -7463,9 +7463,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/futex.h linux-3.0.8/arch/x86/include : "i" (-EFAULT), "r" (newval), "1" (oldval) : "memory" ); -diff -urNp linux-3.0.8/arch/x86/include/asm/hw_irq.h linux-3.0.8/arch/x86/include/asm/hw_irq.h ---- linux-3.0.8/arch/x86/include/asm/hw_irq.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/hw_irq.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/hw_irq.h linux-3.0.9/arch/x86/include/asm/hw_irq.h +--- linux-3.0.9/arch/x86/include/asm/hw_irq.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/hw_irq.h 2011-11-12 12:47:13.000000000 -0500 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void); extern void enable_IO_APIC(void); @@ -7477,9 +7477,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/hw_irq.h linux-3.0.8/arch/x86/includ /* EISA */ extern void eisa_set_level_irq(unsigned int irq); -diff -urNp linux-3.0.8/arch/x86/include/asm/i387.h linux-3.0.8/arch/x86/include/asm/i387.h ---- linux-3.0.8/arch/x86/include/asm/i387.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/i387.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/i387.h linux-3.0.9/arch/x86/include/asm/i387.h +--- linux-3.0.9/arch/x86/include/asm/i387.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/i387.h 2011-11-12 12:47:13.000000000 -0500 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc { int err; @@ -7529,9 +7529,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/i387.h linux-3.0.8/arch/x86/include/ else clts(); } -diff -urNp linux-3.0.8/arch/x86/include/asm/io.h linux-3.0.8/arch/x86/include/asm/io.h ---- linux-3.0.8/arch/x86/include/asm/io.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/io.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/io.h linux-3.0.9/arch/x86/include/asm/io.h +--- linux-3.0.9/arch/x86/include/asm/io.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/io.h 2011-11-12 12:47:13.000000000 -0500 @@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void); #include <linux/vmalloc.h> @@ -7550,9 +7550,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/io.h linux-3.0.8/arch/x86/include/as /* * Convert a virtual cached pointer to an uncached pointer */ -diff -urNp linux-3.0.8/arch/x86/include/asm/irqflags.h linux-3.0.8/arch/x86/include/asm/irqflags.h ---- linux-3.0.8/arch/x86/include/asm/irqflags.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/irqflags.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/irqflags.h linux-3.0.9/arch/x86/include/asm/irqflags.h +--- linux-3.0.9/arch/x86/include/asm/irqflags.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/irqflags.h 2011-11-12 12:47:13.000000000 -0500 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i sti; \ sysexit @@ -7565,9 +7565,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/irqflags.h linux-3.0.8/arch/x86/incl #else #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit -diff -urNp linux-3.0.8/arch/x86/include/asm/kprobes.h linux-3.0.8/arch/x86/include/asm/kprobes.h ---- linux-3.0.8/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/kprobes.h linux-3.0.9/arch/x86/include/asm/kprobes.h +--- linux-3.0.9/arch/x86/include/asm/kprobes.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/kprobes.h 2011-11-12 12:47:13.000000000 -0500 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t; #define RELATIVEJUMP_SIZE 5 #define RELATIVECALL_OPCODE 0xe8 @@ -7584,9 +7584,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/kprobes.h linux-3.0.8/arch/x86/inclu #define flush_insn_slot(p) do { } while (0) -diff -urNp linux-3.0.8/arch/x86/include/asm/kvm_host.h linux-3.0.8/arch/x86/include/asm/kvm_host.h ---- linux-3.0.8/arch/x86/include/asm/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/kvm_host.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/kvm_host.h linux-3.0.9/arch/x86/include/asm/kvm_host.h +--- linux-3.0.9/arch/x86/include/asm/kvm_host.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/kvm_host.h 2011-11-12 12:47:13.000000000 -0500 @@ -441,7 +441,7 @@ struct kvm_arch { unsigned int n_used_mmu_pages; unsigned int n_requested_mmu_pages; @@ -7605,9 +7605,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/kvm_host.h linux-3.0.8/arch/x86/incl struct kvm_arch_async_pf { u32 token; -diff -urNp linux-3.0.8/arch/x86/include/asm/local.h linux-3.0.8/arch/x86/include/asm/local.h ---- linux-3.0.8/arch/x86/include/asm/local.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/local.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/local.h linux-3.0.9/arch/x86/include/asm/local.h +--- linux-3.0.9/arch/x86/include/asm/local.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/local.h 2011-11-12 12:47:13.000000000 -0500 @@ -18,26 +18,58 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7760,9 +7760,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/local.h linux-3.0.8/arch/x86/include : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-3.0.8/arch/x86/include/asm/mman.h linux-3.0.8/arch/x86/include/asm/mman.h ---- linux-3.0.8/arch/x86/include/asm/mman.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/mman.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/mman.h linux-3.0.9/arch/x86/include/asm/mman.h +--- linux-3.0.9/arch/x86/include/asm/mman.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/mman.h 2011-11-12 12:47:13.000000000 -0500 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -7778,9 +7778,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/mman.h linux-3.0.8/arch/x86/include/ +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/mmu_context.h linux-3.0.8/arch/x86/include/asm/mmu_context.h ---- linux-3.0.8/arch/x86/include/asm/mmu_context.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/mmu_context.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/mmu_context.h linux-3.0.9/arch/x86/include/asm/mmu_context.h +--- linux-3.0.9/arch/x86/include/asm/mmu_context.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/mmu_context.h 2011-11-12 12:47:13.000000000 -0500 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) @@ -7901,9 +7901,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/mmu_context.h linux-3.0.8/arch/x86/i } #define activate_mm(prev, next) \ -diff -urNp linux-3.0.8/arch/x86/include/asm/mmu.h linux-3.0.8/arch/x86/include/asm/mmu.h ---- linux-3.0.8/arch/x86/include/asm/mmu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/mmu.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/mmu.h linux-3.0.9/arch/x86/include/asm/mmu.h +--- linux-3.0.9/arch/x86/include/asm/mmu.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/mmu.h 2011-11-12 12:47:13.000000000 -0500 @@ -9,7 +9,7 @@ * we put the segment information here. */ @@ -7934,9 +7934,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/mmu.h linux-3.0.8/arch/x86/include/a } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-3.0.8/arch/x86/include/asm/module.h linux-3.0.8/arch/x86/include/asm/module.h ---- linux-3.0.8/arch/x86/include/asm/module.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/module.h 2011-10-07 19:24:31.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/module.h linux-3.0.9/arch/x86/include/asm/module.h +--- linux-3.0.9/arch/x86/include/asm/module.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/module.h 2011-11-12 12:47:13.000000000 -0500 @@ -5,6 +5,7 @@ #ifdef CONFIG_X86_64 @@ -7966,9 +7966,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/module.h linux-3.0.8/arch/x86/includ +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF + #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/page_64_types.h linux-3.0.8/arch/x86/include/asm/page_64_types.h ---- linux-3.0.8/arch/x86/include/asm/page_64_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/page_64_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/page_64_types.h linux-3.0.9/arch/x86/include/asm/page_64_types.h +--- linux-3.0.9/arch/x86/include/asm/page_64_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/page_64_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from); /* duplicated to the one in bootmem.h */ @@ -7978,9 +7978,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/page_64_types.h linux-3.0.8/arch/x86 extern unsigned long __phys_addr(unsigned long); #define __phys_reloc_hide(x) (x) -diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt.h linux-3.0.8/arch/x86/include/asm/paravirt.h ---- linux-3.0.8/arch/x86/include/asm/paravirt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/paravirt.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt.h linux-3.0.9/arch/x86/include/asm/paravirt.h +--- linux-3.0.9/arch/x86/include/asm/paravirt.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/paravirt.h 2011-11-12 12:47:13.000000000 -0500 @@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, val); } @@ -8053,9 +8053,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt.h linux-3.0.8/arch/x86/incl #endif /* CONFIG_X86_32 */ #endif /* __ASSEMBLY__ */ -diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt_types.h linux-3.0.8/arch/x86/include/asm/paravirt_types.h ---- linux-3.0.8/arch/x86/include/asm/paravirt_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/paravirt_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/paravirt_types.h linux-3.0.9/arch/x86/include/asm/paravirt_types.h +--- linux-3.0.9/arch/x86/include/asm/paravirt_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/paravirt_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -78,19 +78,19 @@ struct pv_init_ops { */ unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, @@ -8127,9 +8127,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/paravirt_types.h linux-3.0.8/arch/x8 /* This contains all the paravirt structures: we get a convenient * number for each function using the offset which we use to indicate -diff -urNp linux-3.0.8/arch/x86/include/asm/pgalloc.h linux-3.0.8/arch/x86/include/asm/pgalloc.h ---- linux-3.0.8/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgalloc.h linux-3.0.9/arch/x86/include/asm/pgalloc.h +--- linux-3.0.9/arch/x86/include/asm/pgalloc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgalloc.h 2011-11-12 12:47:13.000000000 -0500 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -8144,9 +8144,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgalloc.h linux-3.0.8/arch/x86/inclu set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-2level.h linux-3.0.8/arch/x86/include/asm/pgtable-2level.h ---- linux-3.0.8/arch/x86/include/asm/pgtable-2level.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable-2level.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-2level.h linux-3.0.9/arch/x86/include/asm/pgtable-2level.h +--- linux-3.0.9/arch/x86/include/asm/pgtable-2level.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable-2level.h 2011-11-12 12:47:13.000000000 -0500 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8157,9 +8157,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-2level.h linux-3.0.8/arch/x8 } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32.h linux-3.0.8/arch/x86/include/asm/pgtable_32.h ---- linux-3.0.8/arch/x86/include/asm/pgtable_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable_32.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32.h linux-3.0.9/arch/x86/include/asm/pgtable_32.h +--- linux-3.0.9/arch/x86/include/asm/pgtable_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -25,9 +25,6 @@ struct mm_struct; struct vm_area_struct; @@ -8203,9 +8203,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32.h linux-3.0.8/arch/x86/in /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h ---- linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h +--- linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable_32_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -8235,9 +8235,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_32_types.h linux-3.0.8/arch/ #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-3level.h linux-3.0.8/arch/x86/include/asm/pgtable-3level.h ---- linux-3.0.8/arch/x86/include/asm/pgtable-3level.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable-3level.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable-3level.h linux-3.0.9/arch/x86/include/asm/pgtable-3level.h +--- linux-3.0.9/arch/x86/include/asm/pgtable-3level.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable-3level.h 2011-11-12 12:47:13.000000000 -0500 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -8255,9 +8255,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable-3level.h linux-3.0.8/arch/x8 } /* -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64.h linux-3.0.8/arch/x86/include/asm/pgtable_64.h ---- linux-3.0.8/arch/x86/include/asm/pgtable_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable_64.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64.h linux-3.0.9/arch/x86/include/asm/pgtable_64.h +--- linux-3.0.9/arch/x86/include/asm/pgtable_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -16,10 +16,13 @@ extern pud_t level3_kernel_pgt[512]; @@ -8298,9 +8298,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64.h linux-3.0.8/arch/x86/in *pgdp = pgd; } -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h ---- linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h +--- linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable_64_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; #define MODULES_VADDR _AC(0xffffffffa0000000, UL) #define MODULES_END _AC(0xffffffffff000000, UL) @@ -8312,9 +8312,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_64_types.h linux-3.0.8/arch/ +#define ktva_ktla(addr) (addr) #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable.h linux-3.0.8/arch/x86/include/asm/pgtable.h ---- linux-3.0.8/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable.h linux-3.0.9/arch/x86/include/asm/pgtable.h +--- linux-3.0.9/arch/x86/include/asm/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable.h 2011-11-12 12:47:13.000000000 -0500 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm #ifndef __PAGETABLE_PUD_FOLDED @@ -8492,9 +8492,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable.h linux-3.0.8/arch/x86/inclu #include <asm-generic/pgtable.h> #endif /* __ASSEMBLY__ */ -diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_types.h linux-3.0.8/arch/x86/include/asm/pgtable_types.h ---- linux-3.0.8/arch/x86/include/asm/pgtable_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/pgtable_types.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/pgtable_types.h linux-3.0.9/arch/x86/include/asm/pgtable_types.h +--- linux-3.0.9/arch/x86/include/asm/pgtable_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/pgtable_types.h 2011-11-12 12:47:13.000000000 -0500 @@ -16,13 +16,12 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -8608,9 +8608,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/pgtable_types.h linux-3.0.8/arch/x86 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-3.0.8/arch/x86/include/asm/processor.h linux-3.0.8/arch/x86/include/asm/processor.h ---- linux-3.0.8/arch/x86/include/asm/processor.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/processor.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/processor.h linux-3.0.9/arch/x86/include/asm/processor.h +--- linux-3.0.9/arch/x86/include/asm/processor.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/processor.h 2011-11-12 12:47:13.000000000 -0500 @@ -266,7 +266,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -8713,9 +8713,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/processor.h linux-3.0.8/arch/x86/inc #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-3.0.8/arch/x86/include/asm/ptrace.h linux-3.0.8/arch/x86/include/asm/ptrace.h ---- linux-3.0.8/arch/x86/include/asm/ptrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/ptrace.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/ptrace.h linux-3.0.9/arch/x86/include/asm/ptrace.h +--- linux-3.0.9/arch/x86/include/asm/ptrace.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/ptrace.h 2011-11-12 12:47:13.000000000 -0500 @@ -153,28 +153,29 @@ static inline unsigned long regs_return_ } @@ -8752,9 +8752,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/ptrace.h linux-3.0.8/arch/x86/includ #endif } -diff -urNp linux-3.0.8/arch/x86/include/asm/reboot.h linux-3.0.8/arch/x86/include/asm/reboot.h ---- linux-3.0.8/arch/x86/include/asm/reboot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/reboot.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/reboot.h linux-3.0.9/arch/x86/include/asm/reboot.h +--- linux-3.0.9/arch/x86/include/asm/reboot.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/reboot.h 2011-11-12 12:47:13.000000000 -0500 @@ -6,19 +6,19 @@ struct pt_regs; @@ -8781,9 +8781,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/reboot.h linux-3.0.8/arch/x86/includ /* These must match dispatch_table in reboot_32.S */ #define MRR_BIOS 0 #define MRR_APM 1 -diff -urNp linux-3.0.8/arch/x86/include/asm/rwsem.h linux-3.0.8/arch/x86/include/asm/rwsem.h ---- linux-3.0.8/arch/x86/include/asm/rwsem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/rwsem.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/rwsem.h linux-3.0.9/arch/x86/include/asm/rwsem.h +--- linux-3.0.9/arch/x86/include/asm/rwsem.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/rwsem.h 2011-11-12 12:47:13.000000000 -0500 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -8908,9 +8908,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/rwsem.h linux-3.0.8/arch/x86/include : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-3.0.8/arch/x86/include/asm/segment.h linux-3.0.8/arch/x86/include/asm/segment.h ---- linux-3.0.8/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/segment.h 2011-09-17 00:53:42.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/segment.h linux-3.0.9/arch/x86/include/asm/segment.h +--- linux-3.0.9/arch/x86/include/asm/segment.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/segment.h 2011-11-12 12:47:13.000000000 -0500 @@ -64,10 +64,15 @@ * 26 - ESPFIX small SS * 27 - per-cpu [ offset to per-cpu data area ] @@ -8977,9 +8977,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/segment.h linux-3.0.8/arch/x86/inclu #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-3.0.8/arch/x86/include/asm/smp.h linux-3.0.8/arch/x86/include/asm/smp.h ---- linux-3.0.8/arch/x86/include/asm/smp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/smp.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/smp.h linux-3.0.9/arch/x86/include/asm/smp.h +--- linux-3.0.9/arch/x86/include/asm/smp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/smp.h 2011-11-12 12:47:13.000000000 -0500 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_ /* cpus sharing the last level cache: */ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map); @@ -9015,9 +9015,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/smp.h linux-3.0.8/arch/x86/include/a #define safe_smp_processor_id() smp_processor_id() #endif -diff -urNp linux-3.0.8/arch/x86/include/asm/spinlock.h linux-3.0.8/arch/x86/include/asm/spinlock.h ---- linux-3.0.8/arch/x86/include/asm/spinlock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/spinlock.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/spinlock.h linux-3.0.9/arch/x86/include/asm/spinlock.h +--- linux-3.0.9/arch/x86/include/asm/spinlock.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/spinlock.h 2011-11-12 12:47:13.000000000 -0500 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar static inline void arch_read_lock(arch_rwlock_t *rw) { @@ -9080,9 +9080,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/spinlock.h linux-3.0.8/arch/x86/incl : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-3.0.8/arch/x86/include/asm/stackprotector.h linux-3.0.8/arch/x86/include/asm/stackprotector.h ---- linux-3.0.8/arch/x86/include/asm/stackprotector.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/stackprotector.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/stackprotector.h linux-3.0.9/arch/x86/include/asm/stackprotector.h +--- linux-3.0.9/arch/x86/include/asm/stackprotector.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/stackprotector.h 2011-11-12 12:47:13.000000000 -0500 @@ -48,7 +48,7 @@ * head_32 for boot CPU and setup_per_cpu_areas() for others. */ @@ -9101,9 +9101,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/stackprotector.h linux-3.0.8/arch/x8 asm volatile ("mov %0, %%gs" : : "r" (0)); #endif } -diff -urNp linux-3.0.8/arch/x86/include/asm/stacktrace.h linux-3.0.8/arch/x86/include/asm/stacktrace.h ---- linux-3.0.8/arch/x86/include/asm/stacktrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/stacktrace.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/stacktrace.h linux-3.0.9/arch/x86/include/asm/stacktrace.h +--- linux-3.0.9/arch/x86/include/asm/stacktrace.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/stacktrace.h 2011-11-12 12:47:13.000000000 -0500 @@ -11,28 +11,20 @@ extern int kstack_depth_to_print; @@ -9154,9 +9154,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/stacktrace.h linux-3.0.8/arch/x86/in }; void dump_trace(struct task_struct *tsk, struct pt_regs *regs, -diff -urNp linux-3.0.8/arch/x86/include/asm/sys_ia32.h linux-3.0.8/arch/x86/include/asm/sys_ia32.h ---- linux-3.0.8/arch/x86/include/asm/sys_ia32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/sys_ia32.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/sys_ia32.h linux-3.0.9/arch/x86/include/asm/sys_ia32.h +--- linux-3.0.9/arch/x86/include/asm/sys_ia32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/sys_ia32.h 2011-11-12 12:47:13.000000000 -0500 @@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int compat_sigset_t __user *, unsigned int); asmlinkage long sys32_alarm(unsigned int); @@ -9166,9 +9166,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/sys_ia32.h linux-3.0.8/arch/x86/incl asmlinkage long sys32_sysfs(int, u32, u32); asmlinkage long sys32_sched_rr_get_interval(compat_pid_t, -diff -urNp linux-3.0.8/arch/x86/include/asm/system.h linux-3.0.8/arch/x86/include/asm/system.h ---- linux-3.0.8/arch/x86/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/system.h linux-3.0.9/arch/x86/include/asm/system.h +--- linux-3.0.9/arch/x86/include/asm/system.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/system.h 2011-11-12 12:47:13.000000000 -0500 @@ -129,7 +129,7 @@ do { \ "call __switch_to\n\t" \ "movq "__percpu_arg([current_task])",%%rsi\n\t" \ @@ -9211,9 +9211,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/system.h linux-3.0.8/arch/x86/includ /* * Force strict CPU ordering. -diff -urNp linux-3.0.8/arch/x86/include/asm/thread_info.h linux-3.0.8/arch/x86/include/asm/thread_info.h ---- linux-3.0.8/arch/x86/include/asm/thread_info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/thread_info.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/thread_info.h linux-3.0.9/arch/x86/include/asm/thread_info.h +--- linux-3.0.9/arch/x86/include/asm/thread_info.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/thread_info.h 2011-11-12 12:47:13.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/compiler.h> #include <asm/page.h> @@ -9361,9 +9361,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/thread_info.h linux-3.0.8/arch/x86/i + #endif #endif /* _ASM_X86_THREAD_INFO_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_32.h linux-3.0.8/arch/x86/include/asm/uaccess_32.h ---- linux-3.0.8/arch/x86/include/asm/uaccess_32.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/uaccess_32.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_32.h linux-3.0.9/arch/x86/include/asm/uaccess_32.h +--- linux-3.0.9/arch/x86/include/asm/uaccess_32.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/uaccess_32.h 2011-11-12 12:47:13.000000000 -0500 @@ -43,6 +43,11 @@ 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) @@ -9531,9 +9531,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_32.h linux-3.0.8/arch/x86/in return n; } -diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_64.h linux-3.0.8/arch/x86/include/asm/uaccess_64.h ---- linux-3.0.8/arch/x86/include/asm/uaccess_64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/uaccess_64.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess_64.h linux-3.0.9/arch/x86/include/asm/uaccess_64.h +--- linux-3.0.9/arch/x86/include/asm/uaccess_64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/uaccess_64.h 2011-11-12 12:47:13.000000000 -0500 @@ -10,6 +10,9 @@ #include <asm/alternative.h> #include <asm/cpufeature.h> @@ -9945,9 +9945,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess_64.h linux-3.0.8/arch/x86/in +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess.h linux-3.0.8/arch/x86/include/asm/uaccess.h ---- linux-3.0.8/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/uaccess.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/uaccess.h linux-3.0.9/arch/x86/include/asm/uaccess.h +--- linux-3.0.9/arch/x86/include/asm/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/uaccess.h 2011-11-12 12:47:13.000000000 -0500 @@ -7,12 +7,15 @@ #include <linux/compiler.h> #include <linux/thread_info.h> @@ -10167,9 +10167,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/uaccess.h linux-3.0.8/arch/x86/inclu } while (0) #ifdef CONFIG_X86_WP_WORKS_OK -diff -urNp linux-3.0.8/arch/x86/include/asm/vdso.h linux-3.0.8/arch/x86/include/asm/vdso.h ---- linux-3.0.8/arch/x86/include/asm/vdso.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/vdso.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/vdso.h linux-3.0.9/arch/x86/include/asm/vdso.h +--- linux-3.0.9/arch/x86/include/asm/vdso.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/vdso.h 2011-11-12 12:47:13.000000000 -0500 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[]; #define VDSO32_SYMBOL(base, name) \ ({ \ @@ -10179,9 +10179,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/vdso.h linux-3.0.8/arch/x86/include/ }) #endif -diff -urNp linux-3.0.8/arch/x86/include/asm/x86_init.h linux-3.0.8/arch/x86/include/asm/x86_init.h ---- linux-3.0.8/arch/x86/include/asm/x86_init.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/x86_init.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/x86_init.h linux-3.0.9/arch/x86/include/asm/x86_init.h +--- linux-3.0.9/arch/x86/include/asm/x86_init.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/x86_init.h 2011-11-12 12:47:13.000000000 -0500 @@ -28,7 +28,7 @@ struct x86_init_mpparse { void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); void (*find_smp_config)(void); @@ -10299,9 +10299,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/x86_init.h linux-3.0.8/arch/x86/incl extern struct x86_init_ops x86_init; extern struct x86_cpuinit_ops x86_cpuinit; -diff -urNp linux-3.0.8/arch/x86/include/asm/xsave.h linux-3.0.8/arch/x86/include/asm/xsave.h ---- linux-3.0.8/arch/x86/include/asm/xsave.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/include/asm/xsave.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/include/asm/xsave.h linux-3.0.9/arch/x86/include/asm/xsave.h +--- linux-3.0.9/arch/x86/include/asm/xsave.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/include/asm/xsave.h 2011-11-12 12:47:13.000000000 -0500 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav { int err; @@ -10331,9 +10331,9 @@ diff -urNp linux-3.0.8/arch/x86/include/asm/xsave.h linux-3.0.8/arch/x86/include __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" "2:\n" ".section .fixup,\"ax\"\n" -diff -urNp linux-3.0.8/arch/x86/Kconfig linux-3.0.8/arch/x86/Kconfig ---- linux-3.0.8/arch/x86/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/Kconfig 2011-09-17 00:58:36.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/Kconfig linux-3.0.9/arch/x86/Kconfig +--- linux-3.0.9/arch/x86/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/Kconfig 2011-11-12 12:47:13.000000000 -0500 @@ -229,7 +229,7 @@ config X86_HT config X86_32_LAZY_GS @@ -10406,9 +10406,9 @@ diff -urNp linux-3.0.8/arch/x86/Kconfig linux-3.0.8/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. -diff -urNp linux-3.0.8/arch/x86/Kconfig.cpu linux-3.0.8/arch/x86/Kconfig.cpu ---- linux-3.0.8/arch/x86/Kconfig.cpu 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/Kconfig.cpu 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/Kconfig.cpu linux-3.0.9/arch/x86/Kconfig.cpu +--- linux-3.0.9/arch/x86/Kconfig.cpu 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/Kconfig.cpu 2011-11-12 12:47:13.000000000 -0500 @@ -338,7 +338,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -10436,9 +10436,9 @@ diff -urNp linux-3.0.8/arch/x86/Kconfig.cpu linux-3.0.8/arch/x86/Kconfig.cpu config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-3.0.8/arch/x86/Kconfig.debug linux-3.0.8/arch/x86/Kconfig.debug ---- linux-3.0.8/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/Kconfig.debug linux-3.0.9/arch/x86/Kconfig.debug +--- linux-3.0.9/arch/x86/Kconfig.debug 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/Kconfig.debug 2011-11-12 12:47:13.000000000 -0500 @@ -81,7 +81,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -10457,9 +10457,9 @@ diff -urNp linux-3.0.8/arch/x86/Kconfig.debug linux-3.0.8/arch/x86/Kconfig.debug ---help--- This option helps catch unintended modifications to loadable kernel module's text and read-only data. It also prevents execution -diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile ---- linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile +--- linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/acpi/realmode/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) @@ -10470,9 +10470,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.8/arch/x KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n -diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/acpi/realmode/wakeup.S 2011-11-12 12:47:13.000000000 -0500 @@ -108,6 +108,9 @@ wakeup_code: /* Do any other stuff... */ @@ -10491,9 +10491,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.8/arch/x #else pushw $0 pushw trampoline_segment -diff -urNp linux-3.0.8/arch/x86/kernel/acpi/sleep.c linux-3.0.8/arch/x86/kernel/acpi/sleep.c ---- linux-3.0.8/arch/x86/kernel/acpi/sleep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/acpi/sleep.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/acpi/sleep.c linux-3.0.9/arch/x86/kernel/acpi/sleep.c +--- linux-3.0.9/arch/x86/kernel/acpi/sleep.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/acpi/sleep.c 2011-11-12 12:47:13.000000000 -0500 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void) header->trampoline_segment = trampoline_address() >> 4; #ifdef CONFIG_SMP @@ -10507,9 +10507,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/acpi/sleep.c linux-3.0.8/arch/x86/kernel/ initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; -diff -urNp linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S ---- linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S +--- linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/acpi/wakeup_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -10526,9 +10526,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.8/arch/x86/ker bogus_magic: jmp bogus_magic -diff -urNp linux-3.0.8/arch/x86/kernel/alternative.c linux-3.0.8/arch/x86/kernel/alternative.c ---- linux-3.0.8/arch/x86/kernel/alternative.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/alternative.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/alternative.c linux-3.0.9/arch/x86/kernel/alternative.c +--- linux-3.0.9/arch/x86/kernel/alternative.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/alternative.c 2011-11-12 12:47:13.000000000 -0500 @@ -313,7 +313,7 @@ static void alternatives_smp_lock(const if (!*poff || ptr < text || ptr >= text_end) continue; @@ -10630,9 +10630,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/alternative.c linux-3.0.8/arch/x86/kernel return addr; } -diff -urNp linux-3.0.8/arch/x86/kernel/apic/apic.c linux-3.0.8/arch/x86/kernel/apic/apic.c ---- linux-3.0.8/arch/x86/kernel/apic/apic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/apic/apic.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/apic/apic.c linux-3.0.9/arch/x86/kernel/apic/apic.c +--- linux-3.0.9/arch/x86/kernel/apic/apic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/apic/apic.c 2011-11-12 12:47:13.000000000 -0500 @@ -173,7 +173,7 @@ int first_system_vector = 0xfe; /* * Debug level, exported for io_apic.c @@ -10660,9 +10660,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/apic/apic.c linux-3.0.8/arch/x86/kernel/a bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid); bitmap_zero(clustermap, NUM_APIC_CLUSTERS); -diff -urNp linux-3.0.8/arch/x86/kernel/apic/io_apic.c linux-3.0.8/arch/x86/kernel/apic/io_apic.c ---- linux-3.0.8/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/apic/io_apic.c linux-3.0.9/arch/x86/kernel/apic/io_apic.c +--- linux-3.0.9/arch/x86/kernel/apic/io_apic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/apic/io_apic.c 2011-11-12 12:47:13.000000000 -0500 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); @@ -10699,9 +10699,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/apic/io_apic.c linux-3.0.8/arch/x86/kerne eoi_ioapic_irq(irq, cfg); } -diff -urNp linux-3.0.8/arch/x86/kernel/apm_32.c linux-3.0.8/arch/x86/kernel/apm_32.c ---- linux-3.0.8/arch/x86/kernel/apm_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/apm_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/apm_32.c linux-3.0.9/arch/x86/kernel/apm_32.c +--- linux-3.0.9/arch/x86/kernel/apm_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/apm_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex); * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. @@ -10773,9 +10773,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/apm_32.c linux-3.0.8/arch/x86/kernel/apm_ proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets_64.c linux-3.0.8/arch/x86/kernel/asm-offsets_64.c ---- linux-3.0.8/arch/x86/kernel/asm-offsets_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/asm-offsets_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets_64.c linux-3.0.9/arch/x86/kernel/asm-offsets_64.c +--- linux-3.0.9/arch/x86/kernel/asm-offsets_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/asm-offsets_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -69,6 +69,7 @@ int main(void) BLANK(); #undef ENTRY @@ -10784,9 +10784,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets_64.c linux-3.0.8/arch/x86/ker OFFSET(TSS_ist, tss_struct, x86_tss.ist); BLANK(); -diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets.c linux-3.0.8/arch/x86/kernel/asm-offsets.c ---- linux-3.0.8/arch/x86/kernel/asm-offsets.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/asm-offsets.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/asm-offsets.c linux-3.0.9/arch/x86/kernel/asm-offsets.c +--- linux-3.0.9/arch/x86/kernel/asm-offsets.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/asm-offsets.c 2011-11-12 12:47:13.000000000 -0500 @@ -33,6 +33,8 @@ void common(void) { OFFSET(TI_status, thread_info, status); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -10823,9 +10823,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/asm-offsets.c linux-3.0.8/arch/x86/kernel #ifdef CONFIG_XEN BLANK(); OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/amd.c linux-3.0.8/arch/x86/kernel/cpu/amd.c ---- linux-3.0.8/arch/x86/kernel/cpu/amd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/amd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/amd.c linux-3.0.9/arch/x86/kernel/cpu/amd.c +--- linux-3.0.9/arch/x86/kernel/cpu/amd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/amd.c 2011-11-12 12:47:13.000000000 -0500 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c unsigned int size) { @@ -10835,9 +10835,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/amd.c linux-3.0.8/arch/x86/kernel/cpu /* Duron Rev A0 */ if (c->x86_model == 3 && c->x86_mask == 0) size = 64; -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/common.c linux-3.0.8/arch/x86/kernel/cpu/common.c ---- linux-3.0.8/arch/x86/kernel/cpu/common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/common.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/common.c linux-3.0.9/arch/x86/kernel/cpu/common.c +--- linux-3.0.9/arch/x86/kernel/cpu/common.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/common.c 2011-11-12 12:47:13.000000000 -0500 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -10982,9 +10982,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/common.c linux-3.0.8/arch/x86/kernel/ struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/intel.c linux-3.0.8/arch/x86/kernel/cpu/intel.c ---- linux-3.0.8/arch/x86/kernel/cpu/intel.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/intel.c 2011-08-29 23:30:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/intel.c linux-3.0.9/arch/x86/kernel/cpu/intel.c +--- linux-3.0.9/arch/x86/kernel/cpu/intel.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/intel.c 2011-11-12 12:47:13.000000000 -0500 @@ -172,7 +172,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. @@ -10994,9 +10994,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/intel.c linux-3.0.8/arch/x86/kernel/c load_idt(&idt_descr); } #endif -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/Makefile linux-3.0.8/arch/x86/kernel/cpu/Makefile ---- linux-3.0.8/arch/x86/kernel/cpu/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/Makefile linux-3.0.9/arch/x86/kernel/cpu/Makefile +--- linux-3.0.9/arch/x86/kernel/cpu/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg CFLAGS_REMOVE_perf_event.o = -pg endif @@ -11008,9 +11008,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/Makefile linux-3.0.8/arch/x86/kernel/ obj-y := intel_cacheinfo.o scattered.o topology.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o mshyperv.o -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce.c 2011-11-12 12:47:13.000000000 -0500 @@ -46,6 +46,7 @@ #include <asm/ipi.h> #include <asm/mce.h> @@ -11112,9 +11112,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.8/arch/x86/ker atomic_set(&mce_executing, 0); atomic_set(&mce_callin, 0); atomic_set(&global_nwo, 0); -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c ---- linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c +--- linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-11-12 12:47:13.000000000 -0500 @@ -215,7 +215,9 @@ static int inject_init(void) if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL)) return -ENOMEM; @@ -11126,9 +11126,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.8/arch/ register_die_notifier(&mce_raise_nb); return 0; } -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c ---- linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c +--- linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/main.c 2011-11-12 12:47:13.000000000 -0500 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -11138,9 +11138,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.8/arch/x86/kern const struct mtrr_ops *mtrr_if; -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-11-12 12:47:13.000000000 -0500 @@ -25,7 +25,7 @@ struct mtrr_ops { int (*validate_add_page)(unsigned long base, unsigned long size, unsigned int type); @@ -11150,9 +11150,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.8/arch/x86/kern extern int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg); -diff -urNp linux-3.0.8/arch/x86/kernel/cpu/perf_event.c linux-3.0.8/arch/x86/kernel/cpu/perf_event.c ---- linux-3.0.8/arch/x86/kernel/cpu/perf_event.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/cpu/perf_event.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/cpu/perf_event.c linux-3.0.9/arch/x86/kernel/cpu/perf_event.c +--- linux-3.0.9/arch/x86/kernel/cpu/perf_event.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/cpu/perf_event.c 2011-11-12 12:47:13.000000000 -0500 @@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp int i, j, w, wmax, num = 0; struct hw_perf_event *hwc; @@ -11171,9 +11171,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/cpu/perf_event.c linux-3.0.8/arch/x86/ker } } -diff -urNp linux-3.0.8/arch/x86/kernel/crash.c linux-3.0.8/arch/x86/kernel/crash.c ---- linux-3.0.8/arch/x86/kernel/crash.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/crash.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/crash.c linux-3.0.9/arch/x86/kernel/crash.c +--- linux-3.0.9/arch/x86/kernel/crash.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/crash.c 2011-11-12 12:47:13.000000000 -0500 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -11183,9 +11183,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/crash.c linux-3.0.8/arch/x86/kernel/crash crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-3.0.8/arch/x86/kernel/doublefault_32.c linux-3.0.8/arch/x86/kernel/doublefault_32.c ---- linux-3.0.8/arch/x86/kernel/doublefault_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/doublefault_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/doublefault_32.c linux-3.0.9/arch/x86/kernel/doublefault_32.c +--- linux-3.0.9/arch/x86/kernel/doublefault_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/doublefault_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -11217,9 +11217,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/doublefault_32.c linux-3.0.8/arch/x86/ker .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_32.c linux-3.0.8/arch/x86/kernel/dumpstack_32.c ---- linux-3.0.8/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_32.c linux-3.0.9/arch/x86/kernel/dumpstack_32.c +--- linux-3.0.9/arch/x86/kernel/dumpstack_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/dumpstack_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task bp = stack_frame(task, regs); @@ -11283,9 +11283,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_32.c linux-3.0.8/arch/x86/kerne if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_64.c linux-3.0.8/arch/x86/kernel/dumpstack_64.c ---- linux-3.0.8/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack_64.c linux-3.0.9/arch/x86/kernel/dumpstack_64.c +--- linux-3.0.9/arch/x86/kernel/dumpstack_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/dumpstack_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task unsigned long *irq_stack_end = (unsigned long *)per_cpu(irq_stack_ptr, cpu); @@ -11337,9 +11337,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack_64.c linux-3.0.8/arch/x86/kerne put_cpu(); } EXPORT_SYMBOL(dump_trace); -diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack.c linux-3.0.8/arch/x86/kernel/dumpstack.c ---- linux-3.0.8/arch/x86/kernel/dumpstack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/dumpstack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/dumpstack.c linux-3.0.9/arch/x86/kernel/dumpstack.c +--- linux-3.0.9/arch/x86/kernel/dumpstack.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/dumpstack.c 2011-11-12 12:47:13.000000000 -0500 @@ -2,6 +2,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs @@ -11483,9 +11483,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/dumpstack.c linux-3.0.8/arch/x86/kernel/d report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-3.0.8/arch/x86/kernel/early_printk.c linux-3.0.8/arch/x86/kernel/early_printk.c ---- linux-3.0.8/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/early_printk.c linux-3.0.9/arch/x86/kernel/early_printk.c +--- linux-3.0.9/arch/x86/kernel/early_printk.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/early_printk.c 2011-11-12 12:47:13.000000000 -0500 @@ -7,6 +7,7 @@ #include <linux/pci_regs.h> #include <linux/pci_ids.h> @@ -11503,9 +11503,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/early_printk.c linux-3.0.8/arch/x86/kerne va_start(ap, fmt); n = vscnprintf(buf, sizeof(buf), fmt, ap); early_console->write(early_console, buf, n); -diff -urNp linux-3.0.8/arch/x86/kernel/entry_32.S linux-3.0.8/arch/x86/kernel/entry_32.S ---- linux-3.0.8/arch/x86/kernel/entry_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/entry_32.S 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/entry_32.S linux-3.0.9/arch/x86/kernel/entry_32.S +--- linux-3.0.9/arch/x86/kernel/entry_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/entry_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -185,13 +185,146 @@ /*CFI_REL_OFFSET gs, PT_GS*/ .endm @@ -12283,9 +12283,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/entry_32.S linux-3.0.8/arch/x86/kernel/en #endif /* -diff -urNp linux-3.0.8/arch/x86/kernel/entry_64.S linux-3.0.8/arch/x86/kernel/entry_64.S ---- linux-3.0.8/arch/x86/kernel/entry_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/entry_64.S 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/entry_64.S linux-3.0.9/arch/x86/kernel/entry_64.S +--- linux-3.0.9/arch/x86/kernel/entry_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/entry_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -53,6 +53,8 @@ #include <asm/paravirt.h> #include <asm/ftrace.h> @@ -13216,9 +13216,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/entry_64.S linux-3.0.8/arch/x86/kernel/en /* * End of kprobes section -diff -urNp linux-3.0.8/arch/x86/kernel/ftrace.c linux-3.0.8/arch/x86/kernel/ftrace.c ---- linux-3.0.8/arch/x86/kernel/ftrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/ftrace.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/ftrace.c linux-3.0.9/arch/x86/kernel/ftrace.c +--- linux-3.0.9/arch/x86/kernel/ftrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/ftrace.c 2011-11-12 12:47:13.000000000 -0500 @@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the static const void *mod_code_newcode; /* holds the text to write to the IP */ @@ -13276,9 +13276,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/ftrace.c linux-3.0.8/arch/x86/kernel/ftra if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-3.0.8/arch/x86/kernel/head32.c linux-3.0.8/arch/x86/kernel/head32.c ---- linux-3.0.8/arch/x86/kernel/head32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/head32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/head32.c linux-3.0.9/arch/x86/kernel/head32.c +--- linux-3.0.9/arch/x86/kernel/head32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/head32.c 2011-11-12 12:47:13.000000000 -0500 @@ -19,6 +19,7 @@ #include <asm/io_apic.h> #include <asm/bios_ebda.h> @@ -13296,9 +13296,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/head32.c linux-3.0.8/arch/x86/kernel/head #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-3.0.8/arch/x86/kernel/head_32.S linux-3.0.8/arch/x86/kernel/head_32.S ---- linux-3.0.8/arch/x86/kernel/head_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/head_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/head_32.S linux-3.0.9/arch/x86/kernel/head_32.S +--- linux-3.0.9/arch/x86/kernel/head_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/head_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -25,6 +25,12 @@ /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) @@ -13733,9 +13733,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/head_32.S linux-3.0.8/arch/x86/kernel/hea + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-3.0.8/arch/x86/kernel/head_64.S linux-3.0.8/arch/x86/kernel/head_64.S ---- linux-3.0.8/arch/x86/kernel/head_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/head_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/head_64.S linux-3.0.9/arch/x86/kernel/head_64.S +--- linux-3.0.9/arch/x86/kernel/head_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/head_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -19,6 +19,7 @@ #include <asm/cache.h> #include <asm/processor-flags.h> @@ -14005,9 +14005,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/head_64.S linux-3.0.8/arch/x86/kernel/hea __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c ---- linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c +--- linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/i386_ksyms_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -14029,9 +14029,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/i386_ksyms_32.c linux-3.0.8/arch/x86/kern +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-3.0.8/arch/x86/kernel/i8259.c linux-3.0.8/arch/x86/kernel/i8259.c ---- linux-3.0.8/arch/x86/kernel/i8259.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/i8259.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/i8259.c linux-3.0.9/arch/x86/kernel/i8259.c +--- linux-3.0.9/arch/x86/kernel/i8259.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/i8259.c 2011-11-12 12:47:13.000000000 -0500 @@ -210,7 +210,7 @@ spurious_8259A_irq: "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; @@ -14041,9 +14041,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/i8259.c linux-3.0.8/arch/x86/kernel/i8259 /* * Theoretically we do not have to handle this IRQ, * but in Linux this does not cause problems and is -diff -urNp linux-3.0.8/arch/x86/kernel/init_task.c linux-3.0.8/arch/x86/kernel/init_task.c ---- linux-3.0.8/arch/x86/kernel/init_task.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/init_task.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/init_task.c linux-3.0.9/arch/x86/kernel/init_task.c +--- linux-3.0.9/arch/x86/kernel/init_task.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/init_task.c 2011-11-12 12:47:13.000000000 -0500 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan * way process stacks are handled. This is done by having a special * "init_task" linker map entry.. @@ -14062,9 +14062,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/init_task.c linux-3.0.8/arch/x86/kernel/i - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-3.0.8/arch/x86/kernel/ioport.c linux-3.0.8/arch/x86/kernel/ioport.c ---- linux-3.0.8/arch/x86/kernel/ioport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/ioport.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/ioport.c linux-3.0.9/arch/x86/kernel/ioport.c +--- linux-3.0.9/arch/x86/kernel/ioport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/ioport.c 2011-11-12 12:47:13.000000000 -0500 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -14108,9 +14108,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/ioport.c linux-3.0.8/arch/x86/kernel/iopo if (!capable(CAP_SYS_RAWIO)) return -EPERM; } -diff -urNp linux-3.0.8/arch/x86/kernel/irq_32.c linux-3.0.8/arch/x86/kernel/irq_32.c ---- linux-3.0.8/arch/x86/kernel/irq_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/irq_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/irq_32.c linux-3.0.9/arch/x86/kernel/irq_32.c +--- linux-3.0.9/arch/x86/kernel/irq_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/irq_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -36,7 +36,7 @@ static int check_stack_overflow(void) __asm__ __volatile__("andl %%esp,%0" : "=r" (sp) : "0" (THREAD_SIZE - 1)); @@ -14250,9 +14250,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/irq_32.c linux-3.0.8/arch/x86/kernel/irq_ /* * Shouldn't happen, we returned above if in_interrupt(): */ -diff -urNp linux-3.0.8/arch/x86/kernel/irq.c linux-3.0.8/arch/x86/kernel/irq.c ---- linux-3.0.8/arch/x86/kernel/irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/irq.c linux-3.0.9/arch/x86/kernel/irq.c +--- linux-3.0.9/arch/x86/kernel/irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -17,7 +17,7 @@ #include <asm/mce.h> #include <asm/hw_irq.h> @@ -14287,9 +14287,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/irq.c linux-3.0.8/arch/x86/kernel/irq.c #endif return sum; } -diff -urNp linux-3.0.8/arch/x86/kernel/kgdb.c linux-3.0.8/arch/x86/kernel/kgdb.c ---- linux-3.0.8/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/kgdb.c linux-3.0.9/arch/x86/kernel/kgdb.c +--- linux-3.0.9/arch/x86/kernel/kgdb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/kgdb.c 2011-11-12 12:47:13.000000000 -0500 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, #ifdef CONFIG_X86_32 switch (regno) { @@ -14328,10 +14328,10 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kgdb.c linux-3.0.8/arch/x86/kernel/kgdb.c if (user_mode(regs)) return single_step_cont(regs, args); break; -diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kprobes.c ---- linux-3.0.8/arch/x86/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/kprobes.c 2011-10-11 10:44:33.000000000 -0400 -@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat +diff -urNp linux-3.0.9/arch/x86/kernel/kprobes.c linux-3.0.9/arch/x86/kernel/kprobes.c +--- linux-3.0.9/arch/x86/kernel/kprobes.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/kprobes.c 2011-11-12 12:47:13.000000000 -0500 +@@ -117,8 +117,11 @@ static void __kprobes __synthesize_relat } __attribute__((packed)) *insn; insn = (struct __arch_relative_insn *)from; @@ -14343,7 +14343,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr } /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/ -@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_op +@@ -155,7 +158,7 @@ static int __kprobes can_boost(kprobe_op kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; @@ -14352,7 +14352,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr return 0; /* Page fault may occur on this address. */ retry: -@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction( +@@ -316,7 +319,9 @@ static int __kprobes __copy_instruction( } } insn_get_length(&insn); @@ -14362,7 +14362,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr #ifdef CONFIG_X86_64 if (insn_rip_relative(&insn)) { -@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction( +@@ -340,7 +345,9 @@ static int __kprobes __copy_instruction( (u8 *) dest; BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */ disp = (u8 *) dest + insn_offset_displacement(&insn); @@ -14372,7 +14372,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr } #endif return insn.length; -@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(s +@@ -354,12 +361,12 @@ static void __kprobes arch_copy_kprobe(s */ __copy_instruction(p->ainsn.insn, p->addr, 0); @@ -14387,7 +14387,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr } int __kprobes arch_prepare_kprobe(struct kprobe *p) -@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(s +@@ -476,7 +483,7 @@ static void __kprobes setup_singlestep(s * nor set current_kprobe, because it doesn't use single * stepping. */ @@ -14396,7 +14396,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr preempt_enable_no_resched(); return; } -@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(s +@@ -495,7 +502,7 @@ static void __kprobes setup_singlestep(s if (p->opcode == BREAKPOINT_INSTRUCTION) regs->ip = (unsigned long)p->addr; else @@ -14405,7 +14405,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr } /* -@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(stru +@@ -574,7 +581,7 @@ static int __kprobes kprobe_handler(stru setup_singlestep(p, regs, kcb, 0); return 1; } @@ -14414,7 +14414,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed -@@ -680,6 +687,9 @@ static void __used __kprobes kretprobe_t +@@ -682,6 +689,9 @@ static void __used __kprobes kretprobe_t " movq %rax, 152(%rsp)\n" RESTORE_REGS_STRING " popfq\n" @@ -14424,7 +14424,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr #else " pushf\n" SAVE_REGS_STRING -@@ -817,7 +827,7 @@ static void __kprobes resume_execution(s +@@ -819,7 +829,7 @@ static void __kprobes resume_execution(s struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); @@ -14433,7 +14433,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; -@@ -999,7 +1009,7 @@ int __kprobes kprobe_exceptions_notify(s +@@ -1001,7 +1011,7 @@ int __kprobes kprobe_exceptions_notify(s struct die_args *args = data; int ret = NOTIFY_DONE; @@ -14442,7 +14442,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr return ret; switch (val) { -@@ -1381,7 +1391,7 @@ int __kprobes arch_prepare_optimized_kpr +@@ -1383,7 +1393,7 @@ int __kprobes arch_prepare_optimized_kpr * Verify if the address gap is in 2GB range, because this uses * a relative jump. */ @@ -14451,7 +14451,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr if (abs(rel) > 0x7fffffff) return -ERANGE; -@@ -1402,11 +1412,11 @@ int __kprobes arch_prepare_optimized_kpr +@@ -1404,11 +1414,11 @@ int __kprobes arch_prepare_optimized_kpr synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op); /* Set probe function call */ @@ -14465,7 +14465,7 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr flush_icache_range((unsigned long) buf, (unsigned long) buf + TMPL_END_IDX + -@@ -1428,7 +1438,7 @@ static void __kprobes setup_optimize_kpr +@@ -1430,7 +1440,7 @@ static void __kprobes setup_optimize_kpr ((long)op->kp.addr + RELATIVEJUMP_SIZE)); /* Backup instructions which will be replaced by jump address */ @@ -14474,9 +14474,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kprobes.c linux-3.0.8/arch/x86/kernel/kpr RELATIVE_ADDR_SIZE); insn_buf[0] = RELATIVEJUMP_OPCODE; -diff -urNp linux-3.0.8/arch/x86/kernel/kvm.c linux-3.0.8/arch/x86/kernel/kvm.c ---- linux-3.0.8/arch/x86/kernel/kvm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/kvm.c 2011-08-24 18:10:12.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/kvm.c linux-3.0.9/arch/x86/kernel/kvm.c +--- linux-3.0.9/arch/x86/kernel/kvm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/kvm.c 2011-11-12 12:47:13.000000000 -0500 @@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo pv_mmu_ops.set_pud = kvm_set_pud; #if PAGETABLE_LEVELS == 4 @@ -14485,9 +14485,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/kvm.c linux-3.0.8/arch/x86/kernel/kvm.c #endif #endif pv_mmu_ops.flush_tlb_user = kvm_flush_tlb; -diff -urNp linux-3.0.8/arch/x86/kernel/ldt.c linux-3.0.8/arch/x86/kernel/ldt.c ---- linux-3.0.8/arch/x86/kernel/ldt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/ldt.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/ldt.c linux-3.0.9/arch/x86/kernel/ldt.c +--- linux-3.0.9/arch/x86/kernel/ldt.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/ldt.c 2011-11-12 12:47:13.000000000 -0500 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -14552,9 +14552,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/ldt.c linux-3.0.8/arch/x86/kernel/ldt.c fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-3.0.8/arch/x86/kernel/machine_kexec_32.c linux-3.0.8/arch/x86/kernel/machine_kexec_32.c ---- linux-3.0.8/arch/x86/kernel/machine_kexec_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/machine_kexec_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/machine_kexec_32.c linux-3.0.9/arch/x86/kernel/machine_kexec_32.c +--- linux-3.0.9/arch/x86/kernel/machine_kexec_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/machine_kexec_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -27,7 +27,7 @@ #include <asm/cacheflush.h> #include <asm/debugreg.h> @@ -14582,9 +14582,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/machine_kexec_32.c linux-3.0.8/arch/x86/k relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-3.0.8/arch/x86/kernel/microcode_intel.c linux-3.0.8/arch/x86/kernel/microcode_intel.c ---- linux-3.0.8/arch/x86/kernel/microcode_intel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/microcode_intel.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/microcode_intel.c linux-3.0.9/arch/x86/kernel/microcode_intel.c +--- linux-3.0.9/arch/x86/kernel/microcode_intel.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/microcode_intel.c 2011-11-12 12:47:13.000000000 -0500 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -14601,9 +14601,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/microcode_intel.c linux-3.0.8/arch/x86/ke } static void microcode_fini_cpu(int cpu) -diff -urNp linux-3.0.8/arch/x86/kernel/module.c linux-3.0.8/arch/x86/kernel/module.c ---- linux-3.0.8/arch/x86/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/module.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/module.c linux-3.0.9/arch/x86/kernel/module.c +--- linux-3.0.9/arch/x86/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/module.c 2011-11-12 12:47:13.000000000 -0500 @@ -36,21 +36,66 @@ #define DEBUGP(fmt...) #endif @@ -14742,9 +14742,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/module.c linux-3.0.8/arch/x86/kernel/modu #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-3.0.8/arch/x86/kernel/paravirt.c linux-3.0.8/arch/x86/kernel/paravirt.c ---- linux-3.0.8/arch/x86/kernel/paravirt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/paravirt.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/paravirt.c linux-3.0.9/arch/x86/kernel/paravirt.c +--- linux-3.0.9/arch/x86/kernel/paravirt.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/paravirt.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x) { return x; @@ -14893,9 +14893,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/paravirt.c linux-3.0.8/arch/x86/kernel/pa }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c ---- linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c +--- linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/paravirt-spinlocks.c 2011-11-12 12:47:13.000000000 -0500 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t arch_spin_lock(lock); } @@ -14905,9 +14905,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.8/arch/x86 #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-3.0.8/arch/x86/kernel/pci-iommu_table.c linux-3.0.8/arch/x86/kernel/pci-iommu_table.c ---- linux-3.0.8/arch/x86/kernel/pci-iommu_table.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/pci-iommu_table.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/pci-iommu_table.c linux-3.0.9/arch/x86/kernel/pci-iommu_table.c +--- linux-3.0.9/arch/x86/kernel/pci-iommu_table.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/pci-iommu_table.c 2011-11-12 12:47:13.000000000 -0500 @@ -2,7 +2,7 @@ #include <asm/iommu_table.h> #include <linux/string.h> @@ -14926,9 +14926,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/pci-iommu_table.c linux-3.0.8/arch/x86/ke /* Simple cyclic dependency checker. */ for (p = start; p < finish; p++) { q = find_dependents_of(start, finish, p); -diff -urNp linux-3.0.8/arch/x86/kernel/process_32.c linux-3.0.8/arch/x86/kernel/process_32.c ---- linux-3.0.8/arch/x86/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/process_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/process_32.c linux-3.0.9/arch/x86/kernel/process_32.c +--- linux-3.0.9/arch/x86/kernel/process_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/process_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -15015,9 +15015,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/process_32.c linux-3.0.8/arch/x86/kernel/ return 0; } - -diff -urNp linux-3.0.8/arch/x86/kernel/process_64.c linux-3.0.8/arch/x86/kernel/process_64.c ---- linux-3.0.8/arch/x86/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/process_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/process_64.c linux-3.0.9/arch/x86/kernel/process_64.c +--- linux-3.0.9/arch/x86/kernel/process_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/process_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -87,7 +87,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -15082,9 +15082,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/process_64.c linux-3.0.8/arch/x86/kernel/ return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-3.0.8/arch/x86/kernel/process.c linux-3.0.8/arch/x86/kernel/process.c ---- linux-3.0.8/arch/x86/kernel/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/process.c 2011-08-30 18:23:52.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/process.c linux-3.0.9/arch/x86/kernel/process.c +--- linux-3.0.9/arch/x86/kernel/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/process.c 2011-11-12 12:47:13.000000000 -0500 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru void free_thread_info(struct thread_info *ti) @@ -15222,9 +15222,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/process.c linux-3.0.8/arch/x86/kernel/pro +#endif +} +#endif -diff -urNp linux-3.0.8/arch/x86/kernel/ptrace.c linux-3.0.8/arch/x86/kernel/ptrace.c ---- linux-3.0.8/arch/x86/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/ptrace.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/ptrace.c linux-3.0.9/arch/x86/kernel/ptrace.c +--- linux-3.0.9/arch/x86/kernel/ptrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/ptrace.c 2011-11-12 12:47:13.000000000 -0500 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi unsigned long addr, unsigned long data) { @@ -15260,9 +15260,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/ptrace.c linux-3.0.8/arch/x86/kernel/ptra } void user_single_step_siginfo(struct task_struct *tsk, -diff -urNp linux-3.0.8/arch/x86/kernel/pvclock.c linux-3.0.8/arch/x86/kernel/pvclock.c ---- linux-3.0.8/arch/x86/kernel/pvclock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/pvclock.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/pvclock.c linux-3.0.9/arch/x86/kernel/pvclock.c +--- linux-3.0.9/arch/x86/kernel/pvclock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/pvclock.c 2011-11-12 12:47:13.000000000 -0500 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc return pv_tsc_khz; } @@ -15291,9 +15291,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/pvclock.c linux-3.0.8/arch/x86/kernel/pvc } while (unlikely(last != ret)); return ret; -diff -urNp linux-3.0.8/arch/x86/kernel/reboot.c linux-3.0.8/arch/x86/kernel/reboot.c ---- linux-3.0.8/arch/x86/kernel/reboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/reboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/reboot.c linux-3.0.9/arch/x86/kernel/reboot.c +--- linux-3.0.9/arch/x86/kernel/reboot.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/reboot.c 2011-11-12 12:47:13.000000000 -0500 @@ -35,7 +35,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -15425,9 +15425,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/reboot.c linux-3.0.8/arch/x86/kernel/rebo } struct machine_ops machine_ops = { -diff -urNp linux-3.0.8/arch/x86/kernel/setup.c linux-3.0.8/arch/x86/kernel/setup.c ---- linux-3.0.8/arch/x86/kernel/setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/setup.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/setup.c linux-3.0.9/arch/x86/kernel/setup.c +--- linux-3.0.9/arch/x86/kernel/setup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/setup.c 2011-11-12 12:47:13.000000000 -0500 @@ -447,7 +447,7 @@ static void __init parse_setup_data(void switch (data->type) { @@ -15466,9 +15466,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/setup.c linux-3.0.8/arch/x86/kernel/setup data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-3.0.8/arch/x86/kernel/setup_percpu.c linux-3.0.8/arch/x86/kernel/setup_percpu.c ---- linux-3.0.8/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/setup_percpu.c linux-3.0.9/arch/x86/kernel/setup_percpu.c +--- linux-3.0.9/arch/x86/kernel/setup_percpu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/setup_percpu.c 2011-11-12 12:47:13.000000000 -0500 @@ -21,19 +21,17 @@ #include <asm/cpu.h> #include <asm/stackprotector.h> @@ -15532,9 +15532,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/setup_percpu.c linux-3.0.8/arch/x86/kerne /* * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. -diff -urNp linux-3.0.8/arch/x86/kernel/signal.c linux-3.0.8/arch/x86/kernel/signal.c ---- linux-3.0.8/arch/x86/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/signal.c linux-3.0.9/arch/x86/kernel/signal.c +--- linux-3.0.9/arch/x86/kernel/signal.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/signal.c 2011-11-12 12:47:13.000000000 -0500 @@ -198,7 +198,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. @@ -15618,9 +15618,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/signal.c linux-3.0.8/arch/x86/kernel/sign return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-3.0.8/arch/x86/kernel/smpboot.c linux-3.0.8/arch/x86/kernel/smpboot.c ---- linux-3.0.8/arch/x86/kernel/smpboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/smpboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/smpboot.c linux-3.0.9/arch/x86/kernel/smpboot.c +--- linux-3.0.9/arch/x86/kernel/smpboot.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/smpboot.c 2011-11-12 12:47:13.000000000 -0500 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api set_idle_for_cpu(cpu, c_idle.idle); do_rest: @@ -15658,9 +15658,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/smpboot.c linux-3.0.8/arch/x86/kernel/smp err = do_boot_cpu(apicid, cpu); if (err) { pr_debug("do_boot_cpu failed %d\n", err); -diff -urNp linux-3.0.8/arch/x86/kernel/step.c linux-3.0.8/arch/x86/kernel/step.c ---- linux-3.0.8/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/step.c linux-3.0.9/arch/x86/kernel/step.c +--- linux-3.0.9/arch/x86/kernel/step.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/step.c 2011-11-12 12:47:13.000000000 -0500 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -15703,17 +15703,17 @@ diff -urNp linux-3.0.8/arch/x86/kernel/step.c linux-3.0.8/arch/x86/kernel/step.c /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-3.0.8/arch/x86/kernel/syscall_table_32.S linux-3.0.8/arch/x86/kernel/syscall_table_32.S ---- linux-3.0.8/arch/x86/kernel/syscall_table_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/syscall_table_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/syscall_table_32.S linux-3.0.9/arch/x86/kernel/syscall_table_32.S +--- linux-3.0.9/arch/x86/kernel/syscall_table_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/syscall_table_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-3.0.8/arch/x86/kernel/sys_i386_32.c linux-3.0.8/arch/x86/kernel/sys_i386_32.c ---- linux-3.0.8/arch/x86/kernel/sys_i386_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/sys_i386_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/sys_i386_32.c linux-3.0.9/arch/x86/kernel/sys_i386_32.c +--- linux-3.0.9/arch/x86/kernel/sys_i386_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/sys_i386_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -24,17 +24,224 @@ #include <asm/syscalls.h> @@ -15951,9 +15951,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/sys_i386_32.c linux-3.0.8/arch/x86/kernel + + return addr; } -diff -urNp linux-3.0.8/arch/x86/kernel/sys_x86_64.c linux-3.0.8/arch/x86/kernel/sys_x86_64.c ---- linux-3.0.8/arch/x86/kernel/sys_x86_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/sys_x86_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/sys_x86_64.c linux-3.0.9/arch/x86/kernel/sys_x86_64.c +--- linux-3.0.9/arch/x86/kernel/sys_x86_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/sys_x86_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -32,8 +32,8 @@ out: return error; } @@ -16091,9 +16091,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/sys_x86_64.c linux-3.0.8/arch/x86/kernel/ mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-3.0.8/arch/x86/kernel/tboot.c linux-3.0.8/arch/x86/kernel/tboot.c ---- linux-3.0.8/arch/x86/kernel/tboot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/tboot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/tboot.c linux-3.0.9/arch/x86/kernel/tboot.c +--- linux-3.0.9/arch/x86/kernel/tboot.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/tboot.c 2011-11-12 12:47:13.000000000 -0500 @@ -217,7 +217,7 @@ static int tboot_setup_sleep(void) void tboot_shutdown(u32 shutdown_type) @@ -16142,9 +16142,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/tboot.c linux-3.0.8/arch/x86/kernel/tboot register_hotcpu_notifier(&tboot_cpu_notifier); return 0; } -diff -urNp linux-3.0.8/arch/x86/kernel/time.c linux-3.0.8/arch/x86/kernel/time.c ---- linux-3.0.8/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/time.c linux-3.0.9/arch/x86/kernel/time.c +--- linux-3.0.9/arch/x86/kernel/time.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/time.c 2011-11-12 12:47:13.000000000 -0500 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs { unsigned long pc = instruction_pointer(regs); @@ -16175,9 +16175,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/time.c linux-3.0.8/arch/x86/kernel/time.c } return pc; } -diff -urNp linux-3.0.8/arch/x86/kernel/tls.c linux-3.0.8/arch/x86/kernel/tls.c ---- linux-3.0.8/arch/x86/kernel/tls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/tls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/tls.c linux-3.0.9/arch/x86/kernel/tls.c +--- linux-3.0.9/arch/x86/kernel/tls.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/tls.c 2011-11-12 12:47:13.000000000 -0500 @@ -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; @@ -16190,9 +16190,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/tls.c linux-3.0.8/arch/x86/kernel/tls.c set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-3.0.8/arch/x86/kernel/trampoline_32.S linux-3.0.8/arch/x86/kernel/trampoline_32.S ---- linux-3.0.8/arch/x86/kernel/trampoline_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/trampoline_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_32.S linux-3.0.9/arch/x86/kernel/trampoline_32.S +--- linux-3.0.9/arch/x86/kernel/trampoline_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/trampoline_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -16215,9 +16215,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/trampoline_32.S linux-3.0.8/arch/x86/kern # 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-3.0.8/arch/x86/kernel/trampoline_64.S linux-3.0.8/arch/x86/kernel/trampoline_64.S ---- linux-3.0.8/arch/x86/kernel/trampoline_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/trampoline_64.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/trampoline_64.S linux-3.0.9/arch/x86/kernel/trampoline_64.S +--- linux-3.0.9/arch/x86/kernel/trampoline_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/trampoline_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -90,7 +90,7 @@ startup_32: movl $__KERNEL_DS, %eax # Initialize the %ds segment register movl %eax, %ds @@ -16236,9 +16236,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/trampoline_64.S linux-3.0.8/arch/x86/kern .long tgdt - r_base .short 0 .quad 0x00cf9b000000ffff # __KERNEL32_CS -diff -urNp linux-3.0.8/arch/x86/kernel/traps.c linux-3.0.8/arch/x86/kernel/traps.c ---- linux-3.0.8/arch/x86/kernel/traps.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/traps.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/traps.c linux-3.0.9/arch/x86/kernel/traps.c +--- linux-3.0.9/arch/x86/kernel/traps.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/traps.c 2011-11-12 12:47:13.000000000 -0500 @@ -70,12 +70,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -16418,9 +16418,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/traps.c linux-3.0.8/arch/x86/kernel/traps if (!tsk_used_math(tsk)) { local_irq_enable(); -diff -urNp linux-3.0.8/arch/x86/kernel/verify_cpu.S linux-3.0.8/arch/x86/kernel/verify_cpu.S ---- linux-3.0.8/arch/x86/kernel/verify_cpu.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/verify_cpu.S 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S linux-3.0.9/arch/x86/kernel/verify_cpu.S +--- linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-12 12:47:13.000000000 -0500 @@ -20,6 +20,7 @@ * arch/x86/boot/compressed/head_64.S: Boot cpu verification * arch/x86/kernel/trampoline_64.S: secondary processor verification @@ -16429,9 +16429,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/verify_cpu.S linux-3.0.8/arch/x86/kernel/ * * verify_cpu, returns the status of longmode and SSE in register %eax. * 0: Success 1: Failure -diff -urNp linux-3.0.8/arch/x86/kernel/vm86_32.c linux-3.0.8/arch/x86/kernel/vm86_32.c ---- linux-3.0.8/arch/x86/kernel/vm86_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/vm86_32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/vm86_32.c linux-3.0.9/arch/x86/kernel/vm86_32.c +--- linux-3.0.9/arch/x86/kernel/vm86_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/vm86_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -16496,9 +16496,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/vm86_32.c linux-3.0.8/arch/x86/kernel/vm8 if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-3.0.8/arch/x86/kernel/vmlinux.lds.S linux-3.0.8/arch/x86/kernel/vmlinux.lds.S ---- linux-3.0.8/arch/x86/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/vmlinux.lds.S linux-3.0.9/arch/x86/kernel/vmlinux.lds.S +--- linux-3.0.9/arch/x86/kernel/vmlinux.lds.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/vmlinux.lds.S 2011-11-12 12:47:13.000000000 -0500 @@ -26,6 +26,13 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -16761,9 +16761,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/vmlinux.lds.S linux-3.0.8/arch/x86/kernel "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-3.0.8/arch/x86/kernel/vsyscall_64.c linux-3.0.8/arch/x86/kernel/vsyscall_64.c ---- linux-3.0.8/arch/x86/kernel/vsyscall_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/vsyscall_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/vsyscall_64.c linux-3.0.9/arch/x86/kernel/vsyscall_64.c +--- linux-3.0.9/arch/x86/kernel/vsyscall_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/vsyscall_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode); DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = { @@ -16782,9 +16782,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/vsyscall_64.c linux-3.0.8/arch/x86/kernel .proc_handler = proc_dointvec }, {} }; -diff -urNp linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c ---- linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c +--- linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/x8664_ksyms_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic_string); EXPORT_SYMBOL(copy_user_generic_unrolled); @@ -16794,9 +16794,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.8/arch/x86/ker EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(clear_page); -diff -urNp linux-3.0.8/arch/x86/kernel/xsave.c linux-3.0.8/arch/x86/kernel/xsave.c ---- linux-3.0.8/arch/x86/kernel/xsave.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kernel/xsave.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kernel/xsave.c linux-3.0.9/arch/x86/kernel/xsave.c +--- linux-3.0.9/arch/x86/kernel/xsave.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kernel/xsave.c 2011-11-12 12:47:13.000000000 -0500 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -EINVAL; @@ -16824,9 +16824,9 @@ diff -urNp linux-3.0.8/arch/x86/kernel/xsave.c linux-3.0.8/arch/x86/kernel/xsave buf); if (unlikely(err)) { /* -diff -urNp linux-3.0.8/arch/x86/kvm/emulate.c linux-3.0.8/arch/x86/kvm/emulate.c ---- linux-3.0.8/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/emulate.c linux-3.0.9/arch/x86/kvm/emulate.c +--- linux-3.0.9/arch/x86/kvm/emulate.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/emulate.c 2011-11-12 12:47:13.000000000 -0500 @@ -96,7 +96,7 @@ #define Src2ImmByte (2<<29) #define Src2One (3<<29) @@ -16861,9 +16861,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/emulate.c linux-3.0.8/arch/x86/kvm/emulate.c switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \ -diff -urNp linux-3.0.8/arch/x86/kvm/lapic.c linux-3.0.8/arch/x86/kvm/lapic.c ---- linux-3.0.8/arch/x86/kvm/lapic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/lapic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/lapic.c linux-3.0.9/arch/x86/kvm/lapic.c +--- linux-3.0.9/arch/x86/kvm/lapic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/lapic.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,7 +53,7 @@ #define APIC_BUS_CYCLE_NS 1 @@ -16873,9 +16873,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/lapic.c linux-3.0.8/arch/x86/kvm/lapic.c #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ -diff -urNp linux-3.0.8/arch/x86/kvm/mmu.c linux-3.0.8/arch/x86/kvm/mmu.c ---- linux-3.0.8/arch/x86/kvm/mmu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/mmu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/mmu.c linux-3.0.9/arch/x86/kvm/mmu.c +--- linux-3.0.9/arch/x86/kvm/mmu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/mmu.c 2011-11-12 12:47:13.000000000 -0500 @@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu * pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes); @@ -16894,9 +16894,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/mmu.c linux-3.0.8/arch/x86/kvm/mmu.c gentry = 0; kvm_mmu_free_some_pages(vcpu); ++vcpu->kvm->stat.mmu_pte_write; -diff -urNp linux-3.0.8/arch/x86/kvm/paging_tmpl.h linux-3.0.8/arch/x86/kvm/paging_tmpl.h ---- linux-3.0.8/arch/x86/kvm/paging_tmpl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/paging_tmpl.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/paging_tmpl.h linux-3.0.9/arch/x86/kvm/paging_tmpl.h +--- linux-3.0.9/arch/x86/kvm/paging_tmpl.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/paging_tmpl.h 2011-11-12 12:47:13.000000000 -0500 @@ -182,7 +182,7 @@ walk: break; } @@ -16924,9 +16924,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/paging_tmpl.h linux-3.0.8/arch/x86/kvm/pagin spin_unlock(&vcpu->kvm->mmu_lock); -diff -urNp linux-3.0.8/arch/x86/kvm/svm.c linux-3.0.8/arch/x86/kvm/svm.c ---- linux-3.0.8/arch/x86/kvm/svm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/svm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/svm.c linux-3.0.9/arch/x86/kvm/svm.c +--- linux-3.0.9/arch/x86/kvm/svm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/svm.c 2011-11-12 12:47:13.000000000 -0500 @@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu * int cpu = raw_smp_processor_id(); @@ -16950,9 +16950,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/svm.c linux-3.0.8/arch/x86/kvm/svm.c reload_tss(vcpu); local_irq_disable(); -diff -urNp linux-3.0.8/arch/x86/kvm/vmx.c linux-3.0.8/arch/x86/kvm/vmx.c ---- linux-3.0.8/arch/x86/kvm/vmx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/vmx.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/vmx.c linux-3.0.9/arch/x86/kvm/vmx.c +--- linux-3.0.9/arch/x86/kvm/vmx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/vmx.c 2011-11-12 12:47:13.000000000 -0500 @@ -797,7 +797,11 @@ static void reload_tss(void) struct desc_struct *descs; @@ -17031,9 +17031,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/vmx.c linux-3.0.8/arch/x86/kvm/vmx.c vmx->launched = 1; vmx->exit_reason = vmcs_read32(VM_EXIT_REASON); -diff -urNp linux-3.0.8/arch/x86/kvm/x86.c linux-3.0.8/arch/x86/kvm/x86.c ---- linux-3.0.8/arch/x86/kvm/x86.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/kvm/x86.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/kvm/x86.c linux-3.0.9/arch/x86/kvm/x86.c +--- linux-3.0.9/arch/x86/kvm/x86.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/kvm/x86.c 2011-11-12 12:47:13.000000000 -0500 @@ -1313,8 +1313,8 @@ static int xen_hvm_config(struct kvm_vcp { struct kvm *kvm = vcpu->kvm; @@ -17119,9 +17119,9 @@ diff -urNp linux-3.0.8/arch/x86/kvm/x86.c linux-3.0.8/arch/x86/kvm/x86.c { int r; struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; -diff -urNp linux-3.0.8/arch/x86/lguest/boot.c linux-3.0.8/arch/x86/lguest/boot.c ---- linux-3.0.8/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lguest/boot.c linux-3.0.9/arch/x86/lguest/boot.c +--- linux-3.0.9/arch/x86/lguest/boot.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lguest/boot.c 2011-11-12 12:47:13.000000000 -0500 @@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt * Rebooting also tells the Host we're finished, but the RESTART flag tells the * Launcher to reboot us. @@ -17134,9 +17134,9 @@ diff -urNp linux-3.0.8/arch/x86/lguest/boot.c linux-3.0.8/arch/x86/lguest/boot.c } /*G:050 -diff -urNp linux-3.0.8/arch/x86/lib/atomic64_32.c linux-3.0.8/arch/x86/lib/atomic64_32.c ---- linux-3.0.8/arch/x86/lib/atomic64_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/atomic64_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/atomic64_32.c linux-3.0.9/arch/x86/lib/atomic64_32.c +--- linux-3.0.9/arch/x86/lib/atomic64_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/atomic64_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -8,18 +8,30 @@ long long atomic64_read_cx8(long long, const atomic64_t *v); @@ -17215,9 +17215,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/atomic64_32.c linux-3.0.8/arch/x86/lib/atomi long long atomic64_dec_if_positive_386(atomic64_t *v); EXPORT_SYMBOL(atomic64_dec_if_positive_386); int atomic64_inc_not_zero_386(atomic64_t *v); -diff -urNp linux-3.0.8/arch/x86/lib/atomic64_386_32.S linux-3.0.8/arch/x86/lib/atomic64_386_32.S ---- linux-3.0.8/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/atomic64_386_32.S linux-3.0.9/arch/x86/lib/atomic64_386_32.S +--- linux-3.0.9/arch/x86/lib/atomic64_386_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/atomic64_386_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -48,6 +48,10 @@ BEGIN(read) movl (v), %eax movl 4(v), %edx @@ -17473,9 +17473,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/atomic64_386_32.S linux-3.0.8/arch/x86/lib/a js 1f movl %eax, (v) movl %edx, 4(v) -diff -urNp linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S ---- linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S +--- linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/atomic64_cx8_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8) CFI_STARTPROC @@ -17697,9 +17697,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/atomic64_cx8_32.S linux-3.0.8/arch/x86/lib/a ret 4: testl %edx, %edx -diff -urNp linux-3.0.8/arch/x86/lib/checksum_32.S linux-3.0.8/arch/x86/lib/checksum_32.S ---- linux-3.0.8/arch/x86/lib/checksum_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/checksum_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/checksum_32.S linux-3.0.9/arch/x86/lib/checksum_32.S +--- linux-3.0.9/arch/x86/lib/checksum_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/checksum_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -17944,9 +17944,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/checksum_32.S linux-3.0.8/arch/x86/lib/check #undef ROUND #undef ROUND1 -diff -urNp linux-3.0.8/arch/x86/lib/clear_page_64.S linux-3.0.8/arch/x86/lib/clear_page_64.S ---- linux-3.0.8/arch/x86/lib/clear_page_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/clear_page_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/clear_page_64.S linux-3.0.9/arch/x86/lib/clear_page_64.S +--- linux-3.0.9/arch/x86/lib/clear_page_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/clear_page_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -11,6 +11,7 @@ ENTRY(clear_page_c) movl $4096/8,%ecx xorl %eax,%eax @@ -17980,9 +17980,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/clear_page_64.S linux-3.0.8/arch/x86/lib/cle 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: .byte 0xeb /* jmp <disp8> */ -diff -urNp linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S ---- linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S +--- linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/cmpxchg16b_emu.S 2011-11-12 12:47:13.000000000 -0500 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu: popf @@ -17997,9 +17997,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.8/arch/x86/lib/cm ret CFI_ENDPROC -diff -urNp linux-3.0.8/arch/x86/lib/copy_page_64.S linux-3.0.8/arch/x86/lib/copy_page_64.S ---- linux-3.0.8/arch/x86/lib/copy_page_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/copy_page_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/copy_page_64.S linux-3.0.9/arch/x86/lib/copy_page_64.S +--- linux-3.0.9/arch/x86/lib/copy_page_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/copy_page_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -2,12 +2,14 @@ #include <linux/linkage.h> @@ -18032,9 +18032,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/copy_page_64.S linux-3.0.8/arch/x86/lib/copy 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-3.0.8/arch/x86/lib/copy_user_64.S linux-3.0.8/arch/x86/lib/copy_user_64.S ---- linux-3.0.8/arch/x86/lib/copy_user_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/copy_user_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/copy_user_64.S linux-3.0.9/arch/x86/lib/copy_user_64.S +--- linux-3.0.9/arch/x86/lib/copy_user_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/copy_user_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -16,6 +16,7 @@ #include <asm/thread_info.h> #include <asm/cpufeature.h> @@ -18127,9 +18127,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/copy_user_64.S linux-3.0.8/arch/x86/lib/copy ret .section .fixup,"ax" -diff -urNp linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S ---- linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S +--- linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/copy_user_nocache_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -8,12 +8,14 @@ #include <linux/linkage.h> @@ -18169,9 +18169,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/copy_user_nocache_64.S linux-3.0.8/arch/x86/ ret .section .fixup,"ax" -diff -urNp linux-3.0.8/arch/x86/lib/csum-copy_64.S linux-3.0.8/arch/x86/lib/csum-copy_64.S ---- linux-3.0.8/arch/x86/lib/csum-copy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/csum-copy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/csum-copy_64.S linux-3.0.9/arch/x86/lib/csum-copy_64.S +--- linux-3.0.9/arch/x86/lib/csum-copy_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/csum-copy_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -8,6 +8,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -18188,9 +18188,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/csum-copy_64.S linux-3.0.8/arch/x86/lib/csum ret CFI_RESTORE_STATE -diff -urNp linux-3.0.8/arch/x86/lib/csum-wrappers_64.c linux-3.0.8/arch/x86/lib/csum-wrappers_64.c ---- linux-3.0.8/arch/x86/lib/csum-wrappers_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/csum-wrappers_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/csum-wrappers_64.c linux-3.0.9/arch/x86/lib/csum-wrappers_64.c +--- linux-3.0.9/arch/x86/lib/csum-wrappers_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/csum-wrappers_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _ len -= 2; } @@ -18221,9 +18221,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/csum-wrappers_64.c linux-3.0.8/arch/x86/lib/ len, isum, NULL, errp); } EXPORT_SYMBOL(csum_partial_copy_to_user); -diff -urNp linux-3.0.8/arch/x86/lib/getuser.S linux-3.0.8/arch/x86/lib/getuser.S ---- linux-3.0.8/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/getuser.S 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/getuser.S linux-3.0.9/arch/x86/lib/getuser.S +--- linux-3.0.9/arch/x86/lib/getuser.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/getuser.S 2011-11-12 12:47:13.000000000 -0500 @@ -33,15 +33,38 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -18347,9 +18347,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/getuser.S linux-3.0.8/arch/x86/lib/getuser.S ret CFI_ENDPROC END(bad_get_user) -diff -urNp linux-3.0.8/arch/x86/lib/insn.c linux-3.0.8/arch/x86/lib/insn.c ---- linux-3.0.8/arch/x86/lib/insn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/insn.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/insn.c linux-3.0.9/arch/x86/lib/insn.c +--- linux-3.0.9/arch/x86/lib/insn.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/insn.c 2011-11-12 12:47:13.000000000 -0500 @@ -21,6 +21,11 @@ #include <linux/string.h> #include <asm/inat.h> @@ -18373,9 +18373,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/insn.c linux-3.0.8/arch/x86/lib/insn.c insn->x86_64 = x86_64 ? 1 : 0; insn->opnd_bytes = 4; if (x86_64) -diff -urNp linux-3.0.8/arch/x86/lib/iomap_copy_64.S linux-3.0.8/arch/x86/lib/iomap_copy_64.S ---- linux-3.0.8/arch/x86/lib/iomap_copy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/iomap_copy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/iomap_copy_64.S linux-3.0.9/arch/x86/lib/iomap_copy_64.S +--- linux-3.0.9/arch/x86/lib/iomap_copy_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/iomap_copy_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -17,6 +17,7 @@ #include <linux/linkage.h> @@ -18392,9 +18392,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/iomap_copy_64.S linux-3.0.8/arch/x86/lib/iom ret CFI_ENDPROC ENDPROC(__iowrite32_copy) -diff -urNp linux-3.0.8/arch/x86/lib/memcpy_64.S linux-3.0.8/arch/x86/lib/memcpy_64.S ---- linux-3.0.8/arch/x86/lib/memcpy_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/memcpy_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/memcpy_64.S linux-3.0.9/arch/x86/lib/memcpy_64.S +--- linux-3.0.9/arch/x86/lib/memcpy_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/memcpy_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -34,6 +34,7 @@ rep movsq movl %edx, %ecx @@ -18443,9 +18443,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/memcpy_64.S linux-3.0.8/arch/x86/lib/memcpy_ retq CFI_ENDPROC ENDPROC(memcpy) -diff -urNp linux-3.0.8/arch/x86/lib/memmove_64.S linux-3.0.8/arch/x86/lib/memmove_64.S ---- linux-3.0.8/arch/x86/lib/memmove_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/memmove_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/memmove_64.S linux-3.0.9/arch/x86/lib/memmove_64.S +--- linux-3.0.9/arch/x86/lib/memmove_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/memmove_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -9,6 +9,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -18470,9 +18470,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/memmove_64.S linux-3.0.8/arch/x86/lib/memmov retq .Lmemmove_end_forward_efs: .previous -diff -urNp linux-3.0.8/arch/x86/lib/memset_64.S linux-3.0.8/arch/x86/lib/memset_64.S ---- linux-3.0.8/arch/x86/lib/memset_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/memset_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/memset_64.S linux-3.0.9/arch/x86/lib/memset_64.S +--- linux-3.0.9/arch/x86/lib/memset_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/memset_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -31,6 +31,7 @@ movl %r8d,%ecx rep stosb @@ -18497,9 +18497,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/memset_64.S linux-3.0.8/arch/x86/lib/memset_ ret CFI_RESTORE_STATE -diff -urNp linux-3.0.8/arch/x86/lib/mmx_32.c linux-3.0.8/arch/x86/lib/mmx_32.c ---- linux-3.0.8/arch/x86/lib/mmx_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/mmx_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/mmx_32.c linux-3.0.9/arch/x86/lib/mmx_32.c +--- linux-3.0.9/arch/x86/lib/mmx_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/mmx_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -18815,9 +18815,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/mmx_32.c linux-3.0.8/arch/x86/lib/mmx_32.c from += 64; to += 64; -diff -urNp linux-3.0.8/arch/x86/lib/msr-reg.S linux-3.0.8/arch/x86/lib/msr-reg.S ---- linux-3.0.8/arch/x86/lib/msr-reg.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/msr-reg.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/msr-reg.S linux-3.0.9/arch/x86/lib/msr-reg.S +--- linux-3.0.9/arch/x86/lib/msr-reg.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/msr-reg.S 2011-11-12 12:47:13.000000000 -0500 @@ -3,6 +3,7 @@ #include <asm/dwarf2.h> #include <asm/asm.h> @@ -18834,9 +18834,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/msr-reg.S linux-3.0.8/arch/x86/lib/msr-reg.S ret 3: CFI_RESTORE_STATE -diff -urNp linux-3.0.8/arch/x86/lib/putuser.S linux-3.0.8/arch/x86/lib/putuser.S ---- linux-3.0.8/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/putuser.S 2011-10-07 19:07:23.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/putuser.S linux-3.0.9/arch/x86/lib/putuser.S +--- linux-3.0.9/arch/x86/lib/putuser.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/putuser.S 2011-11-12 12:47:13.000000000 -0500 @@ -15,7 +15,9 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -18976,9 +18976,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/putuser.S linux-3.0.8/arch/x86/lib/putuser.S #endif xor %eax,%eax EXIT -diff -urNp linux-3.0.8/arch/x86/lib/rwlock_64.S linux-3.0.8/arch/x86/lib/rwlock_64.S ---- linux-3.0.8/arch/x86/lib/rwlock_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/rwlock_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/rwlock_64.S linux-3.0.9/arch/x86/lib/rwlock_64.S +--- linux-3.0.9/arch/x86/lib/rwlock_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/rwlock_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -17,6 +17,7 @@ ENTRY(__write_lock_failed) LOCK_PREFIX subl $RW_LOCK_BIAS,(%rdi) @@ -18995,9 +18995,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/rwlock_64.S linux-3.0.8/arch/x86/lib/rwlock_ ret CFI_ENDPROC END(__read_lock_failed) -diff -urNp linux-3.0.8/arch/x86/lib/rwsem_64.S linux-3.0.8/arch/x86/lib/rwsem_64.S ---- linux-3.0.8/arch/x86/lib/rwsem_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/rwsem_64.S 2011-10-07 10:46:47.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/rwsem_64.S linux-3.0.9/arch/x86/lib/rwsem_64.S +--- linux-3.0.9/arch/x86/lib/rwsem_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/rwsem_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -51,6 +51,7 @@ ENTRY(call_rwsem_down_read_failed) popq_cfi %rdx CFI_RESTORE rdx @@ -19032,9 +19032,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/rwsem_64.S linux-3.0.8/arch/x86/lib/rwsem_64 ret CFI_ENDPROC ENDPROC(call_rwsem_downgrade_wake) -diff -urNp linux-3.0.8/arch/x86/lib/thunk_64.S linux-3.0.8/arch/x86/lib/thunk_64.S ---- linux-3.0.8/arch/x86/lib/thunk_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/thunk_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/thunk_64.S linux-3.0.9/arch/x86/lib/thunk_64.S +--- linux-3.0.9/arch/x86/lib/thunk_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/thunk_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -10,7 +10,8 @@ #include <asm/dwarf2.h> #include <asm/calling.h> @@ -19053,9 +19053,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/thunk_64.S linux-3.0.8/arch/x86/lib/thunk_64 + pax_force_retaddr + ret CFI_ENDPROC -diff -urNp linux-3.0.8/arch/x86/lib/usercopy_32.c linux-3.0.8/arch/x86/lib/usercopy_32.c ---- linux-3.0.8/arch/x86/lib/usercopy_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/usercopy_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/usercopy_32.c linux-3.0.9/arch/x86/lib/usercopy_32.c +--- linux-3.0.9/arch/x86/lib/usercopy_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/usercopy_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -43,7 +43,7 @@ do { \ __asm__ __volatile__( \ " testl %1,%1\n" \ @@ -19676,9 +19676,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/usercopy_32.c linux-3.0.8/arch/x86/lib/userc +} +EXPORT_SYMBOL(set_fs); +#endif -diff -urNp linux-3.0.8/arch/x86/lib/usercopy_64.c linux-3.0.8/arch/x86/lib/usercopy_64.c ---- linux-3.0.8/arch/x86/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/lib/usercopy_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/lib/usercopy_64.c linux-3.0.9/arch/x86/lib/usercopy_64.c +--- linux-3.0.9/arch/x86/lib/usercopy_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/lib/usercopy_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -42,6 +42,12 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) { @@ -19737,9 +19737,9 @@ diff -urNp linux-3.0.8/arch/x86/lib/usercopy_64.c linux-3.0.8/arch/x86/lib/userc { char c; unsigned zero_len; -diff -urNp linux-3.0.8/arch/x86/Makefile linux-3.0.8/arch/x86/Makefile ---- linux-3.0.8/arch/x86/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/Makefile 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/Makefile linux-3.0.9/arch/x86/Makefile +--- linux-3.0.9/arch/x86/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y) else BITS := 64 @@ -19761,9 +19761,9 @@ diff -urNp linux-3.0.8/arch/x86/Makefile linux-3.0.8/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-3.0.8/arch/x86/mm/extable.c linux-3.0.8/arch/x86/mm/extable.c ---- linux-3.0.8/arch/x86/mm/extable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/extable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/extable.c linux-3.0.9/arch/x86/mm/extable.c +--- linux-3.0.9/arch/x86/mm/extable.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/extable.c 2011-11-12 12:47:13.000000000 -0500 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs const struct exception_table_entry *fixup; @@ -19773,9 +19773,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/extable.c linux-3.0.8/arch/x86/mm/extable.c extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-3.0.8/arch/x86/mm/fault.c linux-3.0.8/arch/x86/mm/fault.c ---- linux-3.0.8/arch/x86/mm/fault.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/fault.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/fault.c linux-3.0.9/arch/x86/mm/fault.c +--- linux-3.0.9/arch/x86/mm/fault.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/fault.c 2011-11-12 12:47:13.000000000 -0500 @@ -13,10 +13,18 @@ #include <linux/perf_event.h> /* perf_sw_event */ #include <linux/hugetlb.h> /* hstate_index_to_shift */ @@ -20442,10 +20442,10 @@ diff -urNp linux-3.0.8/arch/x86/mm/fault.c linux-3.0.8/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-3.0.8/arch/x86/mm/gup.c linux-3.0.8/arch/x86/mm/gup.c ---- linux-3.0.8/arch/x86/mm/gup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/gup.c 2011-08-23 21:47:55.000000000 -0400 -@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long +diff -urNp linux-3.0.9/arch/x86/mm/gup.c linux-3.0.9/arch/x86/mm/gup.c +--- linux-3.0.9/arch/x86/mm/gup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/gup.c 2011-11-12 12:47:13.000000000 -0500 +@@ -253,7 +253,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; end = start + len; @@ -20454,9 +20454,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/gup.c linux-3.0.8/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-3.0.8/arch/x86/mm/highmem_32.c linux-3.0.8/arch/x86/mm/highmem_32.c ---- linux-3.0.8/arch/x86/mm/highmem_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/highmem_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/highmem_32.c linux-3.0.9/arch/x86/mm/highmem_32.c +--- linux-3.0.9/arch/x86/mm/highmem_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/highmem_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -20468,9 +20468,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/highmem_32.c linux-3.0.8/arch/x86/mm/highmem_ return (void *)vaddr; } -diff -urNp linux-3.0.8/arch/x86/mm/hugetlbpage.c linux-3.0.8/arch/x86/mm/hugetlbpage.c ---- linux-3.0.8/arch/x86/mm/hugetlbpage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/hugetlbpage.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/hugetlbpage.c linux-3.0.9/arch/x86/mm/hugetlbpage.c +--- linux-3.0.9/arch/x86/mm/hugetlbpage.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/hugetlbpage.c 2011-11-12 12:47:13.000000000 -0500 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -20678,9 +20678,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/hugetlbpage.c linux-3.0.8/arch/x86/mm/hugetlb return addr; } if (mm->get_unmapped_area == arch_get_unmapped_area) -diff -urNp linux-3.0.8/arch/x86/mm/init_32.c linux-3.0.8/arch/x86/mm/init_32.c ---- linux-3.0.8/arch/x86/mm/init_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/init_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/init_32.c linux-3.0.9/arch/x86/mm/init_32.c +--- linux-3.0.9/arch/x86/mm/init_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/init_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void) } @@ -20955,9 +20955,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/init_32.c linux-3.0.8/arch/x86/mm/init_32.c set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); -diff -urNp linux-3.0.8/arch/x86/mm/init_64.c linux-3.0.8/arch/x86/mm/init_64.c ---- linux-3.0.8/arch/x86/mm/init_64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/init_64.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/init_64.c linux-3.0.9/arch/x86/mm/init_64.c +--- linux-3.0.9/arch/x86/mm/init_64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/init_64.c 2011-11-12 12:47:13.000000000 -0500 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa * around without checking the pgd every time. */ @@ -21087,9 +21087,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/init_64.c linux-3.0.8/arch/x86/mm/init_64.c return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-3.0.8/arch/x86/mm/init.c linux-3.0.8/arch/x86/mm/init.c ---- linux-3.0.8/arch/x86/mm/init.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/init.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/init.c linux-3.0.9/arch/x86/mm/init.c +--- linux-3.0.9/arch/x86/mm/init.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/init.c 2011-11-12 12:47:13.000000000 -0500 @@ -31,7 +31,7 @@ int direct_gbpages static void __init find_early_table_space(unsigned long end, int use_pse, int use_gbpages) @@ -21222,9 +21222,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/init.c linux-3.0.8/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-3.0.8/arch/x86/mm/iomap_32.c linux-3.0.8/arch/x86/mm/iomap_32.c ---- linux-3.0.8/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/iomap_32.c linux-3.0.9/arch/x86/mm/iomap_32.c +--- linux-3.0.9/arch/x86/mm/iomap_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/iomap_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -21237,9 +21237,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/iomap_32.c linux-3.0.8/arch/x86/mm/iomap_32.c arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-3.0.8/arch/x86/mm/ioremap.c linux-3.0.8/arch/x86/mm/ioremap.c ---- linux-3.0.8/arch/x86/mm/ioremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/ioremap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/ioremap.c linux-3.0.9/arch/x86/mm/ioremap.c +--- linux-3.0.9/arch/x86/mm/ioremap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/ioremap.c 2011-11-12 12:47:13.000000000 -0500 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) { int is_ram = page_is_ram(pfn); @@ -21268,9 +21268,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/ioremap.c linux-3.0.8/arch/x86/mm/ioremap.c /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c ---- linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/kmemcheck/kmemcheck.c 2011-11-12 12:47:13.000000000 -0500 @@ -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. @@ -21283,9 +21283,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.8/arch/x86/mm return false; pte = kmemcheck_pte_lookup(address); -diff -urNp linux-3.0.8/arch/x86/mm/mmap.c linux-3.0.8/arch/x86/mm/mmap.c ---- linux-3.0.8/arch/x86/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/mmap.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/mmap.c linux-3.0.9/arch/x86/mm/mmap.c +--- linux-3.0.9/arch/x86/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/mmap.c 2011-11-12 12:47:13.000000000 -0500 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -21367,9 +21367,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/mmap.c linux-3.0.8/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-3.0.8/arch/x86/mm/mmio-mod.c linux-3.0.8/arch/x86/mm/mmio-mod.c ---- linux-3.0.8/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/mmio-mod.c linux-3.0.9/arch/x86/mm/mmio-mod.c +--- linux-3.0.9/arch/x86/mm/mmio-mod.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/mmio-mod.c 2011-11-12 12:47:13.000000000 -0500 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s break; default: @@ -21397,9 +21397,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/mmio-mod.c linux-3.0.8/arch/x86/mm/mmio-mod.c }; map.map_id = trace->id; -diff -urNp linux-3.0.8/arch/x86/mm/pageattr.c linux-3.0.8/arch/x86/mm/pageattr.c ---- linux-3.0.8/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pageattr.c linux-3.0.9/arch/x86/mm/pageattr.c +--- linux-3.0.9/arch/x86/mm/pageattr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pageattr.c 2011-11-12 12:47:13.000000000 -0500 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection */ #ifdef CONFIG_PCI_BIOS @@ -21484,9 +21484,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pageattr.c linux-3.0.8/arch/x86/mm/pageattr.c } static int -diff -urNp linux-3.0.8/arch/x86/mm/pageattr-test.c linux-3.0.8/arch/x86/mm/pageattr-test.c ---- linux-3.0.8/arch/x86/mm/pageattr-test.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pageattr-test.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pageattr-test.c linux-3.0.9/arch/x86/mm/pageattr-test.c +--- linux-3.0.9/arch/x86/mm/pageattr-test.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pageattr-test.c 2011-11-12 12:47:13.000000000 -0500 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -21496,9 +21496,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pageattr-test.c linux-3.0.8/arch/x86/mm/pagea } struct split_state { -diff -urNp linux-3.0.8/arch/x86/mm/pat.c linux-3.0.8/arch/x86/mm/pat.c ---- linux-3.0.8/arch/x86/mm/pat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pat.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pat.c linux-3.0.9/arch/x86/mm/pat.c +--- linux-3.0.9/arch/x86/mm/pat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pat.c 2011-11-12 12:47:13.000000000 -0500 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end) if (!entry) { @@ -21546,9 +21546,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pat.c linux-3.0.8/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-3.0.8/arch/x86/mm/pf_in.c linux-3.0.8/arch/x86/mm/pf_in.c ---- linux-3.0.8/arch/x86/mm/pf_in.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pf_in.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pf_in.c linux-3.0.9/arch/x86/mm/pf_in.c +--- linux-3.0.9/arch/x86/mm/pf_in.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pf_in.c 2011-11-12 12:47:13.000000000 -0500 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l int i; enum reason_type rv = OTHERS; @@ -21594,9 +21594,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pf_in.c linux-3.0.8/arch/x86/mm/pf_in.c p += skip_prefix(p, &prf); p += get_opcode(p, &opcode); for (i = 0; i < ARRAY_SIZE(imm_wop); i++) -diff -urNp linux-3.0.8/arch/x86/mm/pgtable_32.c linux-3.0.8/arch/x86/mm/pgtable_32.c ---- linux-3.0.8/arch/x86/mm/pgtable_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pgtable_32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pgtable_32.c linux-3.0.9/arch/x86/mm/pgtable_32.c +--- linux-3.0.9/arch/x86/mm/pgtable_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pgtable_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -21611,9 +21611,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pgtable_32.c linux-3.0.8/arch/x86/mm/pgtable_ /* * It's enough to flush this one mapping. -diff -urNp linux-3.0.8/arch/x86/mm/pgtable.c linux-3.0.8/arch/x86/mm/pgtable.c ---- linux-3.0.8/arch/x86/mm/pgtable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/pgtable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/pgtable.c linux-3.0.9/arch/x86/mm/pgtable.c +--- linux-3.0.9/arch/x86/mm/pgtable.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/pgtable.c 2011-11-12 12:47:13.000000000 -0500 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p list_del(&page->lru); } @@ -21859,9 +21859,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/pgtable.c linux-3.0.8/arch/x86/mm/pgtable.c pgd_dtor(pgd); paravirt_pgd_free(mm, pgd); free_page((unsigned long)pgd); -diff -urNp linux-3.0.8/arch/x86/mm/setup_nx.c linux-3.0.8/arch/x86/mm/setup_nx.c ---- linux-3.0.8/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/setup_nx.c linux-3.0.9/arch/x86/mm/setup_nx.c +--- linux-3.0.9/arch/x86/mm/setup_nx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/setup_nx.c 2011-11-12 12:47:13.000000000 -0500 @@ -5,8 +5,10 @@ #include <asm/pgtable.h> #include <asm/proto.h> @@ -21891,9 +21891,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/setup_nx.c linux-3.0.8/arch/x86/mm/setup_nx.c __supported_pte_mask &= ~_PAGE_NX; } -diff -urNp linux-3.0.8/arch/x86/mm/tlb.c linux-3.0.8/arch/x86/mm/tlb.c ---- linux-3.0.8/arch/x86/mm/tlb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/mm/tlb.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/mm/tlb.c linux-3.0.9/arch/x86/mm/tlb.c +--- linux-3.0.9/arch/x86/mm/tlb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/mm/tlb.c 2011-11-12 12:47:13.000000000 -0500 @@ -65,7 +65,11 @@ void leave_mm(int cpu) BUG(); cpumask_clear_cpu(cpu, @@ -21906,9 +21906,9 @@ diff -urNp linux-3.0.8/arch/x86/mm/tlb.c linux-3.0.8/arch/x86/mm/tlb.c } EXPORT_SYMBOL_GPL(leave_mm); -diff -urNp linux-3.0.8/arch/x86/net/bpf_jit_comp.c linux-3.0.8/arch/x86/net/bpf_jit_comp.c ---- linux-3.0.8/arch/x86/net/bpf_jit_comp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/net/bpf_jit_comp.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/net/bpf_jit_comp.c linux-3.0.9/arch/x86/net/bpf_jit_comp.c +--- linux-3.0.9/arch/x86/net/bpf_jit_comp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/net/bpf_jit_comp.c 2011-11-12 12:47:13.000000000 -0500 @@ -589,7 +589,9 @@ cond_branch: f_offset = addrs[i + filt module_free(NULL, image); return; @@ -21928,9 +21928,9 @@ diff -urNp linux-3.0.8/arch/x86/net/bpf_jit_comp.c linux-3.0.8/arch/x86/net/bpf_ proglen, sizeof(struct work_struct))); if (!image) -diff -urNp linux-3.0.8/arch/x86/net/bpf_jit.S linux-3.0.8/arch/x86/net/bpf_jit.S ---- linux-3.0.8/arch/x86/net/bpf_jit.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/net/bpf_jit.S 2011-10-07 19:07:28.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/net/bpf_jit.S linux-3.0.9/arch/x86/net/bpf_jit.S +--- linux-3.0.9/arch/x86/net/bpf_jit.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/net/bpf_jit.S 2011-11-12 12:47:13.000000000 -0500 @@ -9,6 +9,7 @@ */ #include <linux/linkage.h> @@ -22008,9 +22008,9 @@ diff -urNp linux-3.0.8/arch/x86/net/bpf_jit.S linux-3.0.8/arch/x86/net/bpf_jit.S xchg %eax,%ebx + pax_force_retaddr ret -diff -urNp linux-3.0.8/arch/x86/oprofile/backtrace.c linux-3.0.8/arch/x86/oprofile/backtrace.c ---- linux-3.0.8/arch/x86/oprofile/backtrace.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/arch/x86/oprofile/backtrace.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/oprofile/backtrace.c linux-3.0.9/arch/x86/oprofile/backtrace.c +--- linux-3.0.9/arch/x86/oprofile/backtrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/oprofile/backtrace.c 2011-11-12 12:47:13.000000000 -0500 @@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram struct stack_frame_ia32 *fp; unsigned long bytes; @@ -22043,9 +22043,9 @@ diff -urNp linux-3.0.8/arch/x86/oprofile/backtrace.c linux-3.0.8/arch/x86/oprofi unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-3.0.8/arch/x86/pci/mrst.c linux-3.0.8/arch/x86/pci/mrst.c ---- linux-3.0.8/arch/x86/pci/mrst.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/pci/mrst.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/pci/mrst.c linux-3.0.9/arch/x86/pci/mrst.c +--- linux-3.0.9/arch/x86/pci/mrst.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/pci/mrst.c 2011-11-12 12:47:13.000000000 -0500 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void) printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n"); pci_mmcfg_late_init(); @@ -22057,9 +22057,9 @@ diff -urNp linux-3.0.8/arch/x86/pci/mrst.c linux-3.0.8/arch/x86/pci/mrst.c /* Continue with standard init */ return 1; } -diff -urNp linux-3.0.8/arch/x86/pci/pcbios.c linux-3.0.8/arch/x86/pci/pcbios.c ---- linux-3.0.8/arch/x86/pci/pcbios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/pci/pcbios.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/pci/pcbios.c linux-3.0.9/arch/x86/pci/pcbios.c +--- linux-3.0.9/arch/x86/pci/pcbios.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/pci/pcbios.c 2011-11-12 12:47:13.000000000 -0500 @@ -79,50 +79,93 @@ union bios32 { static struct { unsigned long address; @@ -22364,9 +22364,9 @@ diff -urNp linux-3.0.8/arch/x86/pci/pcbios.c linux-3.0.8/arch/x86/pci/pcbios.c return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_32.c linux-3.0.8/arch/x86/platform/efi/efi_32.c ---- linux-3.0.8/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/platform/efi/efi_32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_32.c linux-3.0.9/arch/x86/platform/efi/efi_32.c +--- linux-3.0.9/arch/x86/platform/efi/efi_32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/platform/efi/efi_32.c 2011-11-12 12:47:13.000000000 -0500 @@ -38,70 +38,56 @@ */ @@ -22464,9 +22464,9 @@ diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_32.c linux-3.0.8/arch/x86/platf /* * After the lock is released, the original page table is restored. -diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S ---- linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S 2011-09-19 09:16:58.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S +--- linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/platform/efi/efi_stub_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -6,7 +6,9 @@ */ @@ -22575,9 +22575,9 @@ diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_32.S linux-3.0.8/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S ---- linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S +--- linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/platform/efi/efi_stub_64.S 2011-11-12 12:47:13.000000000 -0500 @@ -7,6 +7,7 @@ */ @@ -22641,9 +22641,9 @@ diff -urNp linux-3.0.8/arch/x86/platform/efi/efi_stub_64.S linux-3.0.8/arch/x86/ + pax_force_retaddr ret ENDPROC(efi_call6) -diff -urNp linux-3.0.8/arch/x86/platform/mrst/mrst.c linux-3.0.8/arch/x86/platform/mrst/mrst.c ---- linux-3.0.8/arch/x86/platform/mrst/mrst.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/platform/mrst/mrst.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/platform/mrst/mrst.c linux-3.0.9/arch/x86/platform/mrst/mrst.c +--- linux-3.0.9/arch/x86/platform/mrst/mrst.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/platform/mrst/mrst.c 2011-11-12 12:47:13.000000000 -0500 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void) } @@ -22663,10 +22663,10 @@ diff -urNp linux-3.0.8/arch/x86/platform/mrst/mrst.c linux-3.0.8/arch/x86/platfo } /* -diff -urNp linux-3.0.8/arch/x86/platform/uv/tlb_uv.c linux-3.0.8/arch/x86/platform/uv/tlb_uv.c ---- linux-3.0.8/arch/x86/platform/uv/tlb_uv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/platform/uv/tlb_uv.c 2011-08-23 21:48:14.000000000 -0400 -@@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta +diff -urNp linux-3.0.9/arch/x86/platform/uv/tlb_uv.c linux-3.0.9/arch/x86/platform/uv/tlb_uv.c +--- linux-3.0.9/arch/x86/platform/uv/tlb_uv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/platform/uv/tlb_uv.c 2011-11-12 12:47:13.000000000 -0500 +@@ -370,6 +370,8 @@ static void reset_with_ipi(struct bau_ta cpumask_t mask; struct reset_args reset_args; @@ -22675,9 +22675,9 @@ diff -urNp linux-3.0.8/arch/x86/platform/uv/tlb_uv.c linux-3.0.8/arch/x86/platfo reset_args.sender = sender; cpus_clear(mask); /* find a single cpu for each uvhub in this distribution mask */ -diff -urNp linux-3.0.8/arch/x86/power/cpu.c linux-3.0.8/arch/x86/power/cpu.c ---- linux-3.0.8/arch/x86/power/cpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/power/cpu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/power/cpu.c linux-3.0.9/arch/x86/power/cpu.c +--- linux-3.0.9/arch/x86/power/cpu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/power/cpu.c 2011-11-12 12:47:13.000000000 -0500 @@ -130,7 +130,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -22697,9 +22697,9 @@ diff -urNp linux-3.0.8/arch/x86/power/cpu.c linux-3.0.8/arch/x86/power/cpu.c syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-3.0.8/arch/x86/vdso/Makefile linux-3.0.8/arch/x86/vdso/Makefile ---- linux-3.0.8/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/vdso/Makefile linux-3.0.9/arch/x86/vdso/Makefile +--- linux-3.0.9/arch/x86/vdso/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/vdso/Makefile 2011-11-12 12:47:13.000000000 -0500 @@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO $@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' @@ -22709,9 +22709,9 @@ diff -urNp linux-3.0.8/arch/x86/vdso/Makefile linux-3.0.8/arch/x86/vdso/Makefile GCOV_PROFILE := n # -diff -urNp linux-3.0.8/arch/x86/vdso/vdso32-setup.c linux-3.0.8/arch/x86/vdso/vdso32-setup.c ---- linux-3.0.8/arch/x86/vdso/vdso32-setup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/vdso/vdso32-setup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/vdso/vdso32-setup.c linux-3.0.9/arch/x86/vdso/vdso32-setup.c +--- linux-3.0.9/arch/x86/vdso/vdso32-setup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/vdso/vdso32-setup.c 2011-11-12 12:47:13.000000000 -0500 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -22794,9 +22794,9 @@ diff -urNp linux-3.0.8/arch/x86/vdso/vdso32-setup.c linux-3.0.8/arch/x86/vdso/vd return &gate_vma; return NULL; } -diff -urNp linux-3.0.8/arch/x86/vdso/vma.c linux-3.0.8/arch/x86/vdso/vma.c ---- linux-3.0.8/arch/x86/vdso/vma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/vdso/vma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/vdso/vma.c linux-3.0.9/arch/x86/vdso/vma.c +--- linux-3.0.9/arch/x86/vdso/vma.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/vdso/vma.c 2011-11-12 12:47:13.000000000 -0500 @@ -15,18 +15,19 @@ #include <asm/proto.h> #include <asm/vdso.h> @@ -22899,9 +22899,9 @@ diff -urNp linux-3.0.8/arch/x86/vdso/vma.c linux-3.0.8/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-3.0.8/arch/x86/xen/enlighten.c linux-3.0.8/arch/x86/xen/enlighten.c ---- linux-3.0.8/arch/x86/xen/enlighten.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/enlighten.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/enlighten.c linux-3.0.9/arch/x86/xen/enlighten.c +--- linux-3.0.9/arch/x86/xen/enlighten.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/enlighten.c 2011-11-12 12:47:13.000000000 -0500 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -22974,9 +22974,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/enlighten.c linux-3.0.8/arch/x86/xen/enlight xen_smp_init(); #ifdef CONFIG_ACPI_NUMA -diff -urNp linux-3.0.8/arch/x86/xen/mmu.c linux-3.0.8/arch/x86/xen/mmu.c ---- linux-3.0.8/arch/x86/xen/mmu.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/mmu.c 2011-08-29 23:26:21.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/mmu.c linux-3.0.9/arch/x86/xen/mmu.c +--- linux-3.0.9/arch/x86/xen/mmu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/mmu.c 2011-11-12 12:47:13.000000000 -0500 @@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -23013,9 +23013,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/mmu.c linux-3.0.8/arch/x86/xen/mmu.c .alloc_pud = xen_alloc_pmd_init, .release_pud = xen_release_pmd_init, -diff -urNp linux-3.0.8/arch/x86/xen/smp.c linux-3.0.8/arch/x86/xen/smp.c ---- linux-3.0.8/arch/x86/xen/smp.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/smp.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/smp.c linux-3.0.9/arch/x86/xen/smp.c +--- linux-3.0.9/arch/x86/xen/smp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/smp.c 2011-11-12 12:47:13.000000000 -0500 @@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -23060,9 +23060,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/smp.c linux-3.0.8/arch/x86/xen/smp.c #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -diff -urNp linux-3.0.8/arch/x86/xen/xen-asm_32.S linux-3.0.8/arch/x86/xen/xen-asm_32.S ---- linux-3.0.8/arch/x86/xen/xen-asm_32.S 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/xen-asm_32.S 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/xen-asm_32.S linux-3.0.9/arch/x86/xen/xen-asm_32.S +--- linux-3.0.9/arch/x86/xen/xen-asm_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/xen-asm_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -83,14 +83,14 @@ ENTRY(xen_iret) ESP_OFFSET=4 # bytes pushed onto stack @@ -23084,9 +23084,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/xen-asm_32.S linux-3.0.8/arch/x86/xen/xen-as #else movl xen_vcpu, %eax #endif -diff -urNp linux-3.0.8/arch/x86/xen/xen-head.S linux-3.0.8/arch/x86/xen/xen-head.S ---- linux-3.0.8/arch/x86/xen/xen-head.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/xen-head.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/xen-head.S linux-3.0.9/arch/x86/xen/xen-head.S +--- linux-3.0.9/arch/x86/xen/xen-head.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/xen-head.S 2011-11-12 12:47:13.000000000 -0500 @@ -19,6 +19,17 @@ ENTRY(startup_xen) #ifdef CONFIG_X86_32 mov %esi,xen_start_info @@ -23105,9 +23105,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/xen-head.S linux-3.0.8/arch/x86/xen/xen-head #else mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp -diff -urNp linux-3.0.8/arch/x86/xen/xen-ops.h linux-3.0.8/arch/x86/xen/xen-ops.h ---- linux-3.0.8/arch/x86/xen/xen-ops.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/arch/x86/xen/xen-ops.h linux-3.0.9/arch/x86/xen/xen-ops.h +--- linux-3.0.9/arch/x86/xen/xen-ops.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/arch/x86/xen/xen-ops.h 2011-11-12 12:47:13.000000000 -0500 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -23117,9 +23117,9 @@ diff -urNp linux-3.0.8/arch/x86/xen/xen-ops.h linux-3.0.8/arch/x86/xen/xen-ops.h struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-3.0.8/block/blk-iopoll.c linux-3.0.8/block/blk-iopoll.c ---- linux-3.0.8/block/blk-iopoll.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/blk-iopoll.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/block/blk-iopoll.c linux-3.0.9/block/blk-iopoll.c +--- linux-3.0.9/block/blk-iopoll.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/blk-iopoll.c 2011-11-12 12:47:13.000000000 -0500 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo } EXPORT_SYMBOL(blk_iopoll_complete); @@ -23129,9 +23129,9 @@ diff -urNp linux-3.0.8/block/blk-iopoll.c linux-3.0.8/block/blk-iopoll.c { struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); int rearm = 0, budget = blk_iopoll_budget; -diff -urNp linux-3.0.8/block/blk-map.c linux-3.0.8/block/blk-map.c ---- linux-3.0.8/block/blk-map.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/blk-map.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/block/blk-map.c linux-3.0.9/block/blk-map.c +--- linux-3.0.9/block/blk-map.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/blk-map.c 2011-11-12 12:47:13.000000000 -0500 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue if (!len || !kbuf) return -EINVAL; @@ -23141,9 +23141,9 @@ diff -urNp linux-3.0.8/block/blk-map.c linux-3.0.8/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-3.0.8/block/blk-softirq.c linux-3.0.8/block/blk-softirq.c ---- linux-3.0.8/block/blk-softirq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/blk-softirq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/block/blk-softirq.c linux-3.0.9/block/blk-softirq.c +--- linux-3.0.9/block/blk-softirq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/blk-softirq.c 2011-11-12 12:47:13.000000000 -0500 @@ -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. @@ -23153,9 +23153,9 @@ diff -urNp linux-3.0.8/block/blk-softirq.c linux-3.0.8/block/blk-softirq.c { struct list_head *cpu_list, local_list; -diff -urNp linux-3.0.8/block/bsg.c linux-3.0.8/block/bsg.c ---- linux-3.0.8/block/bsg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/bsg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/block/bsg.c linux-3.0.9/block/bsg.c +--- linux-3.0.9/block/bsg.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/bsg.c 2011-11-12 12:47:13.000000000 -0500 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r struct sg_io_v4 *hdr, struct bsg_device *bd, fmode_t has_write_perm) @@ -23223,9 +23223,9 @@ diff -urNp linux-3.0.8/block/bsg.c linux-3.0.8/block/bsg.c rq->sense, len); if (!ret) hdr->response_len = len; -diff -urNp linux-3.0.8/block/compat_ioctl.c linux-3.0.8/block/compat_ioctl.c ---- linux-3.0.8/block/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/block/compat_ioctl.c linux-3.0.9/block/compat_ioctl.c +--- linux-3.0.9/block/compat_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/compat_ioctl.c 2011-11-12 12:47:13.000000000 -0500 @@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_ err |= __get_user(f->spec1, &uf->spec1); err |= __get_user(f->fmt_gap, &uf->fmt_gap); @@ -23235,9 +23235,9 @@ diff -urNp linux-3.0.8/block/compat_ioctl.c linux-3.0.8/block/compat_ioctl.c if (err) { err = -EFAULT; goto out; -diff -urNp linux-3.0.8/block/scsi_ioctl.c linux-3.0.8/block/scsi_ioctl.c ---- linux-3.0.8/block/scsi_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/block/scsi_ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/block/scsi_ioctl.c linux-3.0.9/block/scsi_ioctl.c +--- linux-3.0.9/block/scsi_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/block/scsi_ioctl.c 2011-11-12 12:47:13.000000000 -0500 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) @@ -23289,9 +23289,9 @@ diff -urNp linux-3.0.8/block/scsi_ioctl.c linux-3.0.8/block/scsi_ioctl.c if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) goto error; -diff -urNp linux-3.0.8/crypto/cryptd.c linux-3.0.8/crypto/cryptd.c ---- linux-3.0.8/crypto/cryptd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/crypto/cryptd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/crypto/cryptd.c linux-3.0.9/crypto/cryptd.c +--- linux-3.0.9/crypto/cryptd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/crypto/cryptd.c 2011-11-12 12:47:13.000000000 -0500 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx { struct cryptd_blkcipher_request_ctx { @@ -23310,9 +23310,9 @@ diff -urNp linux-3.0.8/crypto/cryptd.c linux-3.0.8/crypto/cryptd.c static void cryptd_queue_worker(struct work_struct *work); -diff -urNp linux-3.0.8/crypto/gf128mul.c linux-3.0.8/crypto/gf128mul.c ---- linux-3.0.8/crypto/gf128mul.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/crypto/gf128mul.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/crypto/gf128mul.c linux-3.0.9/crypto/gf128mul.c +--- linux-3.0.9/crypto/gf128mul.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/crypto/gf128mul.c 2011-11-12 12:47:13.000000000 -0500 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 for (i = 0; i < 7; ++i) gf128mul_x_lle(&p[i + 1], &p[i]); @@ -23331,9 +23331,9 @@ diff -urNp linux-3.0.8/crypto/gf128mul.c linux-3.0.8/crypto/gf128mul.c for (i = 0;;) { u8 ch = ((u8 *)b)[i]; -diff -urNp linux-3.0.8/crypto/serpent.c linux-3.0.8/crypto/serpent.c ---- linux-3.0.8/crypto/serpent.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/crypto/serpent.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/crypto/serpent.c linux-3.0.9/crypto/serpent.c +--- linux-3.0.9/crypto/serpent.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/crypto/serpent.c 2011-11-12 12:47:13.000000000 -0500 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_ u32 r0,r1,r2,r3,r4; int i; @@ -23343,9 +23343,9 @@ diff -urNp linux-3.0.8/crypto/serpent.c linux-3.0.8/crypto/serpent.c /* Copy key, add padding */ for (i = 0; i < keylen; ++i) -diff -urNp linux-3.0.8/Documentation/dontdiff linux-3.0.8/Documentation/dontdiff ---- linux-3.0.8/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/Documentation/dontdiff 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/Documentation/dontdiff linux-3.0.9/Documentation/dontdiff +--- linux-3.0.9/Documentation/dontdiff 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/Documentation/dontdiff 2011-11-12 12:47:13.000000000 -0500 @@ -5,6 +5,7 @@ *.cis *.cpio @@ -23483,9 +23483,9 @@ diff -urNp linux-3.0.8/Documentation/dontdiff linux-3.0.8/Documentation/dontdiff wakeup.bin wakeup.elf wakeup.lds -diff -urNp linux-3.0.8/Documentation/kernel-parameters.txt linux-3.0.8/Documentation/kernel-parameters.txt ---- linux-3.0.8/Documentation/kernel-parameters.txt 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/Documentation/kernel-parameters.txt 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/Documentation/kernel-parameters.txt linux-3.0.9/Documentation/kernel-parameters.txt +--- linux-3.0.9/Documentation/kernel-parameters.txt 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/Documentation/kernel-parameters.txt 2011-11-12 12:47:13.000000000 -0500 @@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -23500,9 +23500,9 @@ diff -urNp linux-3.0.8/Documentation/kernel-parameters.txt linux-3.0.8/Documenta pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-3.0.8/drivers/acpi/apei/cper.c linux-3.0.8/drivers/acpi/apei/cper.c ---- linux-3.0.8/drivers/acpi/apei/cper.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/acpi/apei/cper.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/acpi/apei/cper.c linux-3.0.9/drivers/acpi/apei/cper.c +--- linux-3.0.9/drivers/acpi/apei/cper.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/acpi/apei/cper.c 2011-11-12 12:47:13.000000000 -0500 @@ -38,12 +38,12 @@ */ u64 cper_next_record_id(void) @@ -23520,9 +23520,9 @@ diff -urNp linux-3.0.8/drivers/acpi/apei/cper.c linux-3.0.8/drivers/acpi/apei/cp } EXPORT_SYMBOL_GPL(cper_next_record_id); -diff -urNp linux-3.0.8/drivers/acpi/ec_sys.c linux-3.0.8/drivers/acpi/ec_sys.c ---- linux-3.0.8/drivers/acpi/ec_sys.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/acpi/ec_sys.c 2011-08-24 19:06:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/acpi/ec_sys.c linux-3.0.9/drivers/acpi/ec_sys.c +--- linux-3.0.9/drivers/acpi/ec_sys.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/acpi/ec_sys.c 2011-11-12 12:47:13.000000000 -0500 @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/acpi.h> @@ -23572,9 +23572,9 @@ diff -urNp linux-3.0.8/drivers/acpi/ec_sys.c linux-3.0.8/drivers/acpi/ec_sys.c err = ec_write(*off, byte_write); if (err) return err; -diff -urNp linux-3.0.8/drivers/acpi/proc.c linux-3.0.8/drivers/acpi/proc.c ---- linux-3.0.8/drivers/acpi/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/acpi/proc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/acpi/proc.c linux-3.0.9/drivers/acpi/proc.c +--- linux-3.0.9/drivers/acpi/proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/acpi/proc.c 2011-11-12 12:47:13.000000000 -0500 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f size_t count, loff_t * ppos) { @@ -23609,9 +23609,9 @@ diff -urNp linux-3.0.8/drivers/acpi/proc.c linux-3.0.8/drivers/acpi/proc.c if (device_can_wakeup(&dev->dev)) { bool enable = !device_may_wakeup(&dev->dev); device_set_wakeup_enable(&dev->dev, enable); -diff -urNp linux-3.0.8/drivers/acpi/processor_driver.c linux-3.0.8/drivers/acpi/processor_driver.c ---- linux-3.0.8/drivers/acpi/processor_driver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/acpi/processor_driver.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/acpi/processor_driver.c linux-3.0.9/drivers/acpi/processor_driver.c +--- linux-3.0.9/drivers/acpi/processor_driver.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/acpi/processor_driver.c 2011-11-12 12:47:13.000000000 -0500 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add( return 0; #endif @@ -23621,9 +23621,9 @@ diff -urNp linux-3.0.8/drivers/acpi/processor_driver.c linux-3.0.8/drivers/acpi/ /* * Buggy BIOS check -diff -urNp linux-3.0.8/drivers/ata/libata-core.c linux-3.0.8/drivers/ata/libata-core.c ---- linux-3.0.8/drivers/ata/libata-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ata/libata-core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ata/libata-core.c linux-3.0.9/drivers/ata/libata-core.c +--- linux-3.0.9/drivers/ata/libata-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ata/libata-core.c 2011-11-12 12:47:13.000000000 -0500 @@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd * struct ata_port *ap; unsigned int tag; @@ -23661,9 +23661,9 @@ diff -urNp linux-3.0.8/drivers/ata/libata-core.c linux-3.0.8/drivers/ata/libata- spin_unlock(&lock); } -diff -urNp linux-3.0.8/drivers/ata/libata-eh.c linux-3.0.8/drivers/ata/libata-eh.c ---- linux-3.0.8/drivers/ata/libata-eh.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ata/libata-eh.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ata/libata-eh.c linux-3.0.9/drivers/ata/libata-eh.c +--- linux-3.0.9/drivers/ata/libata-eh.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ata/libata-eh.c 2011-11-12 12:47:13.000000000 -0500 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap) { struct ata_link *link; @@ -23673,9 +23673,9 @@ diff -urNp linux-3.0.8/drivers/ata/libata-eh.c linux-3.0.8/drivers/ata/libata-eh ata_for_each_link(link, ap, HOST_FIRST) ata_eh_link_report(link); } -diff -urNp linux-3.0.8/drivers/ata/pata_arasan_cf.c linux-3.0.8/drivers/ata/pata_arasan_cf.c ---- linux-3.0.8/drivers/ata/pata_arasan_cf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ata/pata_arasan_cf.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ata/pata_arasan_cf.c linux-3.0.9/drivers/ata/pata_arasan_cf.c +--- linux-3.0.9/drivers/ata/pata_arasan_cf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ata/pata_arasan_cf.c 2011-11-12 12:47:13.000000000 -0500 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str /* Handle platform specific quirks */ if (pdata->quirk) { @@ -23687,9 +23687,9 @@ diff -urNp linux-3.0.8/drivers/ata/pata_arasan_cf.c linux-3.0.8/drivers/ata/pata ap->pio_mask = 0; } if (pdata->quirk & CF_BROKEN_MWDMA) -diff -urNp linux-3.0.8/drivers/atm/adummy.c linux-3.0.8/drivers/atm/adummy.c ---- linux-3.0.8/drivers/atm/adummy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/adummy.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/adummy.c linux-3.0.9/drivers/atm/adummy.c +--- linux-3.0.9/drivers/atm/adummy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/adummy.c 2011-11-12 12:47:13.000000000 -0500 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -23699,9 +23699,9 @@ diff -urNp linux-3.0.8/drivers/atm/adummy.c linux-3.0.8/drivers/atm/adummy.c return 0; } -diff -urNp linux-3.0.8/drivers/atm/ambassador.c linux-3.0.8/drivers/atm/ambassador.c ---- linux-3.0.8/drivers/atm/ambassador.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/ambassador.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/ambassador.c linux-3.0.9/drivers/atm/ambassador.c +--- linux-3.0.9/drivers/atm/ambassador.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/ambassador.c 2011-11-12 12:47:13.000000000 -0500 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -23738,9 +23738,9 @@ diff -urNp linux-3.0.8/drivers/atm/ambassador.c linux-3.0.8/drivers/atm/ambassad return -ENOMEM; // ? } -diff -urNp linux-3.0.8/drivers/atm/atmtcp.c linux-3.0.8/drivers/atm/atmtcp.c ---- linux-3.0.8/drivers/atm/atmtcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/atmtcp.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/atmtcp.c linux-3.0.9/drivers/atm/atmtcp.c +--- linux-3.0.9/drivers/atm/atmtcp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/atmtcp.c 2011-11-12 12:47:13.000000000 -0500 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -23790,9 +23790,9 @@ diff -urNp linux-3.0.8/drivers/atm/atmtcp.c linux-3.0.8/drivers/atm/atmtcp.c done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-3.0.8/drivers/atm/eni.c linux-3.0.8/drivers/atm/eni.c ---- linux-3.0.8/drivers/atm/eni.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/eni.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/eni.c linux-3.0.9/drivers/atm/eni.c +--- linux-3.0.9/drivers/atm/eni.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/eni.c 2011-11-12 12:47:13.000000000 -0500 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -23847,9 +23847,9 @@ diff -urNp linux-3.0.8/drivers/atm/eni.c linux-3.0.8/drivers/atm/eni.c "MMF", "SMF", "MMF", "03?", /* 0- 3 */ "UTP", "05?", "06?", "07?", /* 4- 7 */ "TAXI","09?", "10?", "11?", /* 8-11 */ -diff -urNp linux-3.0.8/drivers/atm/firestream.c linux-3.0.8/drivers/atm/firestream.c ---- linux-3.0.8/drivers/atm/firestream.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/firestream.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/firestream.c linux-3.0.9/drivers/atm/firestream.c +--- linux-3.0.9/drivers/atm/firestream.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/firestream.c 2011-11-12 12:47:13.000000000 -0500 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct } } @@ -23883,9 +23883,9 @@ diff -urNp linux-3.0.8/drivers/atm/firestream.c linux-3.0.8/drivers/atm/firestre break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-3.0.8/drivers/atm/fore200e.c linux-3.0.8/drivers/atm/fore200e.c ---- linux-3.0.8/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/fore200e.c linux-3.0.9/drivers/atm/fore200e.c +--- linux-3.0.9/drivers/atm/fore200e.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/fore200e.c 2011-11-12 12:47:13.000000000 -0500 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -23942,9 +23942,9 @@ diff -urNp linux-3.0.8/drivers/atm/fore200e.c linux-3.0.8/drivers/atm/fore200e.c fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-3.0.8/drivers/atm/he.c linux-3.0.8/drivers/atm/he.c ---- linux-3.0.8/drivers/atm/he.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/he.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/he.c linux-3.0.9/drivers/atm/he.c +--- linux-3.0.9/drivers/atm/he.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/he.c 2011-11-12 12:47:13.000000000 -0500 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -24026,9 +24026,9 @@ diff -urNp linux-3.0.8/drivers/atm/he.c linux-3.0.8/drivers/atm/he.c return 0; } -diff -urNp linux-3.0.8/drivers/atm/horizon.c linux-3.0.8/drivers/atm/horizon.c ---- linux-3.0.8/drivers/atm/horizon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/horizon.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/horizon.c linux-3.0.9/drivers/atm/horizon.c +--- linux-3.0.9/drivers/atm/horizon.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/horizon.c 2011-11-12 12:47:13.000000000 -0500 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -24047,9 +24047,9 @@ diff -urNp linux-3.0.8/drivers/atm/horizon.c linux-3.0.8/drivers/atm/horizon.c // free the skb hrz_kfree_skb (skb); -diff -urNp linux-3.0.8/drivers/atm/idt77252.c linux-3.0.8/drivers/atm/idt77252.c ---- linux-3.0.8/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/idt77252.c linux-3.0.9/drivers/atm/idt77252.c +--- linux-3.0.9/drivers/atm/idt77252.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/idt77252.c 2011-11-12 12:47:13.000000000 -0500 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -24204,9 +24204,9 @@ diff -urNp linux-3.0.8/drivers/atm/idt77252.c linux-3.0.8/drivers/atm/idt77252.c return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-3.0.8/drivers/atm/iphase.c linux-3.0.8/drivers/atm/iphase.c ---- linux-3.0.8/drivers/atm/iphase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/iphase.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/iphase.c linux-3.0.9/drivers/atm/iphase.c +--- linux-3.0.9/drivers/atm/iphase.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/iphase.c 2011-11-12 12:47:13.000000000 -0500 @@ -1120,7 +1120,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)) @@ -24303,9 +24303,9 @@ diff -urNp linux-3.0.8/drivers/atm/iphase.c linux-3.0.8/drivers/atm/iphase.c if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-3.0.8/drivers/atm/lanai.c linux-3.0.8/drivers/atm/lanai.c ---- linux-3.0.8/drivers/atm/lanai.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/lanai.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/lanai.c linux-3.0.9/drivers/atm/lanai.c +--- linux-3.0.9/drivers/atm/lanai.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/lanai.c 2011-11-12 12:47:13.000000000 -0500 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -24360,9 +24360,9 @@ diff -urNp linux-3.0.8/drivers/atm/lanai.c linux-3.0.8/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-3.0.8/drivers/atm/nicstar.c linux-3.0.8/drivers/atm/nicstar.c ---- linux-3.0.8/drivers/atm/nicstar.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/nicstar.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/nicstar.c linux-3.0.9/drivers/atm/nicstar.c +--- linux-3.0.9/drivers/atm/nicstar.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/nicstar.c 2011-11-12 12:47:13.000000000 -0500 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", @@ -24564,9 +24564,9 @@ diff -urNp linux-3.0.8/drivers/atm/nicstar.c linux-3.0.8/drivers/atm/nicstar.c } } -diff -urNp linux-3.0.8/drivers/atm/solos-pci.c linux-3.0.8/drivers/atm/solos-pci.c ---- linux-3.0.8/drivers/atm/solos-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/solos-pci.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/solos-pci.c linux-3.0.9/drivers/atm/solos-pci.c +--- linux-3.0.9/drivers/atm/solos-pci.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/solos-pci.c 2011-11-12 12:47:13.000000000 -0500 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -24594,9 +24594,9 @@ diff -urNp linux-3.0.8/drivers/atm/solos-pci.c linux-3.0.8/drivers/atm/solos-pci solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-3.0.8/drivers/atm/suni.c linux-3.0.8/drivers/atm/suni.c ---- linux-3.0.8/drivers/atm/suni.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/suni.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/suni.c linux-3.0.9/drivers/atm/suni.c +--- linux-3.0.9/drivers/atm/suni.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/suni.c 2011-11-12 12:47:13.000000000 -0500 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -24608,9 +24608,9 @@ diff -urNp linux-3.0.8/drivers/atm/suni.c linux-3.0.8/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-3.0.8/drivers/atm/uPD98402.c linux-3.0.8/drivers/atm/uPD98402.c ---- linux-3.0.8/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/uPD98402.c linux-3.0.9/drivers/atm/uPD98402.c +--- linux-3.0.9/drivers/atm/uPD98402.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/uPD98402.c 2011-11-12 12:47:13.000000000 -0500 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -24655,9 +24655,9 @@ diff -urNp linux-3.0.8/drivers/atm/uPD98402.c linux-3.0.8/drivers/atm/uPD98402.c return 0; } -diff -urNp linux-3.0.8/drivers/atm/zatm.c linux-3.0.8/drivers/atm/zatm.c ---- linux-3.0.8/drivers/atm/zatm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/atm/zatm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/atm/zatm.c linux-3.0.9/drivers/atm/zatm.c +--- linux-3.0.9/drivers/atm/zatm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/atm/zatm.c 2011-11-12 12:47:13.000000000 -0500 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -24685,9 +24685,9 @@ diff -urNp linux-3.0.8/drivers/atm/zatm.c linux-3.0.8/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-3.0.8/drivers/base/devtmpfs.c linux-3.0.8/drivers/base/devtmpfs.c ---- linux-3.0.8/drivers/base/devtmpfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/base/devtmpfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/base/devtmpfs.c linux-3.0.9/drivers/base/devtmpfs.c +--- linux-3.0.9/drivers/base/devtmpfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/base/devtmpfs.c 2011-11-12 12:47:13.000000000 -0500 @@ -357,7 +357,7 @@ int devtmpfs_mount(const char *mntdir) if (!dev_mnt) return 0; @@ -24697,9 +24697,9 @@ diff -urNp linux-3.0.8/drivers/base/devtmpfs.c linux-3.0.8/drivers/base/devtmpfs if (err) printk(KERN_INFO "devtmpfs: error mounting %i\n", err); else -diff -urNp linux-3.0.8/drivers/base/power/wakeup.c linux-3.0.8/drivers/base/power/wakeup.c ---- linux-3.0.8/drivers/base/power/wakeup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/base/power/wakeup.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/base/power/wakeup.c linux-3.0.9/drivers/base/power/wakeup.c +--- linux-3.0.9/drivers/base/power/wakeup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/base/power/wakeup.c 2011-11-12 12:47:13.000000000 -0500 @@ -29,14 +29,14 @@ bool events_check_enabled; * They need to be modified together atomically, so it's better to use one * atomic variable to hold them both. @@ -24735,9 +24735,9 @@ diff -urNp linux-3.0.8/drivers/base/power/wakeup.c linux-3.0.8/drivers/base/powe } /** -diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c ---- linux-3.0.8/drivers/block/cciss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/cciss.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/cciss.c linux-3.0.9/drivers/block/cciss.c +--- linux-3.0.9/drivers/block/cciss.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/cciss.c 2011-11-12 12:47:13.000000000 -0500 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct int err; u32 cp; @@ -24813,7 +24813,7 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c if (cciss_board_disabled(h)) { dev_warn(&h->pdev->dev, "controller appears to be disabled\n"); -@@ -5002,7 +5004,7 @@ reinit_after_soft_reset: +@@ -5009,7 +5011,7 @@ reinit_after_soft_reset: } /* make sure the board interrupts are off */ @@ -24822,7 +24822,7 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx); if (rc) goto clean2; -@@ -5054,7 +5056,7 @@ reinit_after_soft_reset: +@@ -5061,7 +5063,7 @@ reinit_after_soft_reset: * fake ones to scoop up any residual completions. */ spin_lock_irqsave(&h->lock, flags); @@ -24831,7 +24831,7 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c spin_unlock_irqrestore(&h->lock, flags); free_irq(h->intr[PERF_MODE_INT], h); rc = cciss_request_irq(h, cciss_msix_discard_completions, -@@ -5074,9 +5076,9 @@ reinit_after_soft_reset: +@@ -5081,9 +5083,9 @@ reinit_after_soft_reset: dev_info(&h->pdev->dev, "Board READY.\n"); dev_info(&h->pdev->dev, "Waiting for stale completions to drain.\n"); @@ -24843,7 +24843,7 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c rc = controller_reset_failed(h->cfgtable); if (rc) -@@ -5099,7 +5101,7 @@ reinit_after_soft_reset: +@@ -5106,7 +5108,7 @@ reinit_after_soft_reset: cciss_scsi_setup(h); /* Turn the interrupts on so we can service requests */ @@ -24852,7 +24852,7 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c /* Get the firmware version */ inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL); -@@ -5171,7 +5173,7 @@ static void cciss_shutdown(struct pci_de +@@ -5178,7 +5180,7 @@ static void cciss_shutdown(struct pci_de kfree(flush_buf); if (return_code != IO_OK) dev_warn(&h->pdev->dev, "Error flushing cache\n"); @@ -24861,9 +24861,9 @@ diff -urNp linux-3.0.8/drivers/block/cciss.c linux-3.0.8/drivers/block/cciss.c free_irq(h->intr[PERF_MODE_INT], h); } -diff -urNp linux-3.0.8/drivers/block/cciss.h linux-3.0.8/drivers/block/cciss.h ---- linux-3.0.8/drivers/block/cciss.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/block/cciss.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/cciss.h linux-3.0.9/drivers/block/cciss.h +--- linux-3.0.9/drivers/block/cciss.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/cciss.h 2011-11-12 12:47:13.000000000 -0500 @@ -100,7 +100,7 @@ struct ctlr_info /* information about each logical volume */ drive_info_struct *drv[CISS_MAX_LUN]; @@ -24873,9 +24873,9 @@ diff -urNp linux-3.0.8/drivers/block/cciss.h linux-3.0.8/drivers/block/cciss.h /* queue and queue Info */ struct list_head reqQ; -diff -urNp linux-3.0.8/drivers/block/cpqarray.c linux-3.0.8/drivers/block/cpqarray.c ---- linux-3.0.8/drivers/block/cpqarray.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/cpqarray.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/cpqarray.c linux-3.0.9/drivers/block/cpqarray.c +--- linux-3.0.9/drivers/block/cpqarray.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/cpqarray.c 2011-11-12 12:47:13.000000000 -0500 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) { goto Enomem4; @@ -25001,9 +25001,9 @@ diff -urNp linux-3.0.8/drivers/block/cpqarray.c linux-3.0.8/drivers/block/cpqarr if (done == 0) { udelay(10); /* a short fixed delay */ } else -diff -urNp linux-3.0.8/drivers/block/cpqarray.h linux-3.0.8/drivers/block/cpqarray.h ---- linux-3.0.8/drivers/block/cpqarray.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/cpqarray.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/cpqarray.h linux-3.0.9/drivers/block/cpqarray.h +--- linux-3.0.9/drivers/block/cpqarray.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/cpqarray.h 2011-11-12 12:47:13.000000000 -0500 @@ -99,7 +99,7 @@ struct ctlr_info { drv_info_t drv[NWD]; struct proc_dir_entry *proc; @@ -25013,9 +25013,9 @@ diff -urNp linux-3.0.8/drivers/block/cpqarray.h linux-3.0.8/drivers/block/cpqarr cmdlist_t *reqQ; cmdlist_t *cmpQ; -diff -urNp linux-3.0.8/drivers/block/DAC960.c linux-3.0.8/drivers/block/DAC960.c ---- linux-3.0.8/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/DAC960.c linux-3.0.9/drivers/block/DAC960.c +--- linux-3.0.9/drivers/block/DAC960.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/DAC960.c 2011-11-12 12:47:13.000000000 -0500 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur unsigned long flags; int Channel, TargetID; @@ -25025,9 +25025,9 @@ diff -urNp linux-3.0.8/drivers/block/DAC960.c linux-3.0.8/drivers/block/DAC960.c if (!init_dma_loaf(Controller->PCIDevice, &local_dma, DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + sizeof(DAC960_SCSI_Inquiry_T) + -diff -urNp linux-3.0.8/drivers/block/drbd/drbd_int.h linux-3.0.8/drivers/block/drbd/drbd_int.h ---- linux-3.0.8/drivers/block/drbd/drbd_int.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/drbd/drbd_int.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/drbd/drbd_int.h linux-3.0.9/drivers/block/drbd/drbd_int.h +--- linux-3.0.9/drivers/block/drbd/drbd_int.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/drbd/drbd_int.h 2011-11-12 12:47:13.000000000 -0500 @@ -737,7 +737,7 @@ struct drbd_request; struct drbd_epoch { struct list_head list; @@ -25085,9 +25085,9 @@ diff -urNp linux-3.0.8/drivers/block/drbd/drbd_int.h linux-3.0.8/drivers/block/d } void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo); -diff -urNp linux-3.0.8/drivers/block/drbd/drbd_main.c linux-3.0.8/drivers/block/drbd/drbd_main.c ---- linux-3.0.8/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/drbd/drbd_main.c linux-3.0.9/drivers/block/drbd/drbd_main.c +--- linux-3.0.9/drivers/block/drbd/drbd_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/drbd/drbd_main.c 2011-11-12 12:47:13.000000000 -0500 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co p.sector = sector; p.block_id = block_id; @@ -25126,9 +25126,9 @@ diff -urNp linux-3.0.8/drivers/block/drbd/drbd_main.c linux-3.0.8/drivers/block/ mdev->al_writ_cnt = mdev->bm_writ_cnt = mdev->read_cnt = -diff -urNp linux-3.0.8/drivers/block/drbd/drbd_nl.c linux-3.0.8/drivers/block/drbd/drbd_nl.c ---- linux-3.0.8/drivers/block/drbd/drbd_nl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/drbd/drbd_nl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/drbd/drbd_nl.c linux-3.0.9/drivers/block/drbd/drbd_nl.c +--- linux-3.0.9/drivers/block/drbd/drbd_nl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/drbd/drbd_nl.c 2011-11-12 12:47:13.000000000 -0500 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru module_put(THIS_MODULE); } @@ -25174,9 +25174,9 @@ diff -urNp linux-3.0.8/drivers/block/drbd/drbd_nl.c linux-3.0.8/drivers/block/dr cn_reply->ack = 0; /* not used here. */ cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + (int)((char *)tl - (char *)reply->tag_list); -diff -urNp linux-3.0.8/drivers/block/drbd/drbd_receiver.c linux-3.0.8/drivers/block/drbd/drbd_receiver.c ---- linux-3.0.8/drivers/block/drbd/drbd_receiver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/drbd/drbd_receiver.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/drbd/drbd_receiver.c linux-3.0.9/drivers/block/drbd/drbd_receiver.c +--- linux-3.0.9/drivers/block/drbd/drbd_receiver.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/drbd/drbd_receiver.c 2011-11-12 12:47:13.000000000 -0500 @@ -894,7 +894,7 @@ retry: sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10; sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; @@ -25262,9 +25262,9 @@ diff -urNp linux-3.0.8/drivers/block/drbd/drbd_receiver.c linux-3.0.8/drivers/bl D_ASSERT(list_empty(&mdev->current_epoch->list)); } -diff -urNp linux-3.0.8/drivers/block/loop.c linux-3.0.8/drivers/block/loop.c ---- linux-3.0.8/drivers/block/loop.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/loop.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/loop.c linux-3.0.9/drivers/block/loop.c +--- linux-3.0.9/drivers/block/loop.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/loop.c 2011-11-12 12:47:13.000000000 -0500 @@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil mm_segment_t old_fs = get_fs(); @@ -25274,9 +25274,9 @@ diff -urNp linux-3.0.8/drivers/block/loop.c linux-3.0.8/drivers/block/loop.c set_fs(old_fs); if (likely(bw == len)) return 0; -diff -urNp linux-3.0.8/drivers/block/nbd.c linux-3.0.8/drivers/block/nbd.c ---- linux-3.0.8/drivers/block/nbd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/block/nbd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/block/nbd.c linux-3.0.9/drivers/block/nbd.c +--- linux-3.0.9/drivers/block/nbd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/block/nbd.c 2011-11-12 12:47:13.000000000 -0500 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device * struct kvec iov; sigset_t blocked, oldset; @@ -25295,9 +25295,9 @@ diff -urNp linux-3.0.8/drivers/block/nbd.c linux-3.0.8/drivers/block/nbd.c switch (cmd) { case NBD_DISCONNECT: { struct request sreq; -diff -urNp linux-3.0.8/drivers/char/agp/frontend.c linux-3.0.8/drivers/char/agp/frontend.c ---- linux-3.0.8/drivers/char/agp/frontend.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/agp/frontend.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/agp/frontend.c linux-3.0.9/drivers/char/agp/frontend.c +--- linux-3.0.9/drivers/char/agp/frontend.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/agp/frontend.c 2011-11-12 12:47:13.000000000 -0500 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -25307,9 +25307,9 @@ diff -urNp linux-3.0.8/drivers/char/agp/frontend.c linux-3.0.8/drivers/char/agp/ return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-3.0.8/drivers/char/briq_panel.c linux-3.0.8/drivers/char/briq_panel.c ---- linux-3.0.8/drivers/char/briq_panel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/briq_panel.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/briq_panel.c linux-3.0.9/drivers/char/briq_panel.c +--- linux-3.0.9/drivers/char/briq_panel.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/briq_panel.c 2011-11-12 12:47:13.000000000 -0500 @@ -9,6 +9,7 @@ #include <linux/types.h> #include <linux/errno.h> @@ -25351,9 +25351,9 @@ diff -urNp linux-3.0.8/drivers/char/briq_panel.c linux-3.0.8/drivers/char/briq_p return len; } -diff -urNp linux-3.0.8/drivers/char/genrtc.c linux-3.0.8/drivers/char/genrtc.c ---- linux-3.0.8/drivers/char/genrtc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/genrtc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/genrtc.c linux-3.0.9/drivers/char/genrtc.c +--- linux-3.0.9/drivers/char/genrtc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/genrtc.c 2011-11-12 12:47:13.000000000 -0500 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi switch (cmd) { @@ -25362,9 +25362,9 @@ diff -urNp linux-3.0.8/drivers/char/genrtc.c linux-3.0.8/drivers/char/genrtc.c if (get_rtc_pll(&pll)) return -EINVAL; else -diff -urNp linux-3.0.8/drivers/char/hpet.c linux-3.0.8/drivers/char/hpet.c ---- linux-3.0.8/drivers/char/hpet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/hpet.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/hpet.c linux-3.0.9/drivers/char/hpet.c +--- linux-3.0.9/drivers/char/hpet.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/hpet.c 2011-11-12 12:47:13.000000000 -0500 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di } @@ -25374,9 +25374,9 @@ diff -urNp linux-3.0.8/drivers/char/hpet.c linux-3.0.8/drivers/char/hpet.c struct hpet_info *info) { struct hpet_timer __iomem *timer; -diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c ---- linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c +--- linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/ipmi/ipmi_msghandler.c 2011-11-12 12:47:13.000000000 -0500 @@ -415,7 +415,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -25416,9 +25416,9 @@ diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.8/drivers/c si = (struct ipmi_system_interface_addr *) &addr; si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE; si->channel = IPMI_BMC_CHANNEL; -diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c ---- linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c +--- linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/ipmi/ipmi_si_intf.c 2011-11-12 12:47:13.000000000 -0500 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -25449,9 +25449,9 @@ diff -urNp linux-3.0.8/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.8/drivers/char new_smi->interrupt_disabled = 1; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-3.0.8/drivers/char/Kconfig linux-3.0.8/drivers/char/Kconfig ---- linux-3.0.8/drivers/char/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/Kconfig linux-3.0.9/drivers/char/Kconfig +--- linux-3.0.9/drivers/char/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/Kconfig 2011-11-12 12:47:13.000000000 -0500 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig" config DEVKMEM @@ -25470,9 +25470,9 @@ diff -urNp linux-3.0.8/drivers/char/Kconfig linux-3.0.8/drivers/char/Kconfig default y source "drivers/s390/char/Kconfig" -diff -urNp linux-3.0.8/drivers/char/mbcs.c linux-3.0.8/drivers/char/mbcs.c ---- linux-3.0.8/drivers/char/mbcs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/mbcs.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/mbcs.c linux-3.0.9/drivers/char/mbcs.c +--- linux-3.0.9/drivers/char/mbcs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/mbcs.c 2011-11-12 12:47:13.000000000 -0500 @@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de return 0; } @@ -25482,9 +25482,9 @@ diff -urNp linux-3.0.8/drivers/char/mbcs.c linux-3.0.8/drivers/char/mbcs.c { .part_num = MBCS_PART_NUM, .mfg_num = MBCS_MFG_NUM, -diff -urNp linux-3.0.8/drivers/char/mem.c linux-3.0.8/drivers/char/mem.c ---- linux-3.0.8/drivers/char/mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/mem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/mem.c linux-3.0.9/drivers/char/mem.c +--- linux-3.0.9/drivers/char/mem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/mem.c 2011-11-12 12:47:13.000000000 -0500 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -25617,9 +25617,9 @@ diff -urNp linux-3.0.8/drivers/char/mem.c linux-3.0.8/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-3.0.8/drivers/char/nvram.c linux-3.0.8/drivers/char/nvram.c ---- linux-3.0.8/drivers/char/nvram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/nvram.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/nvram.c linux-3.0.9/drivers/char/nvram.c +--- linux-3.0.9/drivers/char/nvram.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/nvram.c 2011-11-12 12:47:13.000000000 -0500 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f spin_unlock_irq(&rtc_lock); @@ -25629,9 +25629,9 @@ diff -urNp linux-3.0.8/drivers/char/nvram.c linux-3.0.8/drivers/char/nvram.c return -EFAULT; *ppos = i; -diff -urNp linux-3.0.8/drivers/char/random.c linux-3.0.8/drivers/char/random.c ---- linux-3.0.8/drivers/char/random.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/char/random.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/random.c linux-3.0.9/drivers/char/random.c +--- linux-3.0.9/drivers/char/random.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/random.c 2011-11-12 12:47:13.000000000 -0500 @@ -261,8 +261,13 @@ /* * Configuration information @@ -25682,9 +25682,9 @@ diff -urNp linux-3.0.8/drivers/char/random.c linux-3.0.8/drivers/char/random.c static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-3.0.8/drivers/char/sonypi.c linux-3.0.8/drivers/char/sonypi.c ---- linux-3.0.8/drivers/char/sonypi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/sonypi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/sonypi.c linux-3.0.9/drivers/char/sonypi.c +--- linux-3.0.9/drivers/char/sonypi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/sonypi.c 2011-11-12 12:47:13.000000000 -0500 @@ -55,6 +55,7 @@ #include <asm/uaccess.h> #include <asm/io.h> @@ -25723,9 +25723,9 @@ diff -urNp linux-3.0.8/drivers/char/sonypi.c linux-3.0.8/drivers/char/sonypi.c mutex_unlock(&sonypi_device.lock); return 0; -diff -urNp linux-3.0.8/drivers/char/tpm/tpm_bios.c linux-3.0.8/drivers/char/tpm/tpm_bios.c ---- linux-3.0.8/drivers/char/tpm/tpm_bios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/tpm/tpm_bios.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/tpm/tpm_bios.c linux-3.0.9/drivers/char/tpm/tpm_bios.c +--- linux-3.0.9/drivers/char/tpm/tpm_bios.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/tpm/tpm_bios.c 2011-11-12 12:47:13.000000000 -0500 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -25769,9 +25769,9 @@ diff -urNp linux-3.0.8/drivers/char/tpm/tpm_bios.c linux-3.0.8/drivers/char/tpm/ acpi_os_unmap_memory(virt, len); return 0; -diff -urNp linux-3.0.8/drivers/char/tpm/tpm.c linux-3.0.8/drivers/char/tpm/tpm.c ---- linux-3.0.8/drivers/char/tpm/tpm.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/char/tpm/tpm.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/tpm/tpm.c linux-3.0.9/drivers/char/tpm/tpm.c +--- linux-3.0.9/drivers/char/tpm/tpm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/tpm/tpm.c 2011-11-12 12:47:13.000000000 -0500 @@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c chip->vendor.req_complete_val) goto out_recv; @@ -25790,9 +25790,9 @@ diff -urNp linux-3.0.8/drivers/char/tpm/tpm.c linux-3.0.8/drivers/char/tpm/tpm.c tpm_cmd.header.in = tpm_readpubek_header; err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, "attempting to read the PUBEK"); -diff -urNp linux-3.0.8/drivers/char/virtio_console.c linux-3.0.8/drivers/char/virtio_console.c ---- linux-3.0.8/drivers/char/virtio_console.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/char/virtio_console.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/char/virtio_console.c linux-3.0.9/drivers/char/virtio_console.c +--- linux-3.0.9/drivers/char/virtio_console.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/char/virtio_console.c 2011-11-12 12:47:13.000000000 -0500 @@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port if (to_user) { ssize_t ret; @@ -25811,9 +25811,9 @@ diff -urNp linux-3.0.8/drivers/char/virtio_console.c linux-3.0.8/drivers/char/vi } static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, -diff -urNp linux-3.0.8/drivers/crypto/hifn_795x.c linux-3.0.8/drivers/crypto/hifn_795x.c ---- linux-3.0.8/drivers/crypto/hifn_795x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/crypto/hifn_795x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/crypto/hifn_795x.c linux-3.0.9/drivers/crypto/hifn_795x.c +--- linux-3.0.9/drivers/crypto/hifn_795x.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/crypto/hifn_795x.c 2011-11-12 12:47:13.000000000 -0500 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 0xCA, 0x34, 0x2B, 0x2E}; struct scatterlist sg; @@ -25823,9 +25823,9 @@ diff -urNp linux-3.0.8/drivers/crypto/hifn_795x.c linux-3.0.8/drivers/crypto/hif memset(src, 0, sizeof(src)); memset(ctx.key, 0, sizeof(ctx.key)); -diff -urNp linux-3.0.8/drivers/crypto/padlock-aes.c linux-3.0.8/drivers/crypto/padlock-aes.c ---- linux-3.0.8/drivers/crypto/padlock-aes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/crypto/padlock-aes.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/crypto/padlock-aes.c linux-3.0.9/drivers/crypto/padlock-aes.c +--- linux-3.0.9/drivers/crypto/padlock-aes.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/crypto/padlock-aes.c 2011-11-12 12:47:13.000000000 -0500 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm struct crypto_aes_ctx gen_aes; int cpu; @@ -25835,9 +25835,9 @@ diff -urNp linux-3.0.8/drivers/crypto/padlock-aes.c linux-3.0.8/drivers/crypto/p if (key_len % 8) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; -diff -urNp linux-3.0.8/drivers/dma/ioat/dma_v3.c linux-3.0.8/drivers/dma/ioat/dma_v3.c ---- linux-3.0.8/drivers/dma/ioat/dma_v3.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/dma/ioat/dma_v3.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/dma/ioat/dma_v3.c linux-3.0.9/drivers/dma/ioat/dma_v3.c +--- linux-3.0.9/drivers/dma/ioat/dma_v3.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/dma/ioat/dma_v3.c 2011-11-12 12:47:13.000000000 -0500 @@ -73,10 +73,10 @@ /* provide a lookup table for setting the source address in the base or * extended descriptor of an xor or pq descriptor @@ -25853,9 +25853,9 @@ diff -urNp linux-3.0.8/drivers/dma/ioat/dma_v3.c linux-3.0.8/drivers/dma/ioat/dm static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx) { -diff -urNp linux-3.0.8/drivers/edac/amd64_edac.c linux-3.0.8/drivers/edac/amd64_edac.c ---- linux-3.0.8/drivers/edac/amd64_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/amd64_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/amd64_edac.c linux-3.0.9/drivers/edac/amd64_edac.c +--- linux-3.0.9/drivers/edac/amd64_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/amd64_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i * PCI core identifies what devices are on a system during boot, and then * inquiry this table to see if this driver is for a given device found. @@ -25865,9 +25865,9 @@ diff -urNp linux-3.0.8/drivers/edac/amd64_edac.c linux-3.0.8/drivers/edac/amd64_ { .vendor = PCI_VENDOR_ID_AMD, .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL, -diff -urNp linux-3.0.8/drivers/edac/amd76x_edac.c linux-3.0.8/drivers/edac/amd76x_edac.c ---- linux-3.0.8/drivers/edac/amd76x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/amd76x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/amd76x_edac.c linux-3.0.9/drivers/edac/amd76x_edac.c +--- linux-3.0.9/drivers/edac/amd76x_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/amd76x_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one( edac_mc_free(mci); } @@ -25877,9 +25877,9 @@ diff -urNp linux-3.0.8/drivers/edac/amd76x_edac.c linux-3.0.8/drivers/edac/amd76 { PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD762}, -diff -urNp linux-3.0.8/drivers/edac/e752x_edac.c linux-3.0.8/drivers/edac/e752x_edac.c ---- linux-3.0.8/drivers/edac/e752x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/e752x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/e752x_edac.c linux-3.0.9/drivers/edac/e752x_edac.c +--- linux-3.0.9/drivers/edac/e752x_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/e752x_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s edac_mc_free(mci); } @@ -25889,9 +25889,9 @@ diff -urNp linux-3.0.8/drivers/edac/e752x_edac.c linux-3.0.8/drivers/edac/e752x_ { PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, E7520}, -diff -urNp linux-3.0.8/drivers/edac/e7xxx_edac.c linux-3.0.8/drivers/edac/e7xxx_edac.c ---- linux-3.0.8/drivers/edac/e7xxx_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/e7xxx_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/e7xxx_edac.c linux-3.0.9/drivers/edac/e7xxx_edac.c +--- linux-3.0.9/drivers/edac/e7xxx_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/e7xxx_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s edac_mc_free(mci); } @@ -25901,9 +25901,9 @@ diff -urNp linux-3.0.8/drivers/edac/e7xxx_edac.c linux-3.0.8/drivers/edac/e7xxx_ { PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, E7205}, -diff -urNp linux-3.0.8/drivers/edac/edac_pci_sysfs.c linux-3.0.8/drivers/edac/edac_pci_sysfs.c ---- linux-3.0.8/drivers/edac/edac_pci_sysfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/edac_pci_sysfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/edac_pci_sysfs.c linux-3.0.9/drivers/edac/edac_pci_sysfs.c +--- linux-3.0.9/drivers/edac/edac_pci_sysfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/edac_pci_sysfs.c 2011-11-12 12:47:13.000000000 -0500 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */ static int edac_pci_poll_msec = 1000; /* one second workq period */ @@ -25987,9 +25987,9 @@ diff -urNp linux-3.0.8/drivers/edac/edac_pci_sysfs.c linux-3.0.8/drivers/edac/ed panic("EDAC: PCI Parity Error"); } } -diff -urNp linux-3.0.8/drivers/edac/i3000_edac.c linux-3.0.8/drivers/edac/i3000_edac.c ---- linux-3.0.8/drivers/edac/i3000_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i3000_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i3000_edac.c linux-3.0.9/drivers/edac/i3000_edac.c +--- linux-3.0.9/drivers/edac/i3000_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i3000_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s edac_mc_free(mci); } @@ -25999,9 +25999,9 @@ diff -urNp linux-3.0.8/drivers/edac/i3000_edac.c linux-3.0.8/drivers/edac/i3000_ { PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I3000}, -diff -urNp linux-3.0.8/drivers/edac/i3200_edac.c linux-3.0.8/drivers/edac/i3200_edac.c ---- linux-3.0.8/drivers/edac/i3200_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i3200_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i3200_edac.c linux-3.0.9/drivers/edac/i3200_edac.c +--- linux-3.0.9/drivers/edac/i3200_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i3200_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s edac_mc_free(mci); } @@ -26011,9 +26011,9 @@ diff -urNp linux-3.0.8/drivers/edac/i3200_edac.c linux-3.0.8/drivers/edac/i3200_ { PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I3200}, -diff -urNp linux-3.0.8/drivers/edac/i5000_edac.c linux-3.0.8/drivers/edac/i5000_edac.c ---- linux-3.0.8/drivers/edac/i5000_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i5000_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i5000_edac.c linux-3.0.9/drivers/edac/i5000_edac.c +--- linux-3.0.9/drivers/edac/i5000_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i5000_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s * * The "E500P" device is the first device supported. @@ -26023,9 +26023,9 @@ diff -urNp linux-3.0.8/drivers/edac/i5000_edac.c linux-3.0.8/drivers/edac/i5000_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16), .driver_data = I5000P}, -diff -urNp linux-3.0.8/drivers/edac/i5100_edac.c linux-3.0.8/drivers/edac/i5100_edac.c ---- linux-3.0.8/drivers/edac/i5100_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i5100_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i5100_edac.c linux-3.0.9/drivers/edac/i5100_edac.c +--- linux-3.0.9/drivers/edac/i5100_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i5100_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s edac_mc_free(mci); } @@ -26035,9 +26035,9 @@ diff -urNp linux-3.0.8/drivers/edac/i5100_edac.c linux-3.0.8/drivers/edac/i5100_ /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) }, { 0, } -diff -urNp linux-3.0.8/drivers/edac/i5400_edac.c linux-3.0.8/drivers/edac/i5400_edac.c ---- linux-3.0.8/drivers/edac/i5400_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i5400_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i5400_edac.c linux-3.0.9/drivers/edac/i5400_edac.c +--- linux-3.0.9/drivers/edac/i5400_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i5400_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s * * The "E500P" device is the first device supported. @@ -26047,9 +26047,9 @@ diff -urNp linux-3.0.8/drivers/edac/i5400_edac.c linux-3.0.8/drivers/edac/i5400_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)}, {0,} /* 0 terminated list. */ }; -diff -urNp linux-3.0.8/drivers/edac/i7300_edac.c linux-3.0.8/drivers/edac/i7300_edac.c ---- linux-3.0.8/drivers/edac/i7300_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i7300_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i7300_edac.c linux-3.0.9/drivers/edac/i7300_edac.c +--- linux-3.0.9/drivers/edac/i7300_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i7300_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s * * Has only 8086:360c PCI ID @@ -26059,9 +26059,9 @@ diff -urNp linux-3.0.8/drivers/edac/i7300_edac.c linux-3.0.8/drivers/edac/i7300_ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)}, {0,} /* 0 terminated list. */ }; -diff -urNp linux-3.0.8/drivers/edac/i7core_edac.c linux-3.0.8/drivers/edac/i7core_edac.c ---- linux-3.0.8/drivers/edac/i7core_edac.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i7core_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i7core_edac.c linux-3.0.9/drivers/edac/i7core_edac.c +--- linux-3.0.9/drivers/edac/i7core_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i7core_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev /* * pci_device_id table for which devices we are looking for @@ -26071,9 +26071,9 @@ diff -urNp linux-3.0.8/drivers/edac/i7core_edac.c linux-3.0.8/drivers/edac/i7cor {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)}, {0,} /* 0 terminated list. */ -diff -urNp linux-3.0.8/drivers/edac/i82443bxgx_edac.c linux-3.0.8/drivers/edac/i82443bxgx_edac.c ---- linux-3.0.8/drivers/edac/i82443bxgx_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i82443bxgx_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i82443bxgx_edac.c linux-3.0.9/drivers/edac/i82443bxgx_edac.c +--- linux-3.0.9/drivers/edac/i82443bxgx_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i82443bxgx_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one); @@ -26083,9 +26083,9 @@ diff -urNp linux-3.0.8/drivers/edac/i82443bxgx_edac.c linux-3.0.8/drivers/edac/i {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)}, -diff -urNp linux-3.0.8/drivers/edac/i82860_edac.c linux-3.0.8/drivers/edac/i82860_edac.c ---- linux-3.0.8/drivers/edac/i82860_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i82860_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i82860_edac.c linux-3.0.9/drivers/edac/i82860_edac.c +--- linux-3.0.9/drivers/edac/i82860_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i82860_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -270,7 +270,7 @@ static void __devexit i82860_remove_one( edac_mc_free(mci); } @@ -26095,9 +26095,9 @@ diff -urNp linux-3.0.8/drivers/edac/i82860_edac.c linux-3.0.8/drivers/edac/i8286 { PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82860}, -diff -urNp linux-3.0.8/drivers/edac/i82875p_edac.c linux-3.0.8/drivers/edac/i82875p_edac.c ---- linux-3.0.8/drivers/edac/i82875p_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i82875p_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i82875p_edac.c linux-3.0.9/drivers/edac/i82875p_edac.c +--- linux-3.0.9/drivers/edac/i82875p_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i82875p_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one edac_mc_free(mci); } @@ -26107,9 +26107,9 @@ diff -urNp linux-3.0.8/drivers/edac/i82875p_edac.c linux-3.0.8/drivers/edac/i828 { PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82875P}, -diff -urNp linux-3.0.8/drivers/edac/i82975x_edac.c linux-3.0.8/drivers/edac/i82975x_edac.c ---- linux-3.0.8/drivers/edac/i82975x_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/i82975x_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/i82975x_edac.c linux-3.0.9/drivers/edac/i82975x_edac.c +--- linux-3.0.9/drivers/edac/i82975x_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/i82975x_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one edac_mc_free(mci); } @@ -26119,9 +26119,9 @@ diff -urNp linux-3.0.8/drivers/edac/i82975x_edac.c linux-3.0.8/drivers/edac/i829 { PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, I82975X -diff -urNp linux-3.0.8/drivers/edac/mce_amd.h linux-3.0.8/drivers/edac/mce_amd.h ---- linux-3.0.8/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/mce_amd.h linux-3.0.9/drivers/edac/mce_amd.h +--- linux-3.0.9/drivers/edac/mce_amd.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/mce_amd.h 2011-11-12 12:47:13.000000000 -0500 @@ -83,7 +83,7 @@ struct amd_decoder_ops { bool (*dc_mce)(u16, u8); bool (*ic_mce)(u16, u8); @@ -26131,9 +26131,9 @@ diff -urNp linux-3.0.8/drivers/edac/mce_amd.h linux-3.0.8/drivers/edac/mce_amd.h void amd_report_gart_errors(bool); void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32)); -diff -urNp linux-3.0.8/drivers/edac/r82600_edac.c linux-3.0.8/drivers/edac/r82600_edac.c ---- linux-3.0.8/drivers/edac/r82600_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/r82600_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/r82600_edac.c linux-3.0.9/drivers/edac/r82600_edac.c +--- linux-3.0.9/drivers/edac/r82600_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/r82600_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -373,7 +373,7 @@ static void __devexit r82600_remove_one( edac_mc_free(mci); } @@ -26143,9 +26143,9 @@ diff -urNp linux-3.0.8/drivers/edac/r82600_edac.c linux-3.0.8/drivers/edac/r8260 { PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID) }, -diff -urNp linux-3.0.8/drivers/edac/x38_edac.c linux-3.0.8/drivers/edac/x38_edac.c ---- linux-3.0.8/drivers/edac/x38_edac.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/edac/x38_edac.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/edac/x38_edac.c linux-3.0.9/drivers/edac/x38_edac.c +--- linux-3.0.9/drivers/edac/x38_edac.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/edac/x38_edac.c 2011-11-12 12:47:13.000000000 -0500 @@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str edac_mc_free(mci); } @@ -26155,9 +26155,9 @@ diff -urNp linux-3.0.8/drivers/edac/x38_edac.c linux-3.0.8/drivers/edac/x38_edac { PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0, X38}, -diff -urNp linux-3.0.8/drivers/firewire/core-card.c linux-3.0.8/drivers/firewire/core-card.c ---- linux-3.0.8/drivers/firewire/core-card.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/firewire/core-card.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/firewire/core-card.c linux-3.0.9/drivers/firewire/core-card.c +--- linux-3.0.9/drivers/firewire/core-card.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/firewire/core-card.c 2011-11-12 12:47:13.000000000 -0500 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref) void fw_core_remove_card(struct fw_card *card) @@ -26167,9 +26167,9 @@ diff -urNp linux-3.0.8/drivers/firewire/core-card.c linux-3.0.8/drivers/firewire card->driver->update_phy_reg(card, 4, PHY_LINK_ACTIVE | PHY_CONTENDER, 0); -diff -urNp linux-3.0.8/drivers/firewire/core-cdev.c linux-3.0.8/drivers/firewire/core-cdev.c ---- linux-3.0.8/drivers/firewire/core-cdev.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/firewire/core-cdev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/firewire/core-cdev.c linux-3.0.9/drivers/firewire/core-cdev.c +--- linux-3.0.9/drivers/firewire/core-cdev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/firewire/core-cdev.c 2011-11-12 12:47:13.000000000 -0500 @@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie int ret; @@ -26180,9 +26180,9 @@ diff -urNp linux-3.0.8/drivers/firewire/core-cdev.c linux-3.0.8/drivers/firewire return -EINVAL; r = kmalloc(sizeof(*r), GFP_KERNEL); -diff -urNp linux-3.0.8/drivers/firewire/core.h linux-3.0.8/drivers/firewire/core.h ---- linux-3.0.8/drivers/firewire/core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/firewire/core.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/firewire/core.h linux-3.0.9/drivers/firewire/core.h +--- linux-3.0.9/drivers/firewire/core.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/firewire/core.h 2011-11-12 12:47:13.000000000 -0500 @@ -101,6 +101,7 @@ struct fw_card_driver { int (*stop_iso)(struct fw_iso_context *ctx); @@ -26191,9 +26191,9 @@ diff -urNp linux-3.0.8/drivers/firewire/core.h linux-3.0.8/drivers/firewire/core void fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver, struct device *device); -diff -urNp linux-3.0.8/drivers/firewire/core-transaction.c linux-3.0.8/drivers/firewire/core-transaction.c ---- linux-3.0.8/drivers/firewire/core-transaction.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/firewire/core-transaction.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/firewire/core-transaction.c linux-3.0.9/drivers/firewire/core-transaction.c +--- linux-3.0.9/drivers/firewire/core-transaction.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/firewire/core-transaction.c 2011-11-12 12:47:13.000000000 -0500 @@ -37,6 +37,7 @@ #include <linux/timer.h> #include <linux/types.h> @@ -26211,9 +26211,9 @@ diff -urNp linux-3.0.8/drivers/firewire/core-transaction.c linux-3.0.8/drivers/f init_timer_on_stack(&t.split_timeout_timer); init_completion(&d.done); d.payload = payload; -diff -urNp linux-3.0.8/drivers/firmware/dmi_scan.c linux-3.0.8/drivers/firmware/dmi_scan.c ---- linux-3.0.8/drivers/firmware/dmi_scan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/firmware/dmi_scan.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/firmware/dmi_scan.c linux-3.0.9/drivers/firmware/dmi_scan.c +--- linux-3.0.9/drivers/firmware/dmi_scan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/firmware/dmi_scan.c 2011-11-12 12:47:13.000000000 -0500 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void) } } @@ -26235,9 +26235,9 @@ diff -urNp linux-3.0.8/drivers/firmware/dmi_scan.c linux-3.0.8/drivers/firmware/ iounmap(buf); return 0; -diff -urNp linux-3.0.8/drivers/gpio/vr41xx_giu.c linux-3.0.8/drivers/gpio/vr41xx_giu.c ---- linux-3.0.8/drivers/gpio/vr41xx_giu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpio/vr41xx_giu.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpio/vr41xx_giu.c linux-3.0.9/drivers/gpio/vr41xx_giu.c +--- linux-3.0.9/drivers/gpio/vr41xx_giu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpio/vr41xx_giu.c 2011-11-12 12:47:13.000000000 -0500 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", maskl, pendl, maskh, pendh); @@ -26247,9 +26247,9 @@ diff -urNp linux-3.0.8/drivers/gpio/vr41xx_giu.c linux-3.0.8/drivers/gpio/vr41xx return -EINVAL; } -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc.c linux-3.0.8/drivers/gpu/drm/drm_crtc.c ---- linux-3.0.8/drivers/gpu/drm/drm_crtc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_crtc.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc.c linux-3.0.9/drivers/gpu/drm/drm_crtc.c +--- linux-3.0.9/drivers/gpu/drm/drm_crtc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_crtc.c 2011-11-12 12:47:13.000000000 -0500 @@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_dev */ if ((out_resp->count_modes >= mode_count) && mode_count) { @@ -26342,9 +26342,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc.c linux-3.0.8/drivers/gpu/drm/dr if (copy_to_user(blob_ptr, blob->data, blob->length)){ ret = -EFAULT; goto done; -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c ---- linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c +--- linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_crtc_helper.c 2011-11-12 12:47:13.000000000 -0500 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d struct drm_crtc *tmp; int crtc_mask = 1; @@ -26363,9 +26363,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.8/drivers/gpu crtc->enabled = drm_helper_crtc_in_use(crtc); if (!crtc->enabled) return true; -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_drv.c linux-3.0.8/drivers/gpu/drm/drm_drv.c ---- linux-3.0.8/drivers/gpu/drm/drm_drv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_drv.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/drivers/gpu/drm/drm_drv.c +--- linux-3.0.9/drivers/gpu/drm/drm_drv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_drv.c 2011-11-12 12:47:13.000000000 -0500 @@ -307,7 +307,7 @@ module_exit(drm_core_exit); /** * Copy and IOCTL return string to user space @@ -26384,9 +26384,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_drv.c linux-3.0.8/drivers/gpu/drm/drm ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_fops.c linux-3.0.8/drivers/gpu/drm/drm_fops.c ---- linux-3.0.8/drivers/gpu/drm/drm_fops.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_fops.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/drm_fops.c +--- linux-3.0.9/drivers/gpu/drm/drm_fops.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_fops.c 2011-11-12 12:47:13.000000000 -0500 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * } @@ -26436,9 +26436,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_fops.c linux-3.0.8/drivers/gpu/drm/dr if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_global.c linux-3.0.8/drivers/gpu/drm/drm_global.c ---- linux-3.0.8/drivers/gpu/drm/drm_global.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_global.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_global.c linux-3.0.9/drivers/gpu/drm/drm_global.c +--- linux-3.0.9/drivers/gpu/drm/drm_global.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_global.c 2011-11-12 12:47:13.000000000 -0500 @@ -36,7 +36,7 @@ struct drm_global_item { struct mutex mutex; @@ -26496,9 +26496,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_global.c linux-3.0.8/drivers/gpu/drm/ ref->release(ref); item->object = NULL; } -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_info.c linux-3.0.8/drivers/gpu/drm/drm_info.c ---- linux-3.0.8/drivers/gpu/drm/drm_info.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_info.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_info.c linux-3.0.9/drivers/gpu/drm/drm_info.c +--- linux-3.0.9/drivers/gpu/drm/drm_info.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_info.c 2011-11-12 12:47:13.000000000 -0500 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void struct drm_local_map *map; struct drm_map_list *r_list; @@ -26539,9 +26539,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_info.c linux-3.0.8/drivers/gpu/drm/dr #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioc32.c linux-3.0.8/drivers/gpu/drm/drm_ioc32.c ---- linux-3.0.8/drivers/gpu/drm/drm_ioc32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_ioc32.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioc32.c linux-3.0.9/drivers/gpu/drm/drm_ioc32.c +--- linux-3.0.9/drivers/gpu/drm/drm_ioc32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_ioc32.c 2011-11-12 12:47:13.000000000 -0500 @@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi request = compat_alloc_user_space(nbytes); if (!access_ok(VERIFY_WRITE, request, nbytes)) @@ -26560,9 +26560,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioc32.c linux-3.0.8/drivers/gpu/drm/d if (__put_user(count, &request->count) || __put_user(list, &request->list)) -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioctl.c linux-3.0.8/drivers/gpu/drm/drm_ioctl.c ---- linux-3.0.8/drivers/gpu/drm/drm_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_ioctl.c linux-3.0.9/drivers/gpu/drm/drm_ioctl.c +--- linux-3.0.9/drivers/gpu/drm/drm_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_ioctl.c 2011-11-12 12:47:13.000000000 -0500 @@ -256,7 +256,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); @@ -26572,9 +26572,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_ioctl.c linux-3.0.8/drivers/gpu/drm/d stats->data[i].type = dev->types[i]; } -diff -urNp linux-3.0.8/drivers/gpu/drm/drm_lock.c linux-3.0.8/drivers/gpu/drm/drm_lock.c ---- linux-3.0.8/drivers/gpu/drm/drm_lock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/drm_lock.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/drm_lock.c linux-3.0.9/drivers/gpu/drm/drm_lock.c +--- linux-3.0.9/drivers/gpu/drm/drm_lock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/drm_lock.c 2011-11-12 12:47:13.000000000 -0500 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -26593,9 +26593,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/drm_lock.c linux-3.0.8/drivers/gpu/drm/dr if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ -diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c ---- linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c +--- linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i810/i810_dma.c 2011-11-12 12:47:13.000000000 -0500 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -26618,9 +26618,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_dma.c linux-3.0.8/drivers/gpu/d sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h ---- linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h +--- linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i810/i810_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -108,8 +108,8 @@ typedef struct drm_i810_private { int page_flipping; @@ -26632,9 +26632,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i810/i810_drv.h linux-3.0.8/drivers/gpu/d int front_offset; } drm_i810_private_t; -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c ---- linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c +--- linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/i915_debugfs.c 2011-11-12 12:47:13.000000000 -0500 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se I915_READ(GTIMR)); } @@ -26653,9 +26653,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.8/drivers/g mutex_unlock(&dev->struct_mutex); -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c ---- linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c +--- linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/i915_dma.c 2011-11-12 12:47:13.000000000 -0500 @@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s bool can_switch; @@ -26665,9 +26665,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_dma.c linux-3.0.8/drivers/gpu/d spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h ---- linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h +--- linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/i915_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs { /* render clock increase/decrease */ /* display clock increase/decrease */ @@ -26704,9 +26704,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_drv.h linux-3.0.8/drivers/gpu/d { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2011-11-12 12:47:13.000000000 -0500 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct i915_gem_clflush_object(obj); @@ -26716,9 +26716,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.8/dr /* The actual obj->write_domain will be updated with * pending_write_domain after we emit the accumulated flush for all -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c ---- linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c +--- linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/i915_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir; struct drm_i915_master_private *master_priv; @@ -26764,9 +26764,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/i915_irq.c linux-3.0.8/drivers/gpu/d INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); INIT_WORK(&dev_priv->error_work, i915_error_work_func); -diff -urNp linux-3.0.8/drivers/gpu/drm/i915/intel_display.c linux-3.0.8/drivers/gpu/drm/i915/intel_display.c ---- linux-3.0.8/drivers/gpu/drm/i915/intel_display.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/i915/intel_display.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/i915/intel_display.c linux-3.0.9/drivers/gpu/drm/i915/intel_display.c +--- linux-3.0.9/drivers/gpu/drm/i915/intel_display.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/i915/intel_display.c 2011-11-12 12:47:13.000000000 -0500 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt wait_event(dev_priv->pending_flip_queue, @@ -26812,9 +26812,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/i915/intel_display.c linux-3.0.8/drivers/ cleanup_objs: drm_gem_object_unreference(&work->old_fb_obj->base); drm_gem_object_unreference(&obj->base); -diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h ---- linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h +--- linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/mga/mga_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -120,9 +120,9 @@ typedef struct drm_mga_private { u32 clear_cmd; u32 maccess; @@ -26827,9 +26827,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_drv.h linux-3.0.8/drivers/gpu/drm u32 next_fence_to_post; unsigned int fb_cpp; -diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c ---- linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c +--- linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/mga/mga_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -26866,9 +26866,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/mga/mga_irq.c linux-3.0.8/drivers/gpu/drm - *sequence) <= (1 << 23))); *sequence = cur_fence; -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c ---- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c +--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-11-12 12:47:13.000000000 -0500 @@ -200,7 +200,7 @@ struct methods { const char desc[8]; void (*loadbios)(struct drm_device *, uint8_t *); @@ -26887,9 +26887,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.8/driver #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry }) -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h ---- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h +--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -227,7 +227,7 @@ struct nouveau_channel { struct list_head pending; uint32_t sequence; @@ -26942,9 +26942,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.8/drivers } ttm; struct { -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c ---- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c +--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_fence.c 2011-11-12 12:47:13.000000000 -0500 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan if (USE_REFCNT(dev)) sequence = nvchan_rd32(chan, 0x48); @@ -26963,9 +26963,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.8/drive return 0; } -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c ---- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c +--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_gem.c 2011-11-12 12:47:13.000000000 -0500 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch int trycnt = 0; int ret, i; @@ -26975,9 +26975,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.8/drivers retry: if (++trycnt > 100000) { NV_ERROR(dev, "%s failed and gave up.\n", __func__); -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c ---- linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c +--- linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nouveau_state.c 2011-11-12 12:47:13.000000000 -0500 @@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc bool can_switch; @@ -26987,9 +26987,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.8/drive spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c ---- linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c +--- linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/nouveau/nv04_graph.c 2011-11-12 12:47:13.000000000 -0500 @@ -560,7 +560,7 @@ static int nv04_graph_mthd_set_ref(struct nouveau_channel *chan, u32 class, u32 mthd, u32 data) @@ -26999,9 +26999,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.8/drivers/ return 0; } -diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c ---- linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c +--- linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/r128/r128_cce.c 2011-11-12 12:47:13.000000000 -0500 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d /* GH: Simple idle check. @@ -27011,9 +27011,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_cce.c linux-3.0.8/drivers/gpu/d /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring -diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h ---- linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h +--- linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/r128/r128_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -90,14 +90,14 @@ typedef struct drm_r128_private { int is_pci; unsigned long cce_buffers_offset; @@ -27031,9 +27031,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_drv.h linux-3.0.8/drivers/gpu/d u32 color_fmt; unsigned int front_offset; -diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c ---- linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c +--- linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/r128/r128_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d if (crtc != 0) return 0; @@ -27052,9 +27052,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_irq.c linux-3.0.8/drivers/gpu/d drm_handle_vblank(dev, 0); return IRQ_HANDLED; } -diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_state.c linux-3.0.8/drivers/gpu/drm/r128/r128_state.c ---- linux-3.0.8/drivers/gpu/drm/r128/r128_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/r128/r128_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/r128/r128_state.c linux-3.0.9/drivers/gpu/drm/r128/r128_state.c +--- linux-3.0.9/drivers/gpu/drm/r128/r128_state.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/r128/r128_state.c 2011-11-12 12:47:13.000000000 -0500 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv) @@ -27068,9 +27068,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/r128/r128_state.c linux-3.0.8/drivers/gpu } #endif -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/atom.c linux-3.0.8/drivers/gpu/drm/radeon/atom.c ---- linux-3.0.8/drivers/gpu/drm/radeon/atom.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/atom.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/atom.c linux-3.0.9/drivers/gpu/drm/radeon/atom.c +--- linux-3.0.9/drivers/gpu/drm/radeon/atom.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/atom.c 2011-11-12 12:47:13.000000000 -0500 @@ -1254,6 +1254,8 @@ struct atom_context *atom_parse(struct c char name[512]; int i; @@ -27080,9 +27080,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/atom.c linux-3.0.8/drivers/gpu/drm ctx->card = card; ctx->bios = bios; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c ---- linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c +--- linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/mkregtable.c 2011-11-12 12:47:13.000000000 -0500 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -27100,9 +27100,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.8/drivers/g if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_atombios.c 2011-11-12 12:47:13.000000000 -0500 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from struct radeon_gpio_rec gpio; struct radeon_hpd hpd; @@ -27112,9 +27112,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.8/driv if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) return false; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_device.c 2011-11-12 12:47:13.000000000 -0500 @@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch bool can_switch; @@ -27124,9 +27124,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.8/driver spin_unlock(&dev->count_lock); return can_switch; } -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_display.c 2011-11-12 12:47:13.000000000 -0500 @@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra uint32_t post_div; u32 pll_out_min, pll_out_max; @@ -27136,9 +27136,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.8/drive DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); freq = freq * 1000; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private { /* SW interrupt */ @@ -27148,9 +27148,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.8/drivers/g int vblank_crtc; uint32_t irq_enable_reg; uint32_t r500_disp_irq_reg; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_fence.c 2011-11-12 12:47:13.000000000 -0500 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); return 0; @@ -27169,10 +27169,10 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.8/drivers INIT_LIST_HEAD(&rdev->fence_drv.created); INIT_LIST_HEAD(&rdev->fence_drv.emited); INIT_LIST_HEAD(&rdev->fence_drv.signaled); -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon.h linux-3.0.8/drivers/gpu/drm/radeon/radeon.h ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon.h 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon.h 2011-10-16 21:55:27.000000000 -0400 -@@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon.h linux-3.0.9/drivers/gpu/drm/radeon/radeon.h +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon.h 2011-11-12 12:47:13.000000000 -0500 +@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_d */ struct radeon_fence_driver { uint32_t scratch_reg; @@ -27181,7 +27181,7 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon.h linux-3.0.8/drivers/gpu/d uint32_t last_seq; unsigned long last_jiffies; unsigned long last_timeout; -@@ -961,7 +961,7 @@ struct radeon_asic { +@@ -962,7 +962,7 @@ struct radeon_asic { void (*pre_page_flip)(struct radeon_device *rdev, int crtc); u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base); void (*post_page_flip)(struct radeon_device *rdev, int crtc); @@ -27190,9 +27190,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon.h linux-3.0.8/drivers/gpu/d /* * Asic structures -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-11-12 12:47:13.000000000 -0500 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str request = compat_alloc_user_space(sizeof(*request)); if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) @@ -27202,9 +27202,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.8/drivers &request->value)) return -EFAULT; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de unsigned int ret; RING_LOCALS; @@ -27225,9 +27225,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.8/drivers/g DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); dev->max_vblank_count = 0x001fffff; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_state.c 2011-11-12 12:47:13.000000000 -0500 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS) sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS; @@ -27246,9 +27246,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.8/drivers DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/radeon_ttm.c 2011-11-12 12:47:13.000000000 -0500 @@ -649,8 +649,10 @@ int radeon_mmap(struct file *filp, struc } if (unlikely(ttm_vm_ops == NULL)) { @@ -27262,9 +27262,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.8/drivers/g } vma->vm_ops = &radeon_ttm_vm_ops; return 0; -diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/rs690.c linux-3.0.8/drivers/gpu/drm/radeon/rs690.c ---- linux-3.0.8/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/radeon/rs690.c linux-3.0.9/drivers/gpu/drm/radeon/rs690.c +--- linux-3.0.9/drivers/gpu/drm/radeon/rs690.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/radeon/rs690.c 2011-11-12 12:47:13.000000000 -0500 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && rdev->pm.sideport_bandwidth.full) @@ -27278,9 +27278,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/radeon/rs690.c linux-3.0.8/drivers/gpu/dr } else { if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && rdev->pm.k8_bandwidth.full) -diff -urNp linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c ---- linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c +--- linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/ttm/ttm_page_alloc.c 2011-11-12 12:47:13.000000000 -0500 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages static int ttm_pool_mm_shrink(struct shrinker *shrink, struct shrink_control *sc) @@ -27293,9 +27293,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.8/drivers/ struct ttm_page_pool *pool; int shrink_pages = sc->nr_to_scan; -diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_drv.h linux-3.0.8/drivers/gpu/drm/via/via_drv.h ---- linux-3.0.8/drivers/gpu/drm/via/via_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/via/via_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_drv.h linux-3.0.9/drivers/gpu/drm/via/via_drv.h +--- linux-3.0.9/drivers/gpu/drm/via/via_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/via/via_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { typedef uint32_t maskarray_t[5]; @@ -27314,9 +27314,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_drv.h linux-3.0.8/drivers/gpu/drm drm_via_state_t hc_state; char pci_buf[VIA_PCI_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; -diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_irq.c linux-3.0.8/drivers/gpu/drm/via/via_irq.c ---- linux-3.0.8/drivers/gpu/drm/via/via_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/via/via_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/via/via_irq.c linux-3.0.9/drivers/gpu/drm/via/via_irq.c +--- linux-3.0.9/drivers/gpu/drm/via/via_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/via/via_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de if (crtc != 0) return 0; @@ -27387,9 +27387,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/via/via_irq.c linux-3.0.8/drivers/gpu/drm irqwait->request.type &= ~_DRM_VBLANK_RELATIVE; case VIA_IRQ_ABSOLUTE: break; -diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h ---- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h 2011-11-12 12:47:13.000000000 -0500 @@ -240,7 +240,7 @@ struct vmw_private { * Fencing and IRQs. */ @@ -27399,9 +27399,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.8/drivers/g wait_queue_head_t fence_queue; wait_queue_head_t fifo_queue; atomic_t fence_queue_waiters; -diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c ---- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c 2011-11-12 12:47:13.000000000 -0500 @@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device struct drm_vmw_fence_rep fence_rep; struct drm_vmw_fence_rep __user *user_fence_rep; @@ -27411,9 +27411,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.8/drive void *cmd; uint32_t sequence; struct vmw_sw_context *sw_context = &dev_priv->ctx; -diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c ---- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c 2011-11-12 12:47:13.000000000 -0500 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev while (!vmw_lag_lt(queue, us)) { spin_lock(&queue->lock); @@ -27423,9 +27423,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.8/drivers else { fence = list_first_entry(&queue->head, struct vmw_fence, head); -diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ---- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c 2011-11-12 12:47:13.000000000 -0500 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de (unsigned int) min, (unsigned int) fifo->capabilities); @@ -27462,9 +27462,9 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.8/drivers/ } while (*sequence == 0); if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) { -diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c ---- linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +--- linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c 2011-11-12 12:47:13.000000000 -0500 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva * emitted. Then the fence is stale and signaled. */ @@ -27483,10 +27483,10 @@ diff -urNp linux-3.0.8/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.8/drivers/g ret = 0; for (;;) { -diff -urNp linux-3.0.8/drivers/hid/hid-core.c linux-3.0.8/drivers/hid/hid-core.c ---- linux-3.0.8/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400 -@@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device +diff -urNp linux-3.0.9/drivers/hid/hid-core.c linux-3.0.9/drivers/hid/hid-core.c +--- linux-3.0.9/drivers/hid/hid-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/hid/hid-core.c 2011-11-12 12:47:13.000000000 -0500 +@@ -1940,7 +1940,7 @@ static bool hid_ignore(struct hid_device int hid_add_device(struct hid_device *hdev) { @@ -27495,7 +27495,7 @@ diff -urNp linux-3.0.8/drivers/hid/hid-core.c linux-3.0.8/drivers/hid/hid-core.c int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) -@@ -1938,7 +1938,7 @@ int hid_add_device(struct hid_device *hd +@@ -1955,7 +1955,7 @@ int hid_add_device(struct hid_device *hd /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, @@ -27504,9 +27504,9 @@ diff -urNp linux-3.0.8/drivers/hid/hid-core.c linux-3.0.8/drivers/hid/hid-core.c hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); -diff -urNp linux-3.0.8/drivers/hid/usbhid/hiddev.c linux-3.0.8/drivers/hid/usbhid/hiddev.c ---- linux-3.0.8/drivers/hid/usbhid/hiddev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/hid/usbhid/hiddev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/hid/usbhid/hiddev.c linux-3.0.9/drivers/hid/usbhid/hiddev.c +--- linux-3.0.9/drivers/hid/usbhid/hiddev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/hid/usbhid/hiddev.c 2011-11-12 12:47:13.000000000 -0500 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi break; @@ -27516,9 +27516,9 @@ diff -urNp linux-3.0.8/drivers/hid/usbhid/hiddev.c linux-3.0.8/drivers/hid/usbhi break; for (i = 0; i < hid->maxcollection; i++) -diff -urNp linux-3.0.8/drivers/hwmon/acpi_power_meter.c linux-3.0.8/drivers/hwmon/acpi_power_meter.c ---- linux-3.0.8/drivers/hwmon/acpi_power_meter.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/hwmon/acpi_power_meter.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/hwmon/acpi_power_meter.c linux-3.0.9/drivers/hwmon/acpi_power_meter.c +--- linux-3.0.9/drivers/hwmon/acpi_power_meter.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/hwmon/acpi_power_meter.c 2011-11-12 12:47:13.000000000 -0500 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d return res; @@ -27528,9 +27528,9 @@ diff -urNp linux-3.0.8/drivers/hwmon/acpi_power_meter.c linux-3.0.8/drivers/hwmo mutex_lock(&resource->lock); resource->trip[attr->index - 7] = temp; -diff -urNp linux-3.0.8/drivers/hwmon/sht15.c linux-3.0.8/drivers/hwmon/sht15.c ---- linux-3.0.8/drivers/hwmon/sht15.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/hwmon/sht15.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/hwmon/sht15.c linux-3.0.9/drivers/hwmon/sht15.c +--- linux-3.0.9/drivers/hwmon/sht15.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/hwmon/sht15.c 2011-11-12 12:47:13.000000000 -0500 @@ -166,7 +166,7 @@ struct sht15_data { int supply_uV; bool supply_uV_valid; @@ -27579,9 +27579,9 @@ diff -urNp linux-3.0.8/drivers/hwmon/sht15.c linux-3.0.8/drivers/hwmon/sht15.c return; } -diff -urNp linux-3.0.8/drivers/hwmon/w83791d.c linux-3.0.8/drivers/hwmon/w83791d.c ---- linux-3.0.8/drivers/hwmon/w83791d.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/hwmon/w83791d.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/hwmon/w83791d.c linux-3.0.9/drivers/hwmon/w83791d.c +--- linux-3.0.9/drivers/hwmon/w83791d.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/hwmon/w83791d.c 2011-11-12 12:47:13.000000000 -0500 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -27593,9 +27593,9 @@ diff -urNp linux-3.0.8/drivers/hwmon/w83791d.c linux-3.0.8/drivers/hwmon/w83791d static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c ---- linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c +--- linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/i2c/busses/i2c-amd756-s4882.c 2011-11-12 12:47:13.000000000 -0500 @@ -43,7 +43,7 @@ extern struct i2c_adapter amd756_smbus; @@ -27605,9 +27605,9 @@ diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.8/drivers /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(amd756_lock); -diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c ---- linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c +--- linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-11-12 12:47:13.000000000 -0500 @@ -41,7 +41,7 @@ extern struct i2c_adapter *nforce2_smbus; @@ -27617,9 +27617,9 @@ diff -urNp linux-3.0.8/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.8/driver /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(nforce2_lock); -diff -urNp linux-3.0.8/drivers/i2c/i2c-mux.c linux-3.0.8/drivers/i2c/i2c-mux.c ---- linux-3.0.8/drivers/i2c/i2c-mux.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/i2c/i2c-mux.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/i2c/i2c-mux.c linux-3.0.9/drivers/i2c/i2c-mux.c +--- linux-3.0.9/drivers/i2c/i2c-mux.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/i2c/i2c-mux.c 2011-11-12 12:47:13.000000000 -0500 @@ -28,7 +28,7 @@ /* multiplexer per channel data */ struct i2c_mux_priv { @@ -27629,9 +27629,9 @@ diff -urNp linux-3.0.8/drivers/i2c/i2c-mux.c linux-3.0.8/drivers/i2c/i2c-mux.c struct i2c_adapter *parent; void *mux_dev; /* the mux chip/device */ -diff -urNp linux-3.0.8/drivers/ide/aec62xx.c linux-3.0.8/drivers/ide/aec62xx.c ---- linux-3.0.8/drivers/ide/aec62xx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/aec62xx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/aec62xx.c linux-3.0.9/drivers/ide/aec62xx.c +--- linux-3.0.9/drivers/ide/aec62xx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/aec62xx.c 2011-11-12 12:47:13.000000000 -0500 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_ .cable_detect = atp86x_cable_detect, }; @@ -27641,9 +27641,9 @@ diff -urNp linux-3.0.8/drivers/ide/aec62xx.c linux-3.0.8/drivers/ide/aec62xx.c { /* 0: AEC6210 */ .name = DRV_NAME, .init_chipset = init_chipset_aec62xx, -diff -urNp linux-3.0.8/drivers/ide/alim15x3.c linux-3.0.8/drivers/ide/alim15x3.c ---- linux-3.0.8/drivers/ide/alim15x3.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/alim15x3.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/alim15x3.c linux-3.0.9/drivers/ide/alim15x3.c +--- linux-3.0.9/drivers/ide/alim15x3.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/alim15x3.c 2011-11-12 12:47:13.000000000 -0500 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27653,9 +27653,9 @@ diff -urNp linux-3.0.8/drivers/ide/alim15x3.c linux-3.0.8/drivers/ide/alim15x3.c .name = DRV_NAME, .init_chipset = init_chipset_ali15x3, .init_hwif = init_hwif_ali15x3, -diff -urNp linux-3.0.8/drivers/ide/amd74xx.c linux-3.0.8/drivers/ide/amd74xx.c ---- linux-3.0.8/drivers/ide/amd74xx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/amd74xx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/amd74xx.c linux-3.0.9/drivers/ide/amd74xx.c +--- linux-3.0.9/drivers/ide/amd74xx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/amd74xx.c 2011-11-12 12:47:13.000000000 -0500 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por .udma_mask = udma, \ } @@ -27665,9 +27665,9 @@ diff -urNp linux-3.0.8/drivers/ide/amd74xx.c linux-3.0.8/drivers/ide/amd74xx.c /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2), /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4), /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5), -diff -urNp linux-3.0.8/drivers/ide/atiixp.c linux-3.0.8/drivers/ide/atiixp.c ---- linux-3.0.8/drivers/ide/atiixp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/atiixp.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/atiixp.c linux-3.0.9/drivers/ide/atiixp.c +--- linux-3.0.9/drivers/ide/atiixp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/atiixp.c 2011-11-12 12:47:13.000000000 -0500 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_ .cable_detect = atiixp_cable_detect, }; @@ -27677,9 +27677,9 @@ diff -urNp linux-3.0.8/drivers/ide/atiixp.c linux-3.0.8/drivers/ide/atiixp.c { /* 0: IXP200/300/400/700 */ .name = DRV_NAME, .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, -diff -urNp linux-3.0.8/drivers/ide/cmd64x.c linux-3.0.8/drivers/ide/cmd64x.c ---- linux-3.0.8/drivers/ide/cmd64x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/cmd64x.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/cmd64x.c linux-3.0.9/drivers/ide/cmd64x.c +--- linux-3.0.9/drivers/ide/cmd64x.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/cmd64x.c 2011-11-12 12:47:13.000000000 -0500 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -27689,9 +27689,9 @@ diff -urNp linux-3.0.8/drivers/ide/cmd64x.c linux-3.0.8/drivers/ide/cmd64x.c { /* 0: CMD643 */ .name = DRV_NAME, .init_chipset = init_chipset_cmd64x, -diff -urNp linux-3.0.8/drivers/ide/cs5520.c linux-3.0.8/drivers/ide/cs5520.c ---- linux-3.0.8/drivers/ide/cs5520.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/cs5520.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/cs5520.c linux-3.0.9/drivers/ide/cs5520.c +--- linux-3.0.9/drivers/ide/cs5520.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/cs5520.c 2011-11-12 12:47:13.000000000 -0500 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_ .set_dma_mode = cs5520_set_dma_mode, }; @@ -27701,9 +27701,9 @@ diff -urNp linux-3.0.8/drivers/ide/cs5520.c linux-3.0.8/drivers/ide/cs5520.c .name = DRV_NAME, .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } }, .port_ops = &cs5520_port_ops, -diff -urNp linux-3.0.8/drivers/ide/cs5530.c linux-3.0.8/drivers/ide/cs5530.c ---- linux-3.0.8/drivers/ide/cs5530.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/cs5530.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/cs5530.c linux-3.0.9/drivers/ide/cs5530.c +--- linux-3.0.9/drivers/ide/cs5530.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/cs5530.c 2011-11-12 12:47:13.000000000 -0500 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_ .udma_filter = cs5530_udma_filter, }; @@ -27713,9 +27713,9 @@ diff -urNp linux-3.0.8/drivers/ide/cs5530.c linux-3.0.8/drivers/ide/cs5530.c .name = DRV_NAME, .init_chipset = init_chipset_cs5530, .init_hwif = init_hwif_cs5530, -diff -urNp linux-3.0.8/drivers/ide/cs5535.c linux-3.0.8/drivers/ide/cs5535.c ---- linux-3.0.8/drivers/ide/cs5535.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/cs5535.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/cs5535.c linux-3.0.9/drivers/ide/cs5535.c +--- linux-3.0.9/drivers/ide/cs5535.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/cs5535.c 2011-11-12 12:47:13.000000000 -0500 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_ .cable_detect = cs5535_cable_detect, }; @@ -27725,9 +27725,9 @@ diff -urNp linux-3.0.8/drivers/ide/cs5535.c linux-3.0.8/drivers/ide/cs5535.c .name = DRV_NAME, .port_ops = &cs5535_port_ops, .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE, -diff -urNp linux-3.0.8/drivers/ide/cy82c693.c linux-3.0.8/drivers/ide/cy82c693.c ---- linux-3.0.8/drivers/ide/cy82c693.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/cy82c693.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/cy82c693.c linux-3.0.9/drivers/ide/cy82c693.c +--- linux-3.0.9/drivers/ide/cy82c693.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/cy82c693.c 2011-11-12 12:47:13.000000000 -0500 @@ -161,7 +161,7 @@ static const struct ide_port_ops cy82c69 .set_dma_mode = cy82c693_set_dma_mode, }; @@ -27737,9 +27737,9 @@ diff -urNp linux-3.0.8/drivers/ide/cy82c693.c linux-3.0.8/drivers/ide/cy82c693.c .name = DRV_NAME, .init_iops = init_iops_cy82c693, .port_ops = &cy82c693_port_ops, -diff -urNp linux-3.0.8/drivers/ide/hpt366.c linux-3.0.8/drivers/ide/hpt366.c ---- linux-3.0.8/drivers/ide/hpt366.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/hpt366.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/hpt366.c linux-3.0.9/drivers/ide/hpt366.c +--- linux-3.0.9/drivers/ide/hpt366.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/hpt366.c 2011-11-12 12:47:13.000000000 -0500 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings } }; @@ -27848,9 +27848,9 @@ diff -urNp linux-3.0.8/drivers/ide/hpt366.c linux-3.0.8/drivers/ide/hpt366.c { /* 0: HPT36x */ .name = DRV_NAME, .init_chipset = init_chipset_hpt366, -diff -urNp linux-3.0.8/drivers/ide/ide-cd.c linux-3.0.8/drivers/ide/ide-cd.c ---- linux-3.0.8/drivers/ide/ide-cd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/ide-cd.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/ide-cd.c linux-3.0.9/drivers/ide/ide-cd.c +--- linux-3.0.9/drivers/ide/ide-cd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/ide-cd.c 2011-11-12 12:47:13.000000000 -0500 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -27860,9 +27860,9 @@ diff -urNp linux-3.0.8/drivers/ide/ide-cd.c linux-3.0.8/drivers/ide/ide-cd.c drive->dma = 0; } } -diff -urNp linux-3.0.8/drivers/ide/ide-floppy.c linux-3.0.8/drivers/ide/ide-floppy.c ---- linux-3.0.8/drivers/ide/ide-floppy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/ide-floppy.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/ide-floppy.c linux-3.0.9/drivers/ide/ide-floppy.c +--- linux-3.0.9/drivers/ide/ide-floppy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/ide-floppy.c 2011-11-12 12:47:13.000000000 -0500 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d u8 pc_buf[256], header_len, desc_cnt; int i, rc = 1, blocks, length; @@ -27872,9 +27872,9 @@ diff -urNp linux-3.0.8/drivers/ide/ide-floppy.c linux-3.0.8/drivers/ide/ide-flop ide_debug_log(IDE_DBG_FUNC, "enter"); drive->bios_cyl = 0; -diff -urNp linux-3.0.8/drivers/ide/ide-pci-generic.c linux-3.0.8/drivers/ide/ide-pci-generic.c ---- linux-3.0.8/drivers/ide/ide-pci-generic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/ide-pci-generic.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/ide-pci-generic.c linux-3.0.9/drivers/ide/ide-pci-generic.c +--- linux-3.0.9/drivers/ide/ide-pci-generic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/ide-pci-generic.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell .udma_mask = ATA_UDMA6, \ } @@ -27884,9 +27884,9 @@ diff -urNp linux-3.0.8/drivers/ide/ide-pci-generic.c linux-3.0.8/drivers/ide/ide /* 0: Unknown */ DECLARE_GENERIC_PCI_DEV(0), -diff -urNp linux-3.0.8/drivers/ide/it8172.c linux-3.0.8/drivers/ide/it8172.c ---- linux-3.0.8/drivers/ide/it8172.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/it8172.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/it8172.c linux-3.0.9/drivers/ide/it8172.c +--- linux-3.0.9/drivers/ide/it8172.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/it8172.c 2011-11-12 12:47:13.000000000 -0500 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_ .set_dma_mode = it8172_set_dma_mode, }; @@ -27896,9 +27896,9 @@ diff -urNp linux-3.0.8/drivers/ide/it8172.c linux-3.0.8/drivers/ide/it8172.c .name = DRV_NAME, .port_ops = &it8172_port_ops, .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} }, -diff -urNp linux-3.0.8/drivers/ide/it8213.c linux-3.0.8/drivers/ide/it8213.c ---- linux-3.0.8/drivers/ide/it8213.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/it8213.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/it8213.c linux-3.0.9/drivers/ide/it8213.c +--- linux-3.0.9/drivers/ide/it8213.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/it8213.c 2011-11-12 12:47:13.000000000 -0500 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_ .cable_detect = it8213_cable_detect, }; @@ -27908,9 +27908,9 @@ diff -urNp linux-3.0.8/drivers/ide/it8213.c linux-3.0.8/drivers/ide/it8213.c .name = DRV_NAME, .enablebits = { {0x41, 0x80, 0x80} }, .port_ops = &it8213_port_ops, -diff -urNp linux-3.0.8/drivers/ide/it821x.c linux-3.0.8/drivers/ide/it821x.c ---- linux-3.0.8/drivers/ide/it821x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/it821x.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/it821x.c linux-3.0.9/drivers/ide/it821x.c +--- linux-3.0.9/drivers/ide/it821x.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/it821x.c 2011-11-12 12:47:13.000000000 -0500 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_ .cable_detect = it821x_cable_detect, }; @@ -27920,9 +27920,9 @@ diff -urNp linux-3.0.8/drivers/ide/it821x.c linux-3.0.8/drivers/ide/it821x.c .name = DRV_NAME, .init_chipset = init_chipset_it821x, .init_hwif = init_hwif_it821x, -diff -urNp linux-3.0.8/drivers/ide/jmicron.c linux-3.0.8/drivers/ide/jmicron.c ---- linux-3.0.8/drivers/ide/jmicron.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/jmicron.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/jmicron.c linux-3.0.9/drivers/ide/jmicron.c +--- linux-3.0.9/drivers/ide/jmicron.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/jmicron.c 2011-11-12 12:47:13.000000000 -0500 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron .cable_detect = jmicron_cable_detect, }; @@ -27932,9 +27932,9 @@ diff -urNp linux-3.0.8/drivers/ide/jmicron.c linux-3.0.8/drivers/ide/jmicron.c .name = DRV_NAME, .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, .port_ops = &jmicron_port_ops, -diff -urNp linux-3.0.8/drivers/ide/ns87415.c linux-3.0.8/drivers/ide/ns87415.c ---- linux-3.0.8/drivers/ide/ns87415.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/ns87415.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/ns87415.c linux-3.0.9/drivers/ide/ns87415.c +--- linux-3.0.9/drivers/ide/ns87415.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/ns87415.c 2011-11-12 12:47:13.000000000 -0500 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_ .dma_sff_read_status = superio_dma_sff_read_status, }; @@ -27944,9 +27944,9 @@ diff -urNp linux-3.0.8/drivers/ide/ns87415.c linux-3.0.8/drivers/ide/ns87415.c .name = DRV_NAME, .init_hwif = init_hwif_ns87415, .tp_ops = &ns87415_tp_ops, -diff -urNp linux-3.0.8/drivers/ide/opti621.c linux-3.0.8/drivers/ide/opti621.c ---- linux-3.0.8/drivers/ide/opti621.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/opti621.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/opti621.c linux-3.0.9/drivers/ide/opti621.c +--- linux-3.0.9/drivers/ide/opti621.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/opti621.c 2011-11-12 12:47:13.000000000 -0500 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621 .set_pio_mode = opti621_set_pio_mode, }; @@ -27956,9 +27956,9 @@ diff -urNp linux-3.0.8/drivers/ide/opti621.c linux-3.0.8/drivers/ide/opti621.c .name = DRV_NAME, .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} }, .port_ops = &opti621_port_ops, -diff -urNp linux-3.0.8/drivers/ide/pdc202xx_new.c linux-3.0.8/drivers/ide/pdc202xx_new.c ---- linux-3.0.8/drivers/ide/pdc202xx_new.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/pdc202xx_new.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/pdc202xx_new.c linux-3.0.9/drivers/ide/pdc202xx_new.c +--- linux-3.0.9/drivers/ide/pdc202xx_new.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/pdc202xx_new.c 2011-11-12 12:47:13.000000000 -0500 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_ .udma_mask = udma, \ } @@ -27968,9 +27968,9 @@ diff -urNp linux-3.0.8/drivers/ide/pdc202xx_new.c linux-3.0.8/drivers/ide/pdc202 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5), /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6), }; -diff -urNp linux-3.0.8/drivers/ide/pdc202xx_old.c linux-3.0.8/drivers/ide/pdc202xx_old.c ---- linux-3.0.8/drivers/ide/pdc202xx_old.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/pdc202xx_old.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/pdc202xx_old.c linux-3.0.9/drivers/ide/pdc202xx_old.c +--- linux-3.0.9/drivers/ide/pdc202xx_old.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/pdc202xx_old.c 2011-11-12 12:47:13.000000000 -0500 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x .max_sectors = sectors, \ } @@ -27980,9 +27980,9 @@ diff -urNp linux-3.0.8/drivers/ide/pdc202xx_old.c linux-3.0.8/drivers/ide/pdc202 { /* 0: PDC20246 */ .name = DRV_NAME, .init_chipset = init_chipset_pdc202xx, -diff -urNp linux-3.0.8/drivers/ide/piix.c linux-3.0.8/drivers/ide/piix.c ---- linux-3.0.8/drivers/ide/piix.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/piix.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/piix.c linux-3.0.9/drivers/ide/piix.c +--- linux-3.0.9/drivers/ide/piix.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/piix.c 2011-11-12 12:47:13.000000000 -0500 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por .udma_mask = udma, \ } @@ -27992,9 +27992,9 @@ diff -urNp linux-3.0.8/drivers/ide/piix.c linux-3.0.8/drivers/ide/piix.c /* 0: MPIIX */ { /* * MPIIX actually has only a single IDE channel mapped to -diff -urNp linux-3.0.8/drivers/ide/rz1000.c linux-3.0.8/drivers/ide/rz1000.c ---- linux-3.0.8/drivers/ide/rz1000.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/rz1000.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/rz1000.c linux-3.0.9/drivers/ide/rz1000.c +--- linux-3.0.9/drivers/ide/rz1000.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/rz1000.c 2011-11-12 12:47:13.000000000 -0500 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read } } @@ -28004,9 +28004,9 @@ diff -urNp linux-3.0.8/drivers/ide/rz1000.c linux-3.0.8/drivers/ide/rz1000.c .name = DRV_NAME, .host_flags = IDE_HFLAG_NO_DMA, }; -diff -urNp linux-3.0.8/drivers/ide/sc1200.c linux-3.0.8/drivers/ide/sc1200.c ---- linux-3.0.8/drivers/ide/sc1200.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/sc1200.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/sc1200.c linux-3.0.9/drivers/ide/sc1200.c +--- linux-3.0.9/drivers/ide/sc1200.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/sc1200.c 2011-11-12 12:47:13.000000000 -0500 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -28016,9 +28016,9 @@ diff -urNp linux-3.0.8/drivers/ide/sc1200.c linux-3.0.8/drivers/ide/sc1200.c .name = DRV_NAME, .port_ops = &sc1200_port_ops, .dma_ops = &sc1200_dma_ops, -diff -urNp linux-3.0.8/drivers/ide/scc_pata.c linux-3.0.8/drivers/ide/scc_pata.c ---- linux-3.0.8/drivers/ide/scc_pata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/scc_pata.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/scc_pata.c linux-3.0.9/drivers/ide/scc_pata.c +--- linux-3.0.9/drivers/ide/scc_pata.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/scc_pata.c 2011-11-12 12:47:13.000000000 -0500 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ .dma_sff_read_status = scc_dma_sff_read_status, }; @@ -28028,9 +28028,9 @@ diff -urNp linux-3.0.8/drivers/ide/scc_pata.c linux-3.0.8/drivers/ide/scc_pata.c .name = "sccIDE", .init_iops = init_iops_scc, .init_dma = scc_init_dma, -diff -urNp linux-3.0.8/drivers/ide/serverworks.c linux-3.0.8/drivers/ide/serverworks.c ---- linux-3.0.8/drivers/ide/serverworks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/serverworks.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/serverworks.c linux-3.0.9/drivers/ide/serverworks.c +--- linux-3.0.9/drivers/ide/serverworks.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/serverworks.c 2011-11-12 12:47:13.000000000 -0500 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p .cable_detect = svwks_cable_detect, }; @@ -28040,9 +28040,9 @@ diff -urNp linux-3.0.8/drivers/ide/serverworks.c linux-3.0.8/drivers/ide/serverw { /* 0: OSB4 */ .name = DRV_NAME, .init_chipset = init_chipset_svwks, -diff -urNp linux-3.0.8/drivers/ide/setup-pci.c linux-3.0.8/drivers/ide/setup-pci.c ---- linux-3.0.8/drivers/ide/setup-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/setup-pci.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/setup-pci.c linux-3.0.9/drivers/ide/setup-pci.c +--- linux-3.0.9/drivers/ide/setup-pci.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/setup-pci.c 2011-11-12 12:47:13.000000000 -0500 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev int ret, i, n_ports = dev2 ? 4 : 2; struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL }; @@ -28052,9 +28052,9 @@ diff -urNp linux-3.0.8/drivers/ide/setup-pci.c linux-3.0.8/drivers/ide/setup-pci for (i = 0; i < n_ports / 2; i++) { ret = ide_setup_pci_controller(pdev[i], d, !i); if (ret < 0) -diff -urNp linux-3.0.8/drivers/ide/siimage.c linux-3.0.8/drivers/ide/siimage.c ---- linux-3.0.8/drivers/ide/siimage.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/siimage.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/siimage.c linux-3.0.9/drivers/ide/siimage.c +--- linux-3.0.9/drivers/ide/siimage.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/siimage.c 2011-11-12 12:47:13.000000000 -0500 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ .udma_mask = ATA_UDMA6, \ } @@ -28064,9 +28064,9 @@ diff -urNp linux-3.0.8/drivers/ide/siimage.c linux-3.0.8/drivers/ide/siimage.c /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops), /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops) }; -diff -urNp linux-3.0.8/drivers/ide/sis5513.c linux-3.0.8/drivers/ide/sis5513.c ---- linux-3.0.8/drivers/ide/sis5513.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/sis5513.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/sis5513.c linux-3.0.9/drivers/ide/sis5513.c +--- linux-3.0.9/drivers/ide/sis5513.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/sis5513.c 2011-11-12 12:47:13.000000000 -0500 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata .cable_detect = sis_cable_detect, }; @@ -28076,9 +28076,9 @@ diff -urNp linux-3.0.8/drivers/ide/sis5513.c linux-3.0.8/drivers/ide/sis5513.c .name = DRV_NAME, .init_chipset = init_chipset_sis5513, .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} }, -diff -urNp linux-3.0.8/drivers/ide/sl82c105.c linux-3.0.8/drivers/ide/sl82c105.c ---- linux-3.0.8/drivers/ide/sl82c105.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/sl82c105.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/sl82c105.c linux-3.0.9/drivers/ide/sl82c105.c +--- linux-3.0.9/drivers/ide/sl82c105.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/sl82c105.c 2011-11-12 12:47:13.000000000 -0500 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105 .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -28088,9 +28088,9 @@ diff -urNp linux-3.0.8/drivers/ide/sl82c105.c linux-3.0.8/drivers/ide/sl82c105.c .name = DRV_NAME, .init_chipset = init_chipset_sl82c105, .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}}, -diff -urNp linux-3.0.8/drivers/ide/slc90e66.c linux-3.0.8/drivers/ide/slc90e66.c ---- linux-3.0.8/drivers/ide/slc90e66.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/slc90e66.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/slc90e66.c linux-3.0.9/drivers/ide/slc90e66.c +--- linux-3.0.9/drivers/ide/slc90e66.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/slc90e66.c 2011-11-12 12:47:13.000000000 -0500 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6 .cable_detect = slc90e66_cable_detect, }; @@ -28100,9 +28100,9 @@ diff -urNp linux-3.0.8/drivers/ide/slc90e66.c linux-3.0.8/drivers/ide/slc90e66.c .name = DRV_NAME, .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, .port_ops = &slc90e66_port_ops, -diff -urNp linux-3.0.8/drivers/ide/tc86c001.c linux-3.0.8/drivers/ide/tc86c001.c ---- linux-3.0.8/drivers/ide/tc86c001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/tc86c001.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/tc86c001.c linux-3.0.9/drivers/ide/tc86c001.c +--- linux-3.0.9/drivers/ide/tc86c001.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/tc86c001.c 2011-11-12 12:47:13.000000000 -0500 @@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001 .dma_sff_read_status = ide_dma_sff_read_status, }; @@ -28112,9 +28112,9 @@ diff -urNp linux-3.0.8/drivers/ide/tc86c001.c linux-3.0.8/drivers/ide/tc86c001.c .name = DRV_NAME, .init_hwif = init_hwif_tc86c001, .port_ops = &tc86c001_port_ops, -diff -urNp linux-3.0.8/drivers/ide/triflex.c linux-3.0.8/drivers/ide/triflex.c ---- linux-3.0.8/drivers/ide/triflex.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/triflex.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/triflex.c linux-3.0.9/drivers/ide/triflex.c +--- linux-3.0.9/drivers/ide/triflex.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/triflex.c 2011-11-12 12:47:13.000000000 -0500 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex .set_dma_mode = triflex_set_mode, }; @@ -28124,9 +28124,9 @@ diff -urNp linux-3.0.8/drivers/ide/triflex.c linux-3.0.8/drivers/ide/triflex.c .name = DRV_NAME, .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}}, .port_ops = &triflex_port_ops, -diff -urNp linux-3.0.8/drivers/ide/trm290.c linux-3.0.8/drivers/ide/trm290.c ---- linux-3.0.8/drivers/ide/trm290.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/trm290.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/trm290.c linux-3.0.9/drivers/ide/trm290.c +--- linux-3.0.9/drivers/ide/trm290.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/trm290.c 2011-11-12 12:47:13.000000000 -0500 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops .dma_check = trm290_dma_check, }; @@ -28136,9 +28136,9 @@ diff -urNp linux-3.0.8/drivers/ide/trm290.c linux-3.0.8/drivers/ide/trm290.c .name = DRV_NAME, .init_hwif = init_hwif_trm290, .tp_ops = &trm290_tp_ops, -diff -urNp linux-3.0.8/drivers/ide/via82cxxx.c linux-3.0.8/drivers/ide/via82cxxx.c ---- linux-3.0.8/drivers/ide/via82cxxx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/ide/via82cxxx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/ide/via82cxxx.c linux-3.0.9/drivers/ide/via82cxxx.c +--- linux-3.0.9/drivers/ide/via82cxxx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/ide/via82cxxx.c 2011-11-12 12:47:13.000000000 -0500 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_por .cable_detect = via82cxxx_cable_detect, }; @@ -28148,9 +28148,9 @@ diff -urNp linux-3.0.8/drivers/ide/via82cxxx.c linux-3.0.8/drivers/ide/via82cxxx .name = DRV_NAME, .init_chipset = init_chipset_via82cxxx, .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } }, -diff -urNp linux-3.0.8/drivers/infiniband/core/cm.c linux-3.0.8/drivers/infiniband/core/cm.c ---- linux-3.0.8/drivers/infiniband/core/cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/core/cm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/core/cm.c linux-3.0.9/drivers/infiniband/core/cm.c +--- linux-3.0.9/drivers/infiniband/core/cm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/core/cm.c 2011-11-12 12:47:13.000000000 -0500 @@ -113,7 +113,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -28290,9 +28290,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/core/cm.c linux-3.0.8/drivers/infiniba } static const struct sysfs_ops cm_counter_ops = { -diff -urNp linux-3.0.8/drivers/infiniband/core/fmr_pool.c linux-3.0.8/drivers/infiniband/core/fmr_pool.c ---- linux-3.0.8/drivers/infiniband/core/fmr_pool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/core/fmr_pool.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/core/fmr_pool.c linux-3.0.9/drivers/infiniband/core/fmr_pool.c +--- linux-3.0.9/drivers/infiniband/core/fmr_pool.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/core/fmr_pool.c 2011-11-12 12:47:13.000000000 -0500 @@ -97,8 +97,8 @@ struct ib_fmr_pool { struct task_struct *thread; @@ -28360,9 +28360,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/core/fmr_pool.c linux-3.0.8/drivers/in wake_up_process(pool->thread); } } -diff -urNp linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c ---- linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c +--- linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/cxgb4/mem.c 2011-11-12 12:47:13.000000000 -0500 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r int err; struct fw_ri_tpte tpt; @@ -28381,9 +28381,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.8/drivers/inf } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", __func__, stag_state, type, pdid, stag_idx); -diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c ---- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c +--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_fs.c 2011-11-12 12:47:13.000000000 -0500 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru struct infinipath_counters counters; struct ipath_devdata *dd; @@ -28393,9 +28393,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.8/driver dd = file->f_path.dentry->d_inode->i_private; dd->ipath_f_read_counters(dd, &counters); -diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c ---- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c +--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_rc.c 2011-11-12 12:47:13.000000000 -0500 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de struct ib_atomic_eth *ateth; struct ipath_ack_entry *e; @@ -28419,9 +28419,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.8/driver (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, be64_to_cpu(ateth->compare_data), sdata); -diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c ---- linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c +--- linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/ipath/ipath_ruc.c 2011-11-12 12:47:13.000000000 -0500 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip unsigned long flags; struct ib_wc wc; @@ -28445,9 +28445,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.8/drive (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr, sdata, wqe->wr.wr.atomic.swap); goto send_comp; -diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.c linux-3.0.8/drivers/infiniband/hw/nes/nes.c ---- linux-3.0.8/drivers/infiniband/hw/nes/nes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/nes/nes.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.c linux-3.0.9/drivers/infiniband/hw/nes/nes.c +--- linux-3.0.9/drivers/infiniband/hw/nes/nes.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/nes/nes.c 2011-11-12 12:47:13.000000000 -0500 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi LIST_HEAD(nes_adapter_list); static LIST_HEAD(nes_dev_list); @@ -28466,9 +28466,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.c linux-3.0.8/drivers/infin /* Free the control structures */ -diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c ---- linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c +--- linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_cm.c 2011-11-12 12:47:13.000000000 -0500 @@ -68,14 +68,14 @@ u32 cm_packets_dropped; u32 cm_packets_retrans; u32 cm_packets_created; @@ -28665,9 +28665,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.8/drivers/in nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.h linux-3.0.8/drivers/infiniband/hw/nes/nes.h ---- linux-3.0.8/drivers/infiniband/hw/nes/nes.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/nes/nes.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes.h linux-3.0.9/drivers/infiniband/hw/nes/nes.h +--- linux-3.0.9/drivers/infiniband/hw/nes/nes.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/nes/nes.h 2011-11-12 12:47:13.000000000 -0500 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level; extern unsigned int wqm_quanta; extern struct list_head nes_adapter_list; @@ -28719,9 +28719,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes.h linux-3.0.8/drivers/infin extern u32 int_mod_timer_init; extern u32 int_mod_cq_depth_256; -diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c ---- linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c +--- linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_nic.c 2011-11-12 12:47:13.000000000 -0500 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats target_stat_values[++index] = mh_detected; target_stat_values[++index] = mh_pauses_sent; @@ -28772,9 +28772,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.8/drivers/i target_stat_values[++index] = nesadapter->free_4kpbl; target_stat_values[++index] = nesadapter->free_256pbl; target_stat_values[++index] = int_mod_timer_init; -diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c ---- linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c +--- linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/nes/nes_verbs.c 2011-11-12 12:47:13.000000000 -0500 @@ -46,9 +46,9 @@ #include <rdma/ib_umem.h> @@ -28806,9 +28806,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.8/drivers nesqp->destroyed = 1; /* Blow away the connection if it exists. */ -diff -urNp linux-3.0.8/drivers/infiniband/hw/qib/qib.h linux-3.0.8/drivers/infiniband/hw/qib/qib.h ---- linux-3.0.8/drivers/infiniband/hw/qib/qib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/infiniband/hw/qib/qib.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/infiniband/hw/qib/qib.h linux-3.0.9/drivers/infiniband/hw/qib/qib.h +--- linux-3.0.9/drivers/infiniband/hw/qib/qib.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/infiniband/hw/qib/qib.h 2011-11-12 12:47:13.000000000 -0500 @@ -51,6 +51,7 @@ #include <linux/completion.h> #include <linux/kref.h> @@ -28817,9 +28817,9 @@ diff -urNp linux-3.0.8/drivers/infiniband/hw/qib/qib.h linux-3.0.8/drivers/infin #include "qib_common.h" #include "qib_verbs.h" -diff -urNp linux-3.0.8/drivers/input/gameport/gameport.c linux-3.0.8/drivers/input/gameport/gameport.c ---- linux-3.0.8/drivers/input/gameport/gameport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/gameport/gameport.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/gameport/gameport.c linux-3.0.9/drivers/input/gameport/gameport.c +--- linux-3.0.9/drivers/input/gameport/gameport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/gameport/gameport.c 2011-11-12 12:47:13.000000000 -0500 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys); */ static void gameport_init_port(struct gameport *gameport) @@ -28837,9 +28837,9 @@ diff -urNp linux-3.0.8/drivers/input/gameport/gameport.c linux-3.0.8/drivers/inp gameport->dev.bus = &gameport_bus; gameport->dev.release = gameport_release_port; if (gameport->parent) -diff -urNp linux-3.0.8/drivers/input/input.c linux-3.0.8/drivers/input/input.c ---- linux-3.0.8/drivers/input/input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/input.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/input.c linux-3.0.9/drivers/input/input.c +--- linux-3.0.9/drivers/input/input.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/input.c 2011-11-12 12:47:13.000000000 -0500 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc */ int input_register_device(struct input_dev *dev) @@ -28858,9 +28858,9 @@ diff -urNp linux-3.0.8/drivers/input/input.c linux-3.0.8/drivers/input/input.c error = device_add(&dev->dev); if (error) -diff -urNp linux-3.0.8/drivers/input/joystick/sidewinder.c linux-3.0.8/drivers/input/joystick/sidewinder.c ---- linux-3.0.8/drivers/input/joystick/sidewinder.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/joystick/sidewinder.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/joystick/sidewinder.c linux-3.0.9/drivers/input/joystick/sidewinder.c +--- linux-3.0.9/drivers/input/joystick/sidewinder.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/joystick/sidewinder.c 2011-11-12 12:47:13.000000000 -0500 @@ -30,6 +30,7 @@ #include <linux/kernel.h> #include <linux/module.h> @@ -28878,9 +28878,9 @@ diff -urNp linux-3.0.8/drivers/input/joystick/sidewinder.c linux-3.0.8/drivers/i i = sw_read_packet(sw->gameport, buf, sw->length, 0); if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */ -diff -urNp linux-3.0.8/drivers/input/joystick/xpad.c linux-3.0.8/drivers/input/joystick/xpad.c ---- linux-3.0.8/drivers/input/joystick/xpad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/joystick/xpad.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/joystick/xpad.c linux-3.0.9/drivers/input/joystick/xpad.c +--- linux-3.0.9/drivers/input/joystick/xpad.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/joystick/xpad.c 2011-11-12 12:47:13.000000000 -0500 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas static int xpad_led_probe(struct usb_xpad *xpad) @@ -28899,9 +28899,9 @@ diff -urNp linux-3.0.8/drivers/input/joystick/xpad.c linux-3.0.8/drivers/input/j snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); led->xpad = xpad; -diff -urNp linux-3.0.8/drivers/input/mousedev.c linux-3.0.8/drivers/input/mousedev.c ---- linux-3.0.8/drivers/input/mousedev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/mousedev.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/mousedev.c linux-3.0.9/drivers/input/mousedev.c +--- linux-3.0.9/drivers/input/mousedev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/mousedev.c 2011-11-12 12:47:13.000000000 -0500 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file spin_unlock_irq(&client->packet_lock); @@ -28911,9 +28911,9 @@ diff -urNp linux-3.0.8/drivers/input/mousedev.c linux-3.0.8/drivers/input/moused return -EFAULT; return count; -diff -urNp linux-3.0.8/drivers/input/serio/serio.c linux-3.0.8/drivers/input/serio/serio.c ---- linux-3.0.8/drivers/input/serio/serio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/input/serio/serio.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/input/serio/serio.c linux-3.0.9/drivers/input/serio/serio.c +--- linux-3.0.9/drivers/input/serio/serio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/input/serio/serio.c 2011-11-12 12:47:13.000000000 -0500 @@ -497,7 +497,7 @@ static void serio_release_port(struct de */ static void serio_init_port(struct serio *serio) @@ -28932,9 +28932,9 @@ diff -urNp linux-3.0.8/drivers/input/serio/serio.c linux-3.0.8/drivers/input/ser serio->dev.bus = &serio_bus; serio->dev.release = serio_release_port; serio->dev.groups = serio_device_attr_groups; -diff -urNp linux-3.0.8/drivers/isdn/capi/capi.c linux-3.0.8/drivers/isdn/capi/capi.c ---- linux-3.0.8/drivers/isdn/capi/capi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/capi/capi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/capi/capi.c linux-3.0.9/drivers/isdn/capi/capi.c +--- linux-3.0.9/drivers/isdn/capi/capi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/capi/capi.c 2011-11-12 12:47:13.000000000 -0500 @@ -83,8 +83,8 @@ struct capiminor { struct capi20_appl *ap; @@ -28972,9 +28972,9 @@ diff -urNp linux-3.0.8/drivers/isdn/capi/capi.c linux-3.0.8/drivers/isdn/capi/ca capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */ capimsg_setu16(skb->data, 16, len); /* Data length */ -diff -urNp linux-3.0.8/drivers/isdn/gigaset/common.c linux-3.0.8/drivers/isdn/gigaset/common.c ---- linux-3.0.8/drivers/isdn/gigaset/common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/gigaset/common.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/gigaset/common.c linux-3.0.9/drivers/isdn/gigaset/common.c +--- linux-3.0.9/drivers/isdn/gigaset/common.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/gigaset/common.c 2011-11-12 12:47:13.000000000 -0500 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -28984,9 +28984,9 @@ diff -urNp linux-3.0.8/drivers/isdn/gigaset/common.c linux-3.0.8/drivers/isdn/gi cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-3.0.8/drivers/isdn/gigaset/gigaset.h linux-3.0.8/drivers/isdn/gigaset/gigaset.h ---- linux-3.0.8/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/gigaset/gigaset.h linux-3.0.9/drivers/isdn/gigaset/gigaset.h +--- linux-3.0.9/drivers/isdn/gigaset/gigaset.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/gigaset/gigaset.h 2011-11-12 12:47:13.000000000 -0500 @@ -35,6 +35,7 @@ #include <linux/tty_driver.h> #include <linux/list.h> @@ -29004,9 +29004,9 @@ diff -urNp linux-3.0.8/drivers/isdn/gigaset/gigaset.h linux-3.0.8/drivers/isdn/g struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-3.0.8/drivers/isdn/gigaset/interface.c linux-3.0.8/drivers/isdn/gigaset/interface.c ---- linux-3.0.8/drivers/isdn/gigaset/interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/gigaset/interface.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/gigaset/interface.c linux-3.0.9/drivers/isdn/gigaset/interface.c +--- linux-3.0.9/drivers/isdn/gigaset/interface.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/gigaset/interface.c 2011-11-12 12:47:13.000000000 -0500 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt } tty->driver_data = cs; @@ -29094,9 +29094,9 @@ diff -urNp linux-3.0.8/drivers/isdn/gigaset/interface.c linux-3.0.8/drivers/isdn dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-3.0.8/drivers/isdn/hardware/avm/b1.c linux-3.0.8/drivers/isdn/hardware/avm/b1.c ---- linux-3.0.8/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/avm/b1.c linux-3.0.9/drivers/isdn/hardware/avm/b1.c +--- linux-3.0.9/drivers/isdn/hardware/avm/b1.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/avm/b1.c 2011-11-12 12:47:13.000000000 -0500 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo } if (left) { @@ -29115,9 +29115,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/avm/b1.c linux-3.0.8/drivers/isdn/h return -EFAULT; } else { memcpy(buf, dp, left); -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/capidtmf.c 2011-11-12 12:47:13.000000000 -0500 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; @@ -29126,9 +29126,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.8/driver if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/capifunc.c 2011-11-12 12:47:13.000000000 -0500 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29138,9 +29138,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.8/driver DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/diddfunc.c 2011-11-12 12:47:13.000000000 -0500 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29150,9 +29150,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.8/driver DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/divasfunc.c 2011-11-12 12:47:13.000000000 -0500 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29162,9 +29162,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.8/drive DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h ---- linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h +--- linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/divasync.h 2011-11-12 12:47:13.000000000 -0500 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter { } diva_didd_add_adapter_t; typedef struct _diva_didd_remove_adapter { @@ -29174,9 +29174,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/divasync.h linux-3.0.8/driver typedef struct _diva_didd_read_adapter_array { void * buffer; dword length; -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/idifunc.c 2011-11-12 12:47:13.000000000 -0500 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29186,9 +29186,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.8/drivers DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/message.c linux-3.0.8/drivers/isdn/hardware/eicon/message.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/message.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/message.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/message.c linux-3.0.9/drivers/isdn/hardware/eicon/message.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/message.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/message.c 2011-11-12 12:47:13.000000000 -0500 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci) dword d; word w; @@ -29225,9 +29225,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/message.c linux-3.0.8/drivers set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */ if(!a->group_optimization_enabled) -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c ---- linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c +--- linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/mntfunc.c 2011-11-12 12:47:13.000000000 -0500 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di IDI_SYNC_REQ req; DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; @@ -29237,9 +29237,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.8/drivers DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { -diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h ---- linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h +--- linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-11-12 12:47:13.000000000 -0500 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t { typedef struct _diva_os_idi_adapter_interface { diva_init_card_proc_t cleanup_adapter_proc; @@ -29249,9 +29249,9 @@ diff -urNp linux-3.0.8/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.8/dri typedef struct _diva_os_xdi_adapter { struct list_head link; -diff -urNp linux-3.0.8/drivers/isdn/i4l/isdn_common.c linux-3.0.8/drivers/isdn/i4l/isdn_common.c ---- linux-3.0.8/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/i4l/isdn_common.c linux-3.0.9/drivers/isdn/i4l/isdn_common.c +--- linux-3.0.9/drivers/isdn/i4l/isdn_common.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/i4l/isdn_common.c 2011-11-12 12:47:13.000000000 -0500 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, } iocpar; void __user *argp = (void __user *)arg; @@ -29261,9 +29261,9 @@ diff -urNp linux-3.0.8/drivers/isdn/i4l/isdn_common.c linux-3.0.8/drivers/isdn/i #define name iocpar.name #define bname iocpar.bname #define iocts iocpar.iocts -diff -urNp linux-3.0.8/drivers/isdn/icn/icn.c linux-3.0.8/drivers/isdn/icn/icn.c ---- linux-3.0.8/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/isdn/icn/icn.c linux-3.0.9/drivers/isdn/icn/icn.c +--- linux-3.0.9/drivers/isdn/icn/icn.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/isdn/icn/icn.c 2011-11-12 12:47:13.000000000 -0500 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len if (count > len) count = len; @@ -29273,9 +29273,9 @@ diff -urNp linux-3.0.8/drivers/isdn/icn/icn.c linux-3.0.8/drivers/isdn/icn/icn.c return -EFAULT; } else memcpy(msg, buf, count); -diff -urNp linux-3.0.8/drivers/lguest/core.c linux-3.0.8/drivers/lguest/core.c ---- linux-3.0.8/drivers/lguest/core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/lguest/core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/lguest/core.c linux-3.0.9/drivers/lguest/core.c +--- linux-3.0.9/drivers/lguest/core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/lguest/core.c 2011-11-12 12:47:13.000000000 -0500 @@ -92,9 +92,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. @@ -29303,9 +29303,9 @@ diff -urNp linux-3.0.8/drivers/lguest/core.c linux-3.0.8/drivers/lguest/core.c end_switcher_text - start_switcher_text); printk(KERN_INFO "lguest: mapped switcher at %p\n", -diff -urNp linux-3.0.8/drivers/lguest/x86/core.c linux-3.0.8/drivers/lguest/x86/core.c ---- linux-3.0.8/drivers/lguest/x86/core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/lguest/x86/core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/lguest/x86/core.c linux-3.0.9/drivers/lguest/x86/core.c +--- linux-3.0.9/drivers/lguest/x86/core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/lguest/x86/core.c 2011-11-12 12:47:13.000000000 -0500 @@ -59,7 +59,7 @@ static struct { /* Offset from where switcher.S was compiled to where we've copied it */ static unsigned long switcher_offset(void) @@ -29347,9 +29347,9 @@ diff -urNp linux-3.0.8/drivers/lguest/x86/core.c linux-3.0.8/drivers/lguest/x86/ lguest_entry.segment = LGUEST_CS; /* -diff -urNp linux-3.0.8/drivers/lguest/x86/switcher_32.S linux-3.0.8/drivers/lguest/x86/switcher_32.S ---- linux-3.0.8/drivers/lguest/x86/switcher_32.S 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/lguest/x86/switcher_32.S 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/lguest/x86/switcher_32.S linux-3.0.9/drivers/lguest/x86/switcher_32.S +--- linux-3.0.9/drivers/lguest/x86/switcher_32.S 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/lguest/x86/switcher_32.S 2011-11-12 12:47:13.000000000 -0500 @@ -87,6 +87,7 @@ #include <asm/page.h> #include <asm/segment.h> @@ -29408,9 +29408,9 @@ diff -urNp linux-3.0.8/drivers/lguest/x86/switcher_32.S linux-3.0.8/drivers/lgue // Every interrupt can come to us here // But we must truly tell each apart. -diff -urNp linux-3.0.8/drivers/macintosh/macio_asic.c linux-3.0.8/drivers/macintosh/macio_asic.c ---- linux-3.0.8/drivers/macintosh/macio_asic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/macintosh/macio_asic.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/macintosh/macio_asic.c linux-3.0.9/drivers/macintosh/macio_asic.c +--- linux-3.0.9/drivers/macintosh/macio_asic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/macintosh/macio_asic.c 2011-11-12 12:47:13.000000000 -0500 @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s * MacIO is matched against any Apple ID, it's probe() function * will then decide wether it applies or not @@ -29420,9 +29420,9 @@ diff -urNp linux-3.0.8/drivers/macintosh/macio_asic.c linux-3.0.8/drivers/macint .vendor = PCI_VENDOR_ID_APPLE, .device = PCI_ANY_ID, .subvendor = PCI_ANY_ID, -diff -urNp linux-3.0.8/drivers/md/dm.c linux-3.0.8/drivers/md/dm.c ---- linux-3.0.8/drivers/md/dm.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/md/dm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/dm.c linux-3.0.9/drivers/md/dm.c +--- linux-3.0.9/drivers/md/dm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/dm.c 2011-11-12 12:47:13.000000000 -0500 @@ -164,9 +164,9 @@ struct mapped_device { /* * Event handling. @@ -29477,9 +29477,9 @@ diff -urNp linux-3.0.8/drivers/md/dm.c linux-3.0.8/drivers/md/dm.c } void dm_uevent_add(struct mapped_device *md, struct list_head *elist) -diff -urNp linux-3.0.8/drivers/md/dm-ioctl.c linux-3.0.8/drivers/md/dm-ioctl.c ---- linux-3.0.8/drivers/md/dm-ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/md/dm-ioctl.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/dm-ioctl.c linux-3.0.9/drivers/md/dm-ioctl.c +--- linux-3.0.9/drivers/md/dm-ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/dm-ioctl.c 2011-11-12 12:47:13.000000000 -0500 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -29489,9 +29489,9 @@ diff -urNp linux-3.0.8/drivers/md/dm-ioctl.c linux-3.0.8/drivers/md/dm-ioctl.c if (!*param->name) { DMWARN("name not supplied when creating device"); return -EINVAL; -diff -urNp linux-3.0.8/drivers/md/dm-raid1.c linux-3.0.8/drivers/md/dm-raid1.c ---- linux-3.0.8/drivers/md/dm-raid1.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/md/dm-raid1.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/dm-raid1.c linux-3.0.9/drivers/md/dm-raid1.c +--- linux-3.0.9/drivers/md/dm-raid1.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/dm-raid1.c 2011-11-12 12:47:13.000000000 -0500 @@ -40,7 +40,7 @@ enum dm_raid1_error { struct mirror { @@ -29564,9 +29564,9 @@ diff -urNp linux-3.0.8/drivers/md/dm-raid1.c linux-3.0.8/drivers/md/dm-raid1.c return 'A'; return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : -diff -urNp linux-3.0.8/drivers/md/dm-stripe.c linux-3.0.8/drivers/md/dm-stripe.c ---- linux-3.0.8/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/dm-stripe.c linux-3.0.9/drivers/md/dm-stripe.c +--- linux-3.0.9/drivers/md/dm-stripe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/dm-stripe.c 2011-11-12 12:47:13.000000000 -0500 @@ -20,7 +20,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -29605,9 +29605,9 @@ diff -urNp linux-3.0.8/drivers/md/dm-stripe.c linux-3.0.8/drivers/md/dm-stripe.c DM_IO_ERROR_THRESHOLD) schedule_work(&sc->trigger_event); } -diff -urNp linux-3.0.8/drivers/md/dm-table.c linux-3.0.8/drivers/md/dm-table.c ---- linux-3.0.8/drivers/md/dm-table.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/dm-table.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/dm-table.c linux-3.0.9/drivers/md/dm-table.c +--- linux-3.0.9/drivers/md/dm-table.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/dm-table.c 2011-11-12 12:47:13.000000000 -0500 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -29617,9 +29617,9 @@ diff -urNp linux-3.0.8/drivers/md/dm-table.c linux-3.0.8/drivers/md/dm-table.c DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-3.0.8/drivers/md/md.c linux-3.0.8/drivers/md/md.c ---- linux-3.0.8/drivers/md/md.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/md.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/md.c linux-3.0.9/drivers/md/md.c +--- linux-3.0.9/drivers/md/md.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/md.c 2011-11-12 12:47:13.000000000 -0500 @@ -231,10 +231,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev); * start build, activate spare */ @@ -29734,9 +29734,9 @@ diff -urNp linux-3.0.8/drivers/md/md.c linux-3.0.8/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-3.0.8/drivers/md/md.h linux-3.0.8/drivers/md/md.h ---- linux-3.0.8/drivers/md/md.h 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/md.h 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/md.h linux-3.0.9/drivers/md/md.h +--- linux-3.0.9/drivers/md/md.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/md.h 2011-11-12 12:47:13.000000000 -0500 @@ -97,13 +97,13 @@ struct mdk_rdev_s * only maintained for arrays that * support hot removal @@ -29762,9 +29762,9 @@ diff -urNp linux-3.0.8/drivers/md/md.h linux-3.0.8/drivers/md/md.h } struct mdk_personality -diff -urNp linux-3.0.8/drivers/md/raid10.c linux-3.0.8/drivers/md/raid10.c ---- linux-3.0.8/drivers/md/raid10.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/raid10.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/raid10.c linux-3.0.9/drivers/md/raid10.c +--- linux-3.0.9/drivers/md/raid10.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/raid10.c 2011-11-12 12:47:13.000000000 -0500 @@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi if (test_bit(BIO_UPTODATE, &bio->bi_flags)) set_bit(R10BIO_Uptodate, &r10_bio->state); @@ -29824,9 +29824,9 @@ diff -urNp linux-3.0.8/drivers/md/raid10.c linux-3.0.8/drivers/md/raid10.c if (sync_page_io(rdev, r10_bio->devs[sl].addr + sect, -diff -urNp linux-3.0.8/drivers/md/raid1.c linux-3.0.8/drivers/md/raid1.c ---- linux-3.0.8/drivers/md/raid1.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/raid1.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/raid1.c linux-3.0.9/drivers/md/raid1.c +--- linux-3.0.9/drivers/md/raid1.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/raid1.c 2011-11-12 12:47:13.000000000 -0500 @@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t * rdev_dec_pending(rdev, mddev); md_error(mddev, rdev); @@ -29845,9 +29845,9 @@ diff -urNp linux-3.0.8/drivers/md/raid1.c linux-3.0.8/drivers/md/raid1.c printk(KERN_INFO "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", -diff -urNp linux-3.0.8/drivers/md/raid5.c linux-3.0.8/drivers/md/raid5.c ---- linux-3.0.8/drivers/md/raid5.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/md/raid5.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/md/raid5.c linux-3.0.9/drivers/md/raid5.c +--- linux-3.0.9/drivers/md/raid5.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/md/raid5.c 2011-11-12 12:47:13.000000000 -0500 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea bi->bi_next = NULL; if ((rw & WRITE) && @@ -29893,9 +29893,9 @@ diff -urNp linux-3.0.8/drivers/md/raid5.c linux-3.0.8/drivers/md/raid5.c chunk_offset = sector_div(new_sector, sectors_per_chunk); stripe = new_sector; -diff -urNp linux-3.0.8/drivers/media/common/saa7146_hlp.c linux-3.0.8/drivers/media/common/saa7146_hlp.c ---- linux-3.0.8/drivers/media/common/saa7146_hlp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/common/saa7146_hlp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/common/saa7146_hlp.c linux-3.0.9/drivers/media/common/saa7146_hlp.c +--- linux-3.0.9/drivers/media/common/saa7146_hlp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/common/saa7146_hlp.c 2011-11-12 12:47:13.000000000 -0500 @@ -353,6 +353,8 @@ static void calculate_clipping_registers int x[32], y[32], w[32], h[32]; @@ -29905,9 +29905,9 @@ diff -urNp linux-3.0.8/drivers/media/common/saa7146_hlp.c linux-3.0.8/drivers/me /* clear out memory */ memset(&line_list[0], 0x00, sizeof(u32)*32); memset(&pixel_list[0], 0x00, sizeof(u32)*32); -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c ---- linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +--- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-11-12 12:47:13.000000000 -0500 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru u8 buf[HOST_LINK_BUF_SIZE]; int i; @@ -29926,9 +29926,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.8/d dprintk("%s\n", __func__); /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */ -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h ---- linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h +--- linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvb_demux.h 2011-11-12 12:47:13.000000000 -0500 @@ -68,12 +68,12 @@ struct dvb_demux_feed { union { struct dmx_ts_feed ts; @@ -29944,9 +29944,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.8/driver struct dvb_demux *demux; void *priv; -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-24 18:24:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-core/dvbdev.c 2011-11-12 12:47:13.000000000 -0500 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -29956,9 +29956,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.8/drivers/m struct device *clsdev; int minor; int id; -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c ---- linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-24 18:26:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c +--- linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-usb/cxusb.c 2011-11-12 12:47:13.000000000 -0500 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di struct dib0700_adapter_state { int (*set_param_save) (struct dvb_frontend *, @@ -29968,10 +29968,10 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.8/drivers/med static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c ---- linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-08-23 21:48:14.000000000 -0400 -@@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c +--- linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-11-12 12:47:13.000000000 -0500 +@@ -478,6 +478,8 @@ int dib0700_download_firmware(struct usb if (!buf) return -ENOMEM; @@ -29980,9 +29980,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.8/driv while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", hx.addr, hx.len, hx.chk); -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h ---- linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h 2011-08-24 18:27:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h +--- linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dibusb.h 2011-11-12 12:47:13.000000000 -0500 @@ -97,7 +97,7 @@ #define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02 @@ -29992,9 +29992,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.8/drivers/me int mt2060_present; u8 tuner_addr; }; -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c ---- linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c 2011-08-24 18:27:45.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c +--- linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-usb/dw2102.c 2011-11-12 12:47:13.000000000 -0500 @@ -95,7 +95,7 @@ struct su3000_state { struct s6x0_state { @@ -30004,9 +30004,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.8/drivers/me /* debug */ static int dvb_usb_dw2102_debug; -diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c ---- linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c +--- linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/dvb-usb/lmedm04.c 2011-11-12 12:47:13.000000000 -0500 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000); @@ -30024,9 +30024,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.8/drivers/m data[0] = 0x0a; len_in = 1; info("FRM Firmware Cold Reset"); -diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000.h linux-3.0.8/drivers/media/dvb/frontends/dib3000.h ---- linux-3.0.8/drivers/media/dvb/frontends/dib3000.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/frontends/dib3000.h 2011-10-07 19:07:39.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000.h linux-3.0.9/drivers/media/dvb/frontends/dib3000.h +--- linux-3.0.9/drivers/media/dvb/frontends/dib3000.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/frontends/dib3000.h 2011-11-12 12:47:13.000000000 -0500 @@ -40,10 +40,11 @@ struct dib_fe_xfer_ops int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff); int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl); @@ -30040,9 +30040,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000.h linux-3.0.8/drivers #else static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config, struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops) -diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c ---- linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c 2011-08-24 18:28:42.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c +--- linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/frontends/dib3000mb.c 2011-11-12 12:47:13.000000000 -0500 @@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str static struct dvb_frontend_ops dib3000mb_ops; @@ -30052,9 +30052,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.8/drive { struct dib3000_state* state = NULL; -diff -urNp linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c ---- linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c +--- linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/frontends/mb86a16.c 2011-11-12 12:47:13.000000000 -0500 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16 int ret = -1; int sync; @@ -30064,9 +30064,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/frontends/mb86a16.c linux-3.0.8/drivers dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate); fcp = 3000; -diff -urNp linux-3.0.8/drivers/media/dvb/frontends/or51211.c linux-3.0.8/drivers/media/dvb/frontends/or51211.c ---- linux-3.0.8/drivers/media/dvb/frontends/or51211.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/frontends/or51211.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/frontends/or51211.c linux-3.0.9/drivers/media/dvb/frontends/or51211.c +--- linux-3.0.9/drivers/media/dvb/frontends/or51211.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/frontends/or51211.c 2011-11-12 12:47:13.000000000 -0500 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct u8 tudata[585]; int i; @@ -30076,9 +30076,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/frontends/or51211.c linux-3.0.8/drivers dprintk("Firmware is %zd bytes\n",fw->size); /* Get eprom data */ -diff -urNp linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c ---- linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c +--- linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/dvb/ngene/ngene-cards.c 2011-11-12 12:47:13.000000000 -0500 @@ -379,7 +379,7 @@ static struct ngene_info ngene_info_m780 /****************************************************************************/ @@ -30088,9 +30088,9 @@ diff -urNp linux-3.0.8/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.8/drivers NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2), NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2), NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2), -diff -urNp linux-3.0.8/drivers/media/video/cx18/cx18-driver.c linux-3.0.8/drivers/media/video/cx18/cx18-driver.c ---- linux-3.0.8/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/cx18/cx18-driver.c linux-3.0.9/drivers/media/video/cx18/cx18-driver.c +--- linux-3.0.9/drivers/media/video/cx18/cx18-driver.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/cx18/cx18-driver.c 2011-11-12 12:47:13.000000000 -0500 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s struct i2c_client c; u8 eedata[256]; @@ -30100,9 +30100,9 @@ diff -urNp linux-3.0.8/drivers/media/video/cx18/cx18-driver.c linux-3.0.8/driver memset(&c, 0, sizeof(c)); strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); c.adapter = &cx->i2c_adap[0]; -diff -urNp linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c ---- linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c +--- linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/cx23885/cx23885-input.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur bool handle = false; struct ir_raw_event ir_core_event[64]; @@ -30112,9 +30112,9 @@ diff -urNp linux-3.0.8/drivers/media/video/cx23885/cx23885-input.c linux-3.0.8/d do { num = 0; v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event, -diff -urNp linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c ---- linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c +--- linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/cx88/cx88-alsa.c 2011-11-12 12:47:13.000000000 -0500 @@ -764,7 +764,7 @@ static struct snd_kcontrol_new snd_cx88_ * Only boards with eeprom and byte 1 at eeprom=1 have it */ @@ -30124,9 +30124,9 @@ diff -urNp linux-3.0.8/drivers/media/video/cx88/cx88-alsa.c linux-3.0.8/drivers/ {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0}, {0, } -diff -urNp linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c ---- linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +--- linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-11-12 12:47:13.000000000 -0500 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw u8 *eeprom; struct tveeprom tvdata; @@ -30136,9 +30136,9 @@ diff -urNp linux-3.0.8/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.8/ memset(&tvdata,0,sizeof(tvdata)); eeprom = pvr2_eeprom_fetch(hdw); -diff -urNp linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c ---- linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c +--- linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/saa7134/saa6752hs.c 2011-11-12 12:47:13.000000000 -0500 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su unsigned char localPAT[256]; unsigned char localPMT[256]; @@ -30148,9 +30148,9 @@ diff -urNp linux-3.0.8/drivers/media/video/saa7134/saa6752hs.c linux-3.0.8/drive /* Set video format - must be done first as it resets other settings */ set_reg8(client, 0x41, h->video_format); -diff -urNp linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c ---- linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c +--- linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/saa7164/saa7164-cmd.c 2011-11-12 12:47:13.000000000 -0500 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d u8 tmp[512]; dprintk(DBGLVL_CMD, "%s()\n", __func__); @@ -30169,9 +30169,9 @@ diff -urNp linux-3.0.8/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.8/dri while (loop) { struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 }; -diff -urNp linux-3.0.8/drivers/media/video/timblogiw.c linux-3.0.8/drivers/media/video/timblogiw.c ---- linux-3.0.8/drivers/media/video/timblogiw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/timblogiw.c 2011-08-24 18:29:20.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/timblogiw.c linux-3.0.9/drivers/media/video/timblogiw.c +--- linux-3.0.9/drivers/media/video/timblogiw.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/timblogiw.c 2011-11-12 12:47:13.000000000 -0500 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f /* Platform device functions */ @@ -30181,9 +30181,9 @@ diff -urNp linux-3.0.8/drivers/media/video/timblogiw.c linux-3.0.8/drivers/media .vidioc_querycap = timblogiw_querycap, .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt, .vidioc_g_fmt_vid_cap = timblogiw_g_fmt, -diff -urNp linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c ---- linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c +--- linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/usbvision/usbvision-core.c 2011-11-12 12:47:13.000000000 -0500 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_ unsigned char rv, gv, bv; static unsigned char *Y, *U, *V; @@ -30193,9 +30193,9 @@ diff -urNp linux-3.0.8/drivers/media/video/usbvision/usbvision-core.c linux-3.0. frame = usbvision->cur_frame; image_size = frame->frmwidth * frame->frmheight; if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) || -diff -urNp linux-3.0.8/drivers/media/video/videobuf-dma-sg.c linux-3.0.8/drivers/media/video/videobuf-dma-sg.c ---- linux-3.0.8/drivers/media/video/videobuf-dma-sg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/media/video/videobuf-dma-sg.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/media/video/videobuf-dma-sg.c linux-3.0.9/drivers/media/video/videobuf-dma-sg.c +--- linux-3.0.9/drivers/media/video/videobuf-dma-sg.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/media/video/videobuf-dma-sg.c 2011-11-12 12:47:13.000000000 -0500 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size) { struct videobuf_queue q; @@ -30205,9 +30205,9 @@ diff -urNp linux-3.0.8/drivers/media/video/videobuf-dma-sg.c linux-3.0.8/drivers /* Required to make generic handler to call __videobuf_alloc */ q.int_ops = &sg_ops; -diff -urNp linux-3.0.8/drivers/message/fusion/mptbase.c linux-3.0.8/drivers/message/fusion/mptbase.c ---- linux-3.0.8/drivers/message/fusion/mptbase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/fusion/mptbase.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/fusion/mptbase.c linux-3.0.9/drivers/message/fusion/mptbase.c +--- linux-3.0.9/drivers/message/fusion/mptbase.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/fusion/mptbase.c 2011-11-12 12:47:13.000000000 -0500 @@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); @@ -30222,9 +30222,9 @@ diff -urNp linux-3.0.8/drivers/message/fusion/mptbase.c linux-3.0.8/drivers/mess /* * Rounding UP to nearest 4-kB boundary here... */ -diff -urNp linux-3.0.8/drivers/message/fusion/mptsas.c linux-3.0.8/drivers/message/fusion/mptsas.c ---- linux-3.0.8/drivers/message/fusion/mptsas.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/fusion/mptsas.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/fusion/mptsas.c linux-3.0.9/drivers/message/fusion/mptsas.c +--- linux-3.0.9/drivers/message/fusion/mptsas.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/fusion/mptsas.c 2011-11-12 12:47:13.000000000 -0500 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin return 0; } @@ -30273,9 +30273,9 @@ diff -urNp linux-3.0.8/drivers/message/fusion/mptsas.c linux-3.0.8/drivers/messa static inline struct sas_port * mptsas_get_port(struct mptsas_phyinfo *phy_info) { -diff -urNp linux-3.0.8/drivers/message/fusion/mptscsih.c linux-3.0.8/drivers/message/fusion/mptscsih.c ---- linux-3.0.8/drivers/message/fusion/mptscsih.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/fusion/mptscsih.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/fusion/mptscsih.c linux-3.0.9/drivers/message/fusion/mptscsih.c +--- linux-3.0.9/drivers/message/fusion/mptscsih.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/fusion/mptscsih.c 2011-11-12 12:47:13.000000000 -0500 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost) h = shost_priv(SChost); @@ -30301,9 +30301,9 @@ diff -urNp linux-3.0.8/drivers/message/fusion/mptscsih.c linux-3.0.8/drivers/mes return h->info_kbuf; } -diff -urNp linux-3.0.8/drivers/message/i2o/i2o_config.c linux-3.0.8/drivers/message/i2o/i2o_config.c ---- linux-3.0.8/drivers/message/i2o/i2o_config.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/i2o/i2o_config.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/i2o/i2o_config.c linux-3.0.9/drivers/message/i2o/i2o_config.c +--- linux-3.0.9/drivers/message/i2o/i2o_config.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/i2o/i2o_config.c 2011-11-12 12:47:13.000000000 -0500 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon struct i2o_message *msg; unsigned int iop; @@ -30313,9 +30313,9 @@ diff -urNp linux-3.0.8/drivers/message/i2o/i2o_config.c linux-3.0.8/drivers/mess if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) return -EFAULT; -diff -urNp linux-3.0.8/drivers/message/i2o/i2o_proc.c linux-3.0.8/drivers/message/i2o/i2o_proc.c ---- linux-3.0.8/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/i2o/i2o_proc.c linux-3.0.9/drivers/message/i2o/i2o_proc.c +--- linux-3.0.9/drivers/message/i2o/i2o_proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/i2o/i2o_proc.c 2011-11-12 12:47:13.000000000 -0500 @@ -255,13 +255,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -30402,9 +30402,9 @@ diff -urNp linux-3.0.8/drivers/message/i2o/i2o_proc.c linux-3.0.8/drivers/messag return 0; } -diff -urNp linux-3.0.8/drivers/message/i2o/iop.c linux-3.0.8/drivers/message/i2o/iop.c ---- linux-3.0.8/drivers/message/i2o/iop.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/message/i2o/iop.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/message/i2o/iop.c linux-3.0.9/drivers/message/i2o/iop.c +--- linux-3.0.9/drivers/message/i2o/iop.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/message/i2o/iop.c 2011-11-12 12:47:13.000000000 -0500 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro spin_lock_irqsave(&c->context_list_lock, flags); @@ -30428,9 +30428,9 @@ diff -urNp linux-3.0.8/drivers/message/i2o/iop.c linux-3.0.8/drivers/message/i2o INIT_LIST_HEAD(&c->context_list); #endif -diff -urNp linux-3.0.8/drivers/mfd/ab3100-core.c linux-3.0.8/drivers/mfd/ab3100-core.c ---- linux-3.0.8/drivers/mfd/ab3100-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mfd/ab3100-core.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mfd/ab3100-core.c linux-3.0.9/drivers/mfd/ab3100-core.c +--- linux-3.0.9/drivers/mfd/ab3100-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mfd/ab3100-core.c 2011-11-12 12:47:13.000000000 -0500 @@ -809,7 +809,7 @@ struct ab_family_id { char *name; }; @@ -30440,9 +30440,9 @@ diff -urNp linux-3.0.8/drivers/mfd/ab3100-core.c linux-3.0.8/drivers/mfd/ab3100- /* AB3100 */ { .id = 0xc0, -diff -urNp linux-3.0.8/drivers/mfd/abx500-core.c linux-3.0.8/drivers/mfd/abx500-core.c ---- linux-3.0.8/drivers/mfd/abx500-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mfd/abx500-core.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mfd/abx500-core.c linux-3.0.9/drivers/mfd/abx500-core.c +--- linux-3.0.9/drivers/mfd/abx500-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mfd/abx500-core.c 2011-11-12 12:47:13.000000000 -0500 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list); struct abx500_device_entry { @@ -30452,9 +30452,9 @@ diff -urNp linux-3.0.8/drivers/mfd/abx500-core.c linux-3.0.8/drivers/mfd/abx500- struct device *dev; }; -diff -urNp linux-3.0.8/drivers/mfd/janz-cmodio.c linux-3.0.8/drivers/mfd/janz-cmodio.c ---- linux-3.0.8/drivers/mfd/janz-cmodio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mfd/janz-cmodio.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mfd/janz-cmodio.c linux-3.0.9/drivers/mfd/janz-cmodio.c +--- linux-3.0.9/drivers/mfd/janz-cmodio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mfd/janz-cmodio.c 2011-11-12 12:47:13.000000000 -0500 @@ -13,6 +13,7 @@ #include <linux/kernel.h> @@ -30463,9 +30463,9 @@ diff -urNp linux-3.0.8/drivers/mfd/janz-cmodio.c linux-3.0.8/drivers/mfd/janz-cm #include <linux/init.h> #include <linux/pci.h> #include <linux/interrupt.h> -diff -urNp linux-3.0.8/drivers/mfd/wm8350-i2c.c linux-3.0.8/drivers/mfd/wm8350-i2c.c ---- linux-3.0.8/drivers/mfd/wm8350-i2c.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mfd/wm8350-i2c.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mfd/wm8350-i2c.c linux-3.0.9/drivers/mfd/wm8350-i2c.c +--- linux-3.0.9/drivers/mfd/wm8350-i2c.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mfd/wm8350-i2c.c 2011-11-12 12:47:13.000000000 -0500 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; int ret; @@ -30475,9 +30475,9 @@ diff -urNp linux-3.0.8/drivers/mfd/wm8350-i2c.c linux-3.0.8/drivers/mfd/wm8350-i if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) return -EINVAL; -diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c ---- linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c +--- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.c 2011-11-12 12:47:13.000000000 -0500 @@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in * the lid is closed. This leads to interrupts as soon as a little move * is done. @@ -30514,9 +30514,9 @@ diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.8/drivers/mi return POLLIN | POLLRDNORM; return 0; } -diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h ---- linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h +--- linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/lis3lv02d/lis3lv02d.h 2011-11-12 12:47:13.000000000 -0500 @@ -265,7 +265,7 @@ struct lis3lv02d { struct input_polled_dev *idev; /* input device */ struct platform_device *pdev; /* platform device */ @@ -30526,9 +30526,9 @@ diff -urNp linux-3.0.8/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.8/drivers/mi union axis_conversion ac; /* hw -> logical axis */ int mapped_btns[3]; -diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c ---- linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c +--- linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-gru/gruhandles.c 2011-11-12 12:47:13.000000000 -0500 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op unsigned long nsec; @@ -30540,9 +30540,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruhandles.c linux-3.0.8/drivers/mis if (mcs_op_statistics[op].max < nsec) mcs_op_statistics[op].max = nsec; } -diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c ---- linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c +--- linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-gru/gruprocfs.c 2011-11-12 12:47:13.000000000 -0500 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -30566,9 +30566,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.8/drivers/misc max = mcs_op_statistics[op].max; seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, count ? total / count : 0, max); -diff -urNp linux-3.0.8/drivers/misc/sgi-gru/grutables.h linux-3.0.8/drivers/misc/sgi-gru/grutables.h ---- linux-3.0.8/drivers/misc/sgi-gru/grutables.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-gru/grutables.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-gru/grutables.h linux-3.0.9/drivers/misc/sgi-gru/grutables.h +--- linux-3.0.9/drivers/misc/sgi-gru/grutables.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-gru/grutables.h 2011-11-12 12:47:13.000000000 -0500 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -30748,9 +30748,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-gru/grutables.h linux-3.0.8/drivers/misc } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc.h linux-3.0.8/drivers/misc/sgi-xp/xpc.h ---- linux-3.0.8/drivers/misc/sgi-xp/xpc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-xp/xpc.h 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc.h linux-3.0.9/drivers/misc/sgi-xp/xpc.h +--- linux-3.0.9/drivers/misc/sgi-xp/xpc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-xp/xpc.h 2011-11-12 12:47:13.000000000 -0500 @@ -835,6 +835,7 @@ struct xpc_arch_operations { void (*received_payload) (struct xpc_channel *, void *); void (*notify_senders_of_disconnect) (struct xpc_channel *); @@ -30768,9 +30768,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc.h linux-3.0.8/drivers/misc/sgi-xp extern int xpc_disengage_timelimit; extern int xpc_disengage_timedout; extern int xpc_activate_IRQ_rcvd; -diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c ---- linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c +--- linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-xp/xpc_main.c 2011-11-12 12:47:13.000000000 -0500 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not .notifier_call = xpc_system_die, }; @@ -30780,9 +30780,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xpc_main.c linux-3.0.8/drivers/misc/s /* * Timer function to enforce the timelimit on the partition disengage. -diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xp.h linux-3.0.8/drivers/misc/sgi-xp/xp.h ---- linux-3.0.8/drivers/misc/sgi-xp/xp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/misc/sgi-xp/xp.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/misc/sgi-xp/xp.h linux-3.0.9/drivers/misc/sgi-xp/xp.h +--- linux-3.0.9/drivers/misc/sgi-xp/xp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/misc/sgi-xp/xp.h 2011-11-12 12:47:13.000000000 -0500 @@ -289,7 +289,7 @@ struct xpc_interface { xpc_notify_func, void *); void (*received) (short, int, void *); @@ -30792,9 +30792,9 @@ diff -urNp linux-3.0.8/drivers/misc/sgi-xp/xp.h linux-3.0.8/drivers/misc/sgi-xp/ extern struct xpc_interface xpc_interface; -diff -urNp linux-3.0.8/drivers/mmc/host/sdhci-pci.c linux-3.0.8/drivers/mmc/host/sdhci-pci.c ---- linux-3.0.8/drivers/mmc/host/sdhci-pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mmc/host/sdhci-pci.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mmc/host/sdhci-pci.c linux-3.0.9/drivers/mmc/host/sdhci-pci.c +--- linux-3.0.9/drivers/mmc/host/sdhci-pci.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mmc/host/sdhci-pci.c 2011-11-12 12:47:13.000000000 -0500 @@ -524,7 +524,7 @@ static const struct sdhci_pci_fixes sdhc .probe = via_probe, }; @@ -30804,9 +30804,9 @@ diff -urNp linux-3.0.8/drivers/mmc/host/sdhci-pci.c linux-3.0.8/drivers/mmc/host { .vendor = PCI_VENDOR_ID_RICOH, .device = PCI_DEVICE_ID_RICOH_R5C822, -diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c ---- linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0001.c 2011-11-12 12:47:13.000000000 -0500 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info * struct cfi_pri_intelext *cfip = cfi->cmdset_priv; unsigned long timeo = jiffies + HZ; @@ -30834,9 +30834,9 @@ diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.8/drivers/m adr += chip->start; retry: -diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c ---- linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c +--- linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/chips/cfi_cmdset_0020.c 2011-11-12 12:47:13.000000000 -0500 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct unsigned long cmd_addr; struct cfi_private *cfi = map->fldrv_priv; @@ -30882,9 +30882,9 @@ diff -urNp linux-3.0.8/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.8/drivers/m adr += chip->start; /* Let's determine this according to the interleave only once */ -diff -urNp linux-3.0.8/drivers/mtd/devices/doc2000.c linux-3.0.8/drivers/mtd/devices/doc2000.c ---- linux-3.0.8/drivers/mtd/devices/doc2000.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/devices/doc2000.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/devices/doc2000.c linux-3.0.9/drivers/mtd/devices/doc2000.c +--- linux-3.0.9/drivers/mtd/devices/doc2000.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/devices/doc2000.c 2011-11-12 12:47:13.000000000 -0500 @@ -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 */ @@ -30894,9 +30894,9 @@ diff -urNp linux-3.0.8/drivers/mtd/devices/doc2000.c linux-3.0.8/drivers/mtd/dev printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-3.0.8/drivers/mtd/devices/doc2001.c linux-3.0.8/drivers/mtd/devices/doc2001.c ---- linux-3.0.8/drivers/mtd/devices/doc2001.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/devices/doc2001.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/devices/doc2001.c linux-3.0.9/drivers/mtd/devices/doc2001.c +--- linux-3.0.9/drivers/mtd/devices/doc2001.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/devices/doc2001.c 2011-11-12 12:47:13.000000000 -0500 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt struct Nand *mychip = &this->chips[from >> (this->chipshift)]; @@ -30906,9 +30906,9 @@ diff -urNp linux-3.0.8/drivers/mtd/devices/doc2001.c linux-3.0.8/drivers/mtd/dev return -EINVAL; /* Don't allow a single read to cross a 512-byte block boundary */ -diff -urNp linux-3.0.8/drivers/mtd/ftl.c linux-3.0.8/drivers/mtd/ftl.c ---- linux-3.0.8/drivers/mtd/ftl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/ftl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/ftl.c linux-3.0.9/drivers/mtd/ftl.c +--- linux-3.0.9/drivers/mtd/ftl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/ftl.c 2011-11-12 12:47:13.000000000 -0500 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * loff_t offset; uint16_t srcunitswap = cpu_to_le16(srcunit); @@ -30918,9 +30918,9 @@ diff -urNp linux-3.0.8/drivers/mtd/ftl.c linux-3.0.8/drivers/mtd/ftl.c eun = &part->EUNInfo[srcunit]; xfer = &part->XferInfo[xferunit]; DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", -diff -urNp linux-3.0.8/drivers/mtd/inftlcore.c linux-3.0.8/drivers/mtd/inftlcore.c ---- linux-3.0.8/drivers/mtd/inftlcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/inftlcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/inftlcore.c linux-3.0.9/drivers/mtd/inftlcore.c +--- linux-3.0.9/drivers/mtd/inftlcore.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/inftlcore.c 2011-11-12 12:47:13.000000000 -0500 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr struct inftl_oob oob; size_t retlen; @@ -30930,9 +30930,9 @@ diff -urNp linux-3.0.8/drivers/mtd/inftlcore.c linux-3.0.8/drivers/mtd/inftlcore DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d," "pending=%d)\n", inftl, thisVUC, pendingblock); -diff -urNp linux-3.0.8/drivers/mtd/inftlmount.c linux-3.0.8/drivers/mtd/inftlmount.c ---- linux-3.0.8/drivers/mtd/inftlmount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/inftlmount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/inftlmount.c linux-3.0.9/drivers/mtd/inftlmount.c +--- linux-3.0.9/drivers/mtd/inftlmount.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/inftlmount.c 2011-11-12 12:47:13.000000000 -0500 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL struct INFTLPartition *ip; size_t retlen; @@ -30942,9 +30942,9 @@ diff -urNp linux-3.0.8/drivers/mtd/inftlmount.c linux-3.0.8/drivers/mtd/inftlmou DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl); /* -diff -urNp linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c ---- linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c +--- linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/lpddr/qinfo_probe.c 2011-11-12 12:47:13.000000000 -0500 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map { map_word pfow_val[4]; @@ -30954,10 +30954,10 @@ diff -urNp linux-3.0.8/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.8/drivers/mtd/l /* Check identification string */ pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); -diff -urNp linux-3.0.8/drivers/mtd/mtdchar.c linux-3.0.8/drivers/mtd/mtdchar.c ---- linux-3.0.8/drivers/mtd/mtdchar.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/mtdchar.c 2011-08-23 21:48:14.000000000 -0400 -@@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, +diff -urNp linux-3.0.9/drivers/mtd/mtdchar.c linux-3.0.9/drivers/mtd/mtdchar.c +--- linux-3.0.9/drivers/mtd/mtdchar.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/mtdchar.c 2011-11-12 12:47:13.000000000 -0500 +@@ -554,6 +554,8 @@ static int mtd_ioctl(struct file *file, u_long size; struct mtd_info_user info; @@ -30966,9 +30966,9 @@ diff -urNp linux-3.0.8/drivers/mtd/mtdchar.c linux-3.0.8/drivers/mtd/mtdchar.c DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; -diff -urNp linux-3.0.8/drivers/mtd/nand/denali.c linux-3.0.8/drivers/mtd/nand/denali.c ---- linux-3.0.8/drivers/mtd/nand/denali.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/nand/denali.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/nand/denali.c linux-3.0.9/drivers/mtd/nand/denali.c +--- linux-3.0.9/drivers/mtd/nand/denali.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/nand/denali.c 2011-11-12 12:47:13.000000000 -0500 @@ -26,6 +26,7 @@ #include <linux/pci.h> #include <linux/mtd/mtd.h> @@ -30977,9 +30977,9 @@ diff -urNp linux-3.0.8/drivers/mtd/nand/denali.c linux-3.0.8/drivers/mtd/nand/de #include "denali.h" -diff -urNp linux-3.0.8/drivers/mtd/nftlcore.c linux-3.0.8/drivers/mtd/nftlcore.c ---- linux-3.0.8/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/nftlcore.c linux-3.0.9/drivers/mtd/nftlcore.c +--- linux-3.0.9/drivers/mtd/nftlcore.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/nftlcore.c 2011-11-12 12:47:13.000000000 -0500 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre int inplace = 1; size_t retlen; @@ -30989,9 +30989,9 @@ diff -urNp linux-3.0.8/drivers/mtd/nftlcore.c linux-3.0.8/drivers/mtd/nftlcore.c memset(BlockMap, 0xff, sizeof(BlockMap)); memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); -diff -urNp linux-3.0.8/drivers/mtd/nftlmount.c linux-3.0.8/drivers/mtd/nftlmount.c ---- linux-3.0.8/drivers/mtd/nftlmount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/nftlmount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/nftlmount.c linux-3.0.9/drivers/mtd/nftlmount.c +--- linux-3.0.9/drivers/mtd/nftlmount.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/nftlmount.c 2011-11-12 12:47:13.000000000 -0500 @@ -24,6 +24,7 @@ #include <asm/errno.h> #include <linux/delay.h> @@ -31009,9 +31009,9 @@ diff -urNp linux-3.0.8/drivers/mtd/nftlmount.c linux-3.0.8/drivers/mtd/nftlmount /* Assume logical EraseSize == physical erasesize for starting the scan. We'll sort it out later if we find a MediaHeader which says otherwise */ /* Actually, we won't. The new DiskOnChip driver has already scanned -diff -urNp linux-3.0.8/drivers/mtd/ubi/build.c linux-3.0.8/drivers/mtd/ubi/build.c ---- linux-3.0.8/drivers/mtd/ubi/build.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/mtd/ubi/build.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/mtd/ubi/build.c linux-3.0.9/drivers/mtd/ubi/build.c +--- linux-3.0.9/drivers/mtd/ubi/build.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/mtd/ubi/build.c 2011-11-12 12:47:13.000000000 -0500 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -31051,9 +31051,9 @@ diff -urNp linux-3.0.8/drivers/mtd/ubi/build.c linux-3.0.8/drivers/mtd/ubi/build } /** -diff -urNp linux-3.0.8/drivers/net/atlx/atl2.c linux-3.0.8/drivers/net/atlx/atl2.c ---- linux-3.0.8/drivers/net/atlx/atl2.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/atlx/atl2.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/atlx/atl2.c linux-3.0.9/drivers/net/atlx/atl2.c +--- linux-3.0.9/drivers/net/atlx/atl2.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/atlx/atl2.c 2011-11-12 12:47:13.000000000 -0500 @@ -2840,7 +2840,7 @@ static void atl2_force_ps(struct atl2_hw */ @@ -31063,9 +31063,9 @@ diff -urNp linux-3.0.8/drivers/net/atlx/atl2.c linux-3.0.8/drivers/net/atlx/atl2 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \ MODULE_PARM_DESC(X, desc); #else -diff -urNp linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c ---- linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c +--- linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/bna/bfa_ioc_ct.c 2011-11-12 12:47:13.000000000 -0500 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc); static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode); @@ -31110,9 +31110,9 @@ diff -urNp linux-3.0.8/drivers/net/bna/bfa_ioc_ct.c linux-3.0.8/drivers/net/bna/ ioc->ioc_hwif = &nw_hwif_ct; } -diff -urNp linux-3.0.8/drivers/net/bna/bnad.c linux-3.0.8/drivers/net/bna/bnad.c ---- linux-3.0.8/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/bna/bnad.c linux-3.0.9/drivers/net/bna/bnad.c +--- linux-3.0.9/drivers/net/bna/bnad.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/bna/bnad.c 2011-11-12 12:47:13.000000000 -0500 @@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx struct bna_intr_info *intr_info = &res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info; @@ -31174,9 +31174,9 @@ diff -urNp linux-3.0.8/drivers/net/bna/bnad.c linux-3.0.8/drivers/net/bna/bnad.c /* Get BNA's resource requirement for one Rx object */ spin_lock_irqsave(&bnad->bna_lock, flags); bna_rx_res_req(rx_config, res_info); -diff -urNp linux-3.0.8/drivers/net/bnx2.c linux-3.0.8/drivers/net/bnx2.c ---- linux-3.0.8/drivers/net/bnx2.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/net/bnx2.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/bnx2.c linux-3.0.9/drivers/net/bnx2.c +--- linux-3.0.9/drivers/net/bnx2.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/bnx2.c 2011-11-12 12:47:13.000000000 -0500 @@ -5831,6 +5831,8 @@ bnx2_test_nvram(struct bnx2 *bp) int rc = 0; u32 magic, csum; @@ -31186,9 +31186,9 @@ diff -urNp linux-3.0.8/drivers/net/bnx2.c linux-3.0.8/drivers/net/bnx2.c if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0) goto test_nvram_done; -diff -urNp linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c ---- linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c +--- linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/bnx2x/bnx2x_ethtool.c 2011-11-12 12:47:13.000000000 -0500 @@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x int i, rc; u32 magic, crc; @@ -31198,9 +31198,9 @@ diff -urNp linux-3.0.8/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.8/drivers/net if (BP_NOMCP(bp)) return 0; -diff -urNp linux-3.0.8/drivers/net/can/mscan/mscan.c linux-3.0.8/drivers/net/can/mscan/mscan.c ---- linux-3.0.8/drivers/net/can/mscan/mscan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/can/mscan/mscan.c 2011-10-17 02:51:46.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/can/mscan/mscan.c linux-3.0.9/drivers/net/can/mscan/mscan.c +--- linux-3.0.9/drivers/net/can/mscan/mscan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/can/mscan/mscan.c 2011-11-12 12:47:13.000000000 -0500 @@ -261,11 +261,13 @@ static netdev_tx_t mscan_start_xmit(stru void __iomem *data = ®s->tx.dsr1_0; u16 *payload = (u16 *)frame->data; @@ -31232,9 +31232,9 @@ diff -urNp linux-3.0.8/drivers/net/can/mscan/mscan.c linux-3.0.8/drivers/net/can } out_8(®s->canrflg, MSCAN_RXF); -diff -urNp linux-3.0.8/drivers/net/cxgb3/l2t.h linux-3.0.8/drivers/net/cxgb3/l2t.h ---- linux-3.0.8/drivers/net/cxgb3/l2t.h 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/net/cxgb3/l2t.h 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/cxgb3/l2t.h linux-3.0.9/drivers/net/cxgb3/l2t.h +--- linux-3.0.9/drivers/net/cxgb3/l2t.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/cxgb3/l2t.h 2011-11-12 12:47:13.000000000 -0500 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func) */ struct l2t_skb_cb { @@ -31244,9 +31244,9 @@ diff -urNp linux-3.0.8/drivers/net/cxgb3/l2t.h linux-3.0.8/drivers/net/cxgb3/l2t #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) -diff -urNp linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c ---- linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c +--- linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/cxgb4/cxgb4_main.c 2011-11-12 12:47:13.000000000 -0500 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct unsigned int nchan = adap->params.nports; struct msix_entry entries[MAX_INGQ + 1]; @@ -31256,9 +31256,9 @@ diff -urNp linux-3.0.8/drivers/net/cxgb4/cxgb4_main.c linux-3.0.8/drivers/net/cx for (i = 0; i < ARRAY_SIZE(entries); ++i) entries[i].entry = i; -diff -urNp linux-3.0.8/drivers/net/cxgb4/t4_hw.c linux-3.0.8/drivers/net/cxgb4/t4_hw.c ---- linux-3.0.8/drivers/net/cxgb4/t4_hw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/cxgb4/t4_hw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/cxgb4/t4_hw.c linux-3.0.9/drivers/net/cxgb4/t4_hw.c +--- linux-3.0.9/drivers/net/cxgb4/t4_hw.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/cxgb4/t4_hw.c 2011-11-12 12:47:13.000000000 -0500 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter u8 vpd[VPD_LEN], csum; unsigned int vpdr_len, kw_offset, id_len; @@ -31268,9 +31268,9 @@ diff -urNp linux-3.0.8/drivers/net/cxgb4/t4_hw.c linux-3.0.8/drivers/net/cxgb4/t ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd); if (ret < 0) return ret; -diff -urNp linux-3.0.8/drivers/net/e1000e/82571.c linux-3.0.8/drivers/net/e1000e/82571.c ---- linux-3.0.8/drivers/net/e1000e/82571.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/e1000e/82571.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/e1000e/82571.c linux-3.0.9/drivers/net/e1000e/82571.c +--- linux-3.0.9/drivers/net/e1000e/82571.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/e1000e/82571.c 2011-11-12 12:47:13.000000000 -0500 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -31280,9 +31280,9 @@ diff -urNp linux-3.0.8/drivers/net/e1000e/82571.c linux-3.0.8/drivers/net/e1000e u32 swsm = 0; u32 swsm2 = 0; bool force_clear_smbi = false; -diff -urNp linux-3.0.8/drivers/net/e1000e/es2lan.c linux-3.0.8/drivers/net/e1000e/es2lan.c ---- linux-3.0.8/drivers/net/e1000e/es2lan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/e1000e/es2lan.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/e1000e/es2lan.c linux-3.0.9/drivers/net/e1000e/es2lan.c +--- linux-3.0.9/drivers/net/e1000e/es2lan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/e1000e/es2lan.c 2011-11-12 12:47:13.000000000 -0500 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -31292,9 +31292,9 @@ diff -urNp linux-3.0.8/drivers/net/e1000e/es2lan.c linux-3.0.8/drivers/net/e1000 /* Set media type */ switch (adapter->pdev->device) { -diff -urNp linux-3.0.8/drivers/net/e1000e/hw.h linux-3.0.8/drivers/net/e1000e/hw.h ---- linux-3.0.8/drivers/net/e1000e/hw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/e1000e/hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/e1000e/hw.h linux-3.0.9/drivers/net/e1000e/hw.h +--- linux-3.0.9/drivers/net/e1000e/hw.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/e1000e/hw.h 2011-11-12 12:47:13.000000000 -0500 @@ -776,6 +776,7 @@ struct e1000_mac_operations { void (*write_vfta)(struct e1000_hw *, u32, u32); s32 (*read_mac_addr)(struct e1000_hw *); @@ -31341,9 +31341,9 @@ diff -urNp linux-3.0.8/drivers/net/e1000e/hw.h linux-3.0.8/drivers/net/e1000e/hw enum e1000_nvm_type type; enum e1000_nvm_override override; -diff -urNp linux-3.0.8/drivers/net/fealnx.c linux-3.0.8/drivers/net/fealnx.c ---- linux-3.0.8/drivers/net/fealnx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/fealnx.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/fealnx.c linux-3.0.9/drivers/net/fealnx.c +--- linux-3.0.9/drivers/net/fealnx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/fealnx.c 2011-11-12 12:47:13.000000000 -0500 @@ -150,7 +150,7 @@ struct chip_info { int flags; }; @@ -31353,9 +31353,9 @@ diff -urNp linux-3.0.8/drivers/net/fealnx.c linux-3.0.8/drivers/net/fealnx.c { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR }, { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR }, -diff -urNp linux-3.0.8/drivers/net/hamradio/6pack.c linux-3.0.8/drivers/net/hamradio/6pack.c ---- linux-3.0.8/drivers/net/hamradio/6pack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/hamradio/6pack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/hamradio/6pack.c linux-3.0.9/drivers/net/hamradio/6pack.c +--- linux-3.0.9/drivers/net/hamradio/6pack.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/hamradio/6pack.c 2011-11-12 12:47:13.000000000 -0500 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t unsigned char buf[512]; int count1; @@ -31365,9 +31365,9 @@ diff -urNp linux-3.0.8/drivers/net/hamradio/6pack.c linux-3.0.8/drivers/net/hamr if (!count) return; -diff -urNp linux-3.0.8/drivers/net/igb/e1000_hw.h linux-3.0.8/drivers/net/igb/e1000_hw.h ---- linux-3.0.8/drivers/net/igb/e1000_hw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/igb/e1000_hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/igb/e1000_hw.h linux-3.0.9/drivers/net/igb/e1000_hw.h +--- linux-3.0.9/drivers/net/igb/e1000_hw.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/igb/e1000_hw.h 2011-11-12 12:47:13.000000000 -0500 @@ -314,6 +314,7 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); @@ -31436,9 +31436,9 @@ diff -urNp linux-3.0.8/drivers/net/igb/e1000_hw.h linux-3.0.8/drivers/net/igb/e1 struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.8/drivers/net/igbvf/vf.h linux-3.0.8/drivers/net/igbvf/vf.h ---- linux-3.0.8/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/igbvf/vf.h linux-3.0.9/drivers/net/igbvf/vf.h +--- linux-3.0.9/drivers/net/igbvf/vf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/igbvf/vf.h 2011-11-12 12:47:13.000000000 -0500 @@ -189,9 +189,10 @@ struct e1000_mac_operations { s32 (*read_mac_addr)(struct e1000_hw *); s32 (*set_vfta)(struct e1000_hw *, u16, bool); @@ -31468,9 +31468,9 @@ diff -urNp linux-3.0.8/drivers/net/igbvf/vf.h linux-3.0.8/drivers/net/igbvf/vf.h struct e1000_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_main.c linux-3.0.8/drivers/net/ixgb/ixgb_main.c ---- linux-3.0.8/drivers/net/ixgb/ixgb_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ixgb/ixgb_main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_main.c linux-3.0.9/drivers/net/ixgb/ixgb_main.c +--- linux-3.0.9/drivers/net/ixgb/ixgb_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ixgb/ixgb_main.c 2011-11-12 12:47:13.000000000 -0500 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev u32 rctl; int i; @@ -31480,9 +31480,9 @@ diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_main.c linux-3.0.8/drivers/net/ixgb /* Check for Promiscuous and All Multicast modes */ rctl = IXGB_READ_REG(hw, RCTL); -diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_param.c linux-3.0.8/drivers/net/ixgb/ixgb_param.c ---- linux-3.0.8/drivers/net/ixgb/ixgb_param.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ixgb/ixgb_param.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ixgb/ixgb_param.c linux-3.0.9/drivers/net/ixgb/ixgb_param.c +--- linux-3.0.9/drivers/net/ixgb/ixgb_param.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ixgb/ixgb_param.c 2011-11-12 12:47:13.000000000 -0500 @@ -261,6 +261,9 @@ void __devinit ixgb_check_options(struct ixgb_adapter *adapter) { @@ -31493,9 +31493,9 @@ diff -urNp linux-3.0.8/drivers/net/ixgb/ixgb_param.c linux-3.0.8/drivers/net/ixg if (bd >= IXGB_MAX_NIC) { pr_notice("Warning: no configuration for board #%i\n", bd); pr_notice("Using defaults for all values\n"); -diff -urNp linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h ---- linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h +--- linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ixgbe/ixgbe_type.h 2011-11-12 12:47:13.000000000 -0500 @@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations { s32 (*update_checksum)(struct ixgbe_hw *); u16 (*calc_checksum)(struct ixgbe_hw *); @@ -31559,9 +31559,9 @@ diff -urNp linux-3.0.8/drivers/net/ixgbe/ixgbe_type.h linux-3.0.8/drivers/net/ix struct ixgbe_mbx_stats stats; u32 timeout; u32 usec_delay; -diff -urNp linux-3.0.8/drivers/net/ixgbevf/vf.h linux-3.0.8/drivers/net/ixgbevf/vf.h ---- linux-3.0.8/drivers/net/ixgbevf/vf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ixgbevf/vf.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ixgbevf/vf.h linux-3.0.9/drivers/net/ixgbevf/vf.h +--- linux-3.0.9/drivers/net/ixgbevf/vf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ixgbevf/vf.h 2011-11-12 12:47:13.000000000 -0500 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations { s32 (*clear_vfta)(struct ixgbe_hw *); s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool); @@ -31596,9 +31596,9 @@ diff -urNp linux-3.0.8/drivers/net/ixgbevf/vf.h linux-3.0.8/drivers/net/ixgbevf/ struct ixgbe_mbx_stats stats; u32 timeout; u32 udelay; -diff -urNp linux-3.0.8/drivers/net/ksz884x.c linux-3.0.8/drivers/net/ksz884x.c ---- linux-3.0.8/drivers/net/ksz884x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ksz884x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ksz884x.c linux-3.0.9/drivers/net/ksz884x.c +--- linux-3.0.9/drivers/net/ksz884x.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ksz884x.c 2011-11-12 12:47:14.000000000 -0500 @@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str int rc; u64 counter[TOTAL_PORT_COUNTER_NUM]; @@ -31608,9 +31608,9 @@ diff -urNp linux-3.0.8/drivers/net/ksz884x.c linux-3.0.8/drivers/net/ksz884x.c mutex_lock(&hw_priv->lock); n = SWITCH_PORT_NUM; for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) { -diff -urNp linux-3.0.8/drivers/net/mlx4/main.c linux-3.0.8/drivers/net/mlx4/main.c ---- linux-3.0.8/drivers/net/mlx4/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/mlx4/main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/mlx4/main.c linux-3.0.9/drivers/net/mlx4/main.c +--- linux-3.0.9/drivers/net/mlx4/main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/mlx4/main.c 2011-11-12 12:47:14.000000000 -0500 @@ -40,6 +40,7 @@ #include <linux/dma-mapping.h> #include <linux/slab.h> @@ -31628,9 +31628,9 @@ diff -urNp linux-3.0.8/drivers/net/mlx4/main.c linux-3.0.8/drivers/net/mlx4/main err = mlx4_QUERY_FW(dev); if (err) { if (err == -EACCES) -diff -urNp linux-3.0.8/drivers/net/niu.c linux-3.0.8/drivers/net/niu.c ---- linux-3.0.8/drivers/net/niu.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/net/niu.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/niu.c linux-3.0.9/drivers/net/niu.c +--- linux-3.0.9/drivers/net/niu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/niu.c 2011-11-12 12:47:14.000000000 -0500 @@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc int i, num_irqs, err; u8 first_ldg; @@ -31640,9 +31640,9 @@ diff -urNp linux-3.0.8/drivers/net/niu.c linux-3.0.8/drivers/net/niu.c first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port; for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++) ldg_num_map[i] = first_ldg + i; -diff -urNp linux-3.0.8/drivers/net/pcnet32.c linux-3.0.8/drivers/net/pcnet32.c ---- linux-3.0.8/drivers/net/pcnet32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/pcnet32.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/pcnet32.c linux-3.0.9/drivers/net/pcnet32.c +--- linux-3.0.9/drivers/net/pcnet32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/pcnet32.c 2011-11-12 12:47:14.000000000 -0500 @@ -82,7 +82,7 @@ static int cards_found; /* * VLB I/O addresses @@ -32265,9 +32265,9 @@ diff -urNp linux-3.0.8/drivers/net/pcnet32.c linux-3.0.8/drivers/net/pcnet32.c } } else { netif_info(lp, link, dev, "link up\n"); -diff -urNp linux-3.0.8/drivers/net/ppp_generic.c linux-3.0.8/drivers/net/ppp_generic.c ---- linux-3.0.8/drivers/net/ppp_generic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/ppp_generic.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/ppp_generic.c linux-3.0.9/drivers/net/ppp_generic.c +--- linux-3.0.9/drivers/net/ppp_generic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/ppp_generic.c 2011-11-12 12:47:14.000000000 -0500 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; @@ -32286,9 +32286,9 @@ diff -urNp linux-3.0.8/drivers/net/ppp_generic.c linux-3.0.8/drivers/net/ppp_gen break; err = 0; break; -diff -urNp linux-3.0.8/drivers/net/r8169.c linux-3.0.8/drivers/net/r8169.c ---- linux-3.0.8/drivers/net/r8169.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/net/r8169.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/r8169.c linux-3.0.9/drivers/net/r8169.c +--- linux-3.0.9/drivers/net/r8169.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/r8169.c 2011-11-12 12:47:14.000000000 -0500 @@ -645,12 +645,12 @@ struct rtl8169_private { struct mdio_ops { void (*write)(void __iomem *, int, int); @@ -32304,9 +32304,9 @@ diff -urNp linux-3.0.8/drivers/net/r8169.c linux-3.0.8/drivers/net/r8169.c int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv); int (*get_settings)(struct net_device *, struct ethtool_cmd *); -diff -urNp linux-3.0.8/drivers/net/sis190.c linux-3.0.8/drivers/net/sis190.c ---- linux-3.0.8/drivers/net/sis190.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/net/sis190.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/sis190.c linux-3.0.9/drivers/net/sis190.c +--- linux-3.0.9/drivers/net/sis190.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/sis190.c 2011-11-12 12:47:14.000000000 -0500 @@ -1623,7 +1623,7 @@ static int __devinit sis190_get_mac_addr static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev, struct net_device *dev) @@ -32316,9 +32316,9 @@ diff -urNp linux-3.0.8/drivers/net/sis190.c linux-3.0.8/drivers/net/sis190.c struct sis190_private *tp = netdev_priv(dev); struct pci_dev *isa_bridge; u8 reg, tmp8; -diff -urNp linux-3.0.8/drivers/net/sundance.c linux-3.0.8/drivers/net/sundance.c ---- linux-3.0.8/drivers/net/sundance.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/sundance.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/sundance.c linux-3.0.9/drivers/net/sundance.c +--- linux-3.0.9/drivers/net/sundance.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/sundance.c 2011-11-12 12:47:14.000000000 -0500 @@ -218,7 +218,7 @@ enum { struct pci_id_info { const char *name; @@ -32328,9 +32328,9 @@ diff -urNp linux-3.0.8/drivers/net/sundance.c linux-3.0.8/drivers/net/sundance.c {"D-Link DFE-550TX FAST Ethernet Adapter"}, {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"}, {"D-Link DFE-580TX 4 port Server Adapter"}, -diff -urNp linux-3.0.8/drivers/net/tg3.h linux-3.0.8/drivers/net/tg3.h ---- linux-3.0.8/drivers/net/tg3.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tg3.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tg3.h linux-3.0.9/drivers/net/tg3.h +--- linux-3.0.9/drivers/net/tg3.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tg3.h 2011-11-12 12:47:14.000000000 -0500 @@ -134,6 +134,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -32339,9 +32339,9 @@ diff -urNp linux-3.0.8/drivers/net/tg3.h linux-3.0.8/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-3.0.8/drivers/net/tokenring/abyss.c linux-3.0.8/drivers/net/tokenring/abyss.c ---- linux-3.0.8/drivers/net/tokenring/abyss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tokenring/abyss.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tokenring/abyss.c linux-3.0.9/drivers/net/tokenring/abyss.c +--- linux-3.0.9/drivers/net/tokenring/abyss.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tokenring/abyss.c 2011-11-12 12:47:14.000000000 -0500 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = static int __init abyss_init (void) @@ -32358,9 +32358,9 @@ diff -urNp linux-3.0.8/drivers/net/tokenring/abyss.c linux-3.0.8/drivers/net/tok return pci_register_driver(&abyss_driver); } -diff -urNp linux-3.0.8/drivers/net/tokenring/madgemc.c linux-3.0.8/drivers/net/tokenring/madgemc.c ---- linux-3.0.8/drivers/net/tokenring/madgemc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tokenring/madgemc.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tokenring/madgemc.c linux-3.0.9/drivers/net/tokenring/madgemc.c +--- linux-3.0.9/drivers/net/tokenring/madgemc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tokenring/madgemc.c 2011-11-12 12:47:14.000000000 -0500 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver static int __init madgemc_init (void) @@ -32376,9 +32376,9 @@ diff -urNp linux-3.0.8/drivers/net/tokenring/madgemc.c linux-3.0.8/drivers/net/t return mca_register_driver (&madgemc_driver); } -diff -urNp linux-3.0.8/drivers/net/tokenring/proteon.c linux-3.0.8/drivers/net/tokenring/proteon.c ---- linux-3.0.8/drivers/net/tokenring/proteon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tokenring/proteon.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tokenring/proteon.c linux-3.0.9/drivers/net/tokenring/proteon.c +--- linux-3.0.9/drivers/net/tokenring/proteon.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tokenring/proteon.c 2011-11-12 12:47:14.000000000 -0500 @@ -353,9 +353,11 @@ static int __init proteon_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -32394,9 +32394,9 @@ diff -urNp linux-3.0.8/drivers/net/tokenring/proteon.c linux-3.0.8/drivers/net/t err = platform_driver_register(&proteon_driver); if (err) -diff -urNp linux-3.0.8/drivers/net/tokenring/skisa.c linux-3.0.8/drivers/net/tokenring/skisa.c ---- linux-3.0.8/drivers/net/tokenring/skisa.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tokenring/skisa.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tokenring/skisa.c linux-3.0.9/drivers/net/tokenring/skisa.c +--- linux-3.0.9/drivers/net/tokenring/skisa.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tokenring/skisa.c 2011-11-12 12:47:14.000000000 -0500 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void) struct platform_device *pdev; int i, num = 0, err = 0; @@ -32412,9 +32412,9 @@ diff -urNp linux-3.0.8/drivers/net/tokenring/skisa.c linux-3.0.8/drivers/net/tok err = platform_driver_register(&sk_isa_driver); if (err) -diff -urNp linux-3.0.8/drivers/net/tulip/de2104x.c linux-3.0.8/drivers/net/tulip/de2104x.c ---- linux-3.0.8/drivers/net/tulip/de2104x.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tulip/de2104x.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tulip/de2104x.c linux-3.0.9/drivers/net/tulip/de2104x.c +--- linux-3.0.9/drivers/net/tulip/de2104x.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tulip/de2104x.c 2011-11-12 12:47:14.000000000 -0500 @@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i struct de_srom_info_leaf *il; void *bufp; @@ -32424,9 +32424,9 @@ diff -urNp linux-3.0.8/drivers/net/tulip/de2104x.c linux-3.0.8/drivers/net/tulip /* download entire eeprom */ for (i = 0; i < DE_EEPROM_WORDS; i++) ((__le16 *)ee_data)[i] = -diff -urNp linux-3.0.8/drivers/net/tulip/de4x5.c linux-3.0.8/drivers/net/tulip/de4x5.c ---- linux-3.0.8/drivers/net/tulip/de4x5.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tulip/de4x5.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tulip/de4x5.c linux-3.0.9/drivers/net/tulip/de4x5.c +--- linux-3.0.9/drivers/net/tulip/de4x5.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tulip/de4x5.c 2011-11-12 12:47:14.000000000 -0500 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru for (i=0; i<ETH_ALEN; i++) { tmp.addr[i] = dev->dev_addr[i]; @@ -32445,9 +32445,9 @@ diff -urNp linux-3.0.8/drivers/net/tulip/de4x5.c linux-3.0.8/drivers/net/tulip/d return -EFAULT; break; } -diff -urNp linux-3.0.8/drivers/net/tulip/eeprom.c linux-3.0.8/drivers/net/tulip/eeprom.c ---- linux-3.0.8/drivers/net/tulip/eeprom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tulip/eeprom.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tulip/eeprom.c linux-3.0.9/drivers/net/tulip/eeprom.c +--- linux-3.0.9/drivers/net/tulip/eeprom.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tulip/eeprom.c 2011-11-12 12:47:14.000000000 -0500 @@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups {NULL}}; @@ -32457,9 +32457,9 @@ diff -urNp linux-3.0.8/drivers/net/tulip/eeprom.c linux-3.0.8/drivers/net/tulip/ "21140 non-MII", "21140 MII PHY", "21142 Serial PHY", -diff -urNp linux-3.0.8/drivers/net/tulip/winbond-840.c linux-3.0.8/drivers/net/tulip/winbond-840.c ---- linux-3.0.8/drivers/net/tulip/winbond-840.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/tulip/winbond-840.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/tulip/winbond-840.c linux-3.0.9/drivers/net/tulip/winbond-840.c +--- linux-3.0.9/drivers/net/tulip/winbond-840.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/tulip/winbond-840.c 2011-11-12 12:47:14.000000000 -0500 @@ -236,7 +236,7 @@ struct pci_id_info { int drv_flags; /* Driver use, intended as capability flags. */ }; @@ -32469,9 +32469,9 @@ diff -urNp linux-3.0.8/drivers/net/tulip/winbond-840.c linux-3.0.8/drivers/net/t { /* Sometime a Level-One switch card. */ "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII}, { "Winbond W89c840", CanHaveMII | HasBrokenTx}, -diff -urNp linux-3.0.8/drivers/net/usb/hso.c linux-3.0.8/drivers/net/usb/hso.c ---- linux-3.0.8/drivers/net/usb/hso.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/usb/hso.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/usb/hso.c linux-3.0.9/drivers/net/usb/hso.c +--- linux-3.0.9/drivers/net/usb/hso.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/usb/hso.c 2011-11-12 12:47:14.000000000 -0500 @@ -71,7 +71,7 @@ #include <asm/byteorder.h> #include <linux/serial_core.h> @@ -32568,9 +32568,9 @@ diff -urNp linux-3.0.8/drivers/net/usb/hso.c linux-3.0.8/drivers/net/usb/hso.c result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c ---- linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c +--- linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/vmxnet3/vmxnet3_ethtool.c 2011-11-12 12:47:14.000000000 -0500 @@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device * Return with error code if any of the queue indices * is out of range @@ -32581,9 +32581,9 @@ diff -urNp linux-3.0.8/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.8/drivers return -EINVAL; } -diff -urNp linux-3.0.8/drivers/net/vxge/vxge-config.h linux-3.0.8/drivers/net/vxge/vxge-config.h ---- linux-3.0.8/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/vxge/vxge-config.h linux-3.0.9/drivers/net/vxge/vxge-config.h +--- linux-3.0.9/drivers/net/vxge/vxge-config.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/vxge/vxge-config.h 2011-11-12 12:47:14.000000000 -0500 @@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs { void (*link_down)(struct __vxge_hw_device *devh); void (*crit_err)(struct __vxge_hw_device *devh, @@ -32593,9 +32593,9 @@ diff -urNp linux-3.0.8/drivers/net/vxge/vxge-config.h linux-3.0.8/drivers/net/vx /* * struct __vxge_hw_blockpool_entry - Block private data structure -diff -urNp linux-3.0.8/drivers/net/vxge/vxge-main.c linux-3.0.8/drivers/net/vxge/vxge-main.c ---- linux-3.0.8/drivers/net/vxge/vxge-main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/vxge/vxge-main.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/vxge/vxge-main.c linux-3.0.9/drivers/net/vxge/vxge-main.c +--- linux-3.0.9/drivers/net/vxge/vxge-main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/vxge/vxge-main.c 2011-11-12 12:47:14.000000000 -0500 @@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T struct sk_buff *completed[NR_SKB_COMPLETED]; int more; @@ -32614,9 +32614,9 @@ diff -urNp linux-3.0.8/drivers/net/vxge/vxge-main.c linux-3.0.8/drivers/net/vxge /* * Filling * - itable with bucket numbers -diff -urNp linux-3.0.8/drivers/net/vxge/vxge-traffic.h linux-3.0.8/drivers/net/vxge/vxge-traffic.h ---- linux-3.0.8/drivers/net/vxge/vxge-traffic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/vxge/vxge-traffic.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/vxge/vxge-traffic.h linux-3.0.9/drivers/net/vxge/vxge-traffic.h +--- linux-3.0.9/drivers/net/vxge/vxge-traffic.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/vxge/vxge-traffic.h 2011-11-12 12:47:14.000000000 -0500 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs { struct vxge_hw_mempool_dma *dma_object, u32 index, @@ -32626,9 +32626,9 @@ diff -urNp linux-3.0.8/drivers/net/vxge/vxge-traffic.h linux-3.0.8/drivers/net/v #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \ ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next) -diff -urNp linux-3.0.8/drivers/net/wan/cycx_x25.c linux-3.0.8/drivers/net/wan/cycx_x25.c ---- linux-3.0.8/drivers/net/wan/cycx_x25.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wan/cycx_x25.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wan/cycx_x25.c linux-3.0.9/drivers/net/wan/cycx_x25.c +--- linux-3.0.9/drivers/net/wan/cycx_x25.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wan/cycx_x25.c 2011-11-12 12:47:14.000000000 -0500 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned unsigned char hex[1024], * phex = hex; @@ -32638,9 +32638,9 @@ diff -urNp linux-3.0.8/drivers/net/wan/cycx_x25.c linux-3.0.8/drivers/net/wan/cy if (len >= (sizeof(hex) / 2)) len = (sizeof(hex) / 2) - 1; -diff -urNp linux-3.0.8/drivers/net/wan/hdlc_x25.c linux-3.0.8/drivers/net/wan/hdlc_x25.c ---- linux-3.0.8/drivers/net/wan/hdlc_x25.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wan/hdlc_x25.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wan/hdlc_x25.c linux-3.0.9/drivers/net/wan/hdlc_x25.c +--- linux-3.0.9/drivers/net/wan/hdlc_x25.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wan/hdlc_x25.c 2011-11-12 12:47:14.000000000 -0500 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu static int x25_open(struct net_device *dev) @@ -32666,9 +32666,9 @@ diff -urNp linux-3.0.8/drivers/net/wan/hdlc_x25.c linux-3.0.8/drivers/net/wan/hd result = lapb_register(dev, &cb); if (result != LAPB_OK) return result; -diff -urNp linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c ---- linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c +--- linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wimax/i2400m/usb-fw.c 2011-11-12 12:47:14.000000000 -0500 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru int do_autopm = 1; DECLARE_COMPLETION_ONSTACK(notif_completion); @@ -32678,9 +32678,9 @@ diff -urNp linux-3.0.8/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.8/drivers/net d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", i2400m, ack, ack_size); BUG_ON(_ack == i2400m->bm_ack_buf); -diff -urNp linux-3.0.8/drivers/net/wireless/airo.c linux-3.0.8/drivers/net/wireless/airo.c ---- linux-3.0.8/drivers/net/wireless/airo.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/airo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/airo.c linux-3.0.9/drivers/net/wireless/airo.c +--- linux-3.0.9/drivers/net/wireless/airo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/airo.c 2011-11-12 12:47:14.000000000 -0500 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s BSSListElement * loop_net; BSSListElement * tmp_net; @@ -32735,9 +32735,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/airo.c linux-3.0.8/drivers/net/wirel /* Get stats out of the card */ clear_bit(JOB_WSTATS, &local->jobs); if (local->power.event) { -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c ---- linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c +--- linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath5k/debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f unsigned int v; u64 tsf; @@ -32801,10 +32801,10 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.8/driver len += snprintf(buf+len, sizeof(buf)-len, "available txbuffers: %d\n", sc->txbuf_len); -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c ---- linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-08-23 21:48:14.000000000 -0400 -@@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c +--- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2011-11-12 12:47:14.000000000 -0500 +@@ -758,6 +758,8 @@ static void ar9003_hw_tx_iq_cal_post_pro int i, im, j; int nmeasurement; @@ -32813,9 +32813,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.8 for (i = 0; i < AR9300_MAX_CHAINS; i++) { if (ah->txchainmask & (1 << i)) num_chains++; -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c ---- linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +--- linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/ar9003_paprd.c 2011-11-12 12:47:14.000000000 -0500 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, int theta_low_bin = 0; int i; @@ -32825,9 +32825,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.8 /* disregard any bin that contains <= 16 samples */ thresh_accum_cnt = 16; scale_factor = 5; -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c ---- linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c +--- linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc char buf[512]; unsigned int len = 0; @@ -32846,9 +32846,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.8/driver len += snprintf(buf + len, sizeof(buf) - len, "%s (chan=%d center-freq: %d MHz channel-type: %d (%s))\n", wiphy_name(sc->hw->wiphy), -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c ---- linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c +--- linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s unsigned int len = 0; int ret = 0; @@ -32903,9 +32903,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0. len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n", "Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue)); -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h ---- linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h +--- linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath9k/hw.h 2011-11-12 12:47:14.000000000 -0500 @@ -585,7 +585,7 @@ struct ath_hw_private_ops { /* ANI */ @@ -32933,9 +32933,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.8/drivers/n struct ieee80211_hw *hw; struct ath_common common; -diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath.h linux-3.0.8/drivers/net/wireless/ath/ath.h ---- linux-3.0.8/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ath/ath.h linux-3.0.9/drivers/net/wireless/ath/ath.h +--- linux-3.0.9/drivers/net/wireless/ath/ath.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ath/ath.h 2011-11-12 12:47:14.000000000 -0500 @@ -121,6 +121,7 @@ struct ath_ops { void (*write_flush) (void *); u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr); @@ -32944,9 +32944,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ath/ath.h linux-3.0.8/drivers/net/wi struct ath_common; struct ath_bus_ops; -diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c ---- linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c +--- linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ipw2x00/ipw2100.c 2011-11-12 12:47:14.000000000 -0500 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2 int err; DECLARE_SSID_BUF(ssid); @@ -32965,9 +32965,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.8/driver IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n", idx, keylen, len); -diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c ---- linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c +--- linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-11-12 12:47:14.000000000 -0500 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons unsigned long flags; DECLARE_SSID_BUF(ssid); @@ -32977,9 +32977,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.8/driv LIBIPW_DEBUG_SCAN("'%s' (%pM" "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", print_ssid(ssid, info_element->data, info_element->len), -diff -urNp linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c ---- linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c +--- linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/iwlegacy/iwl3945-base.c 2011-11-12 12:47:14.000000000 -0500 @@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_ */ if (iwl3945_mod_params.disable_hw_scan) { @@ -32991,9 +32991,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.8/ } IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n"); -diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c ---- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-11-12 12:47:14.000000000 -0500 @@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s struct iwl_station_priv *sta_priv = (void *)sta->drv_priv; struct iwl_rxon_context *ctx = sta_priv->common.ctx; @@ -33012,9 +33012,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.8/dri /* Override starting rate (index 0) if needed for debug purposes */ rs_dbgfs_set_mcs(lq_sta, &new_rate, index); -diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c ---- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c +--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str int pos = 0; const size_t bufsz = sizeof(buf); @@ -33033,9 +33033,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.8/dr for_each_context(priv, ctx) { pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid); -diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h ---- linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-11-12 12:47:14.000000000 -0500 @@ -68,8 +68,8 @@ do { } while (0) @@ -33047,9 +33047,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.8/driv static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, const void *p, u32 len) {} -diff -urNp linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c ---- linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c +--- linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s int buf_len = 512; size_t len = 0; @@ -33059,9 +33059,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.8/d if (*ppos != 0) return 0; if (count < sizeof(buf)) -diff -urNp linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c ---- linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c +--- linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/mac80211_hwsim.c 2011-11-12 12:47:14.000000000 -0500 @@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo return -EINVAL; @@ -33077,9 +33077,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/mac80211_hwsim.c linux-3.0.8/drivers } spin_lock_init(&hwsim_radio_lock); -diff -urNp linux-3.0.8/drivers/net/wireless/rndis_wlan.c linux-3.0.8/drivers/net/wireless/rndis_wlan.c ---- linux-3.0.8/drivers/net/wireless/rndis_wlan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/rndis_wlan.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/rndis_wlan.c linux-3.0.9/drivers/net/wireless/rndis_wlan.c +--- linux-3.0.9/drivers/net/wireless/rndis_wlan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/rndis_wlan.c 2011-11-12 12:47:14.000000000 -0500 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold); @@ -33089,9 +33089,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/rndis_wlan.c linux-3.0.8/drivers/net rts_threshold = 2347; tmp = cpu_to_le32(rts_threshold); -diff -urNp linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c ---- linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +--- linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c 2011-11-12 12:47:14.000000000 -0500 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st u8 rfpath; u8 num_total_rfpath = rtlphy->num_total_rfpath; @@ -33101,9 +33101,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux- precommoncmdcnt = 0; _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++, MAX_PRECMD_CNT, -diff -urNp linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h ---- linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h +--- linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/wl1251/wl1251.h 2011-11-12 12:47:14.000000000 -0500 @@ -266,7 +266,7 @@ struct wl1251_if_operations { void (*reset)(struct wl1251 *wl); void (*enable_irq)(struct wl1251 *wl); @@ -33113,9 +33113,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/wl1251/wl1251.h linux-3.0.8/drivers/ struct wl1251 { struct ieee80211_hw *hw; -diff -urNp linux-3.0.8/drivers/net/wireless/wl12xx/spi.c linux-3.0.8/drivers/net/wireless/wl12xx/spi.c ---- linux-3.0.8/drivers/net/wireless/wl12xx/spi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/net/wireless/wl12xx/spi.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/net/wireless/wl12xx/spi.c linux-3.0.9/drivers/net/wireless/wl12xx/spi.c +--- linux-3.0.9/drivers/net/wireless/wl12xx/spi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/net/wireless/wl12xx/spi.c 2011-11-12 12:47:14.000000000 -0500 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct u32 chunk_len; int i; @@ -33125,9 +33125,9 @@ diff -urNp linux-3.0.8/drivers/net/wireless/wl12xx/spi.c linux-3.0.8/drivers/net WARN_ON(len > WL1271_AGGR_BUFFER_SIZE); spi_message_init(&m); -diff -urNp linux-3.0.8/drivers/oprofile/buffer_sync.c linux-3.0.8/drivers/oprofile/buffer_sync.c ---- linux-3.0.8/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/buffer_sync.c linux-3.0.9/drivers/oprofile/buffer_sync.c +--- linux-3.0.9/drivers/oprofile/buffer_sync.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/buffer_sync.c 2011-11-12 12:47:14.000000000 -0500 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -33163,9 +33163,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/buffer_sync.c linux-3.0.8/drivers/oprofi } } release_mm(mm); -diff -urNp linux-3.0.8/drivers/oprofile/event_buffer.c linux-3.0.8/drivers/oprofile/event_buffer.c ---- linux-3.0.8/drivers/oprofile/event_buffer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/event_buffer.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/event_buffer.c linux-3.0.9/drivers/oprofile/event_buffer.c +--- linux-3.0.9/drivers/oprofile/event_buffer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/event_buffer.c 2011-11-12 12:47:14.000000000 -0500 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -33175,9 +33175,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/event_buffer.c linux-3.0.8/drivers/oprof return; } -diff -urNp linux-3.0.8/drivers/oprofile/oprof.c linux-3.0.8/drivers/oprofile/oprof.c ---- linux-3.0.8/drivers/oprofile/oprof.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/oprof.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/oprof.c linux-3.0.9/drivers/oprofile/oprof.c +--- linux-3.0.9/drivers/oprofile/oprof.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/oprof.c 2011-11-12 12:47:14.000000000 -0500 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -33187,9 +33187,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/oprof.c linux-3.0.8/drivers/oprofile/opr start_switch_worker(); } -diff -urNp linux-3.0.8/drivers/oprofile/oprofilefs.c linux-3.0.8/drivers/oprofile/oprofilefs.c ---- linux-3.0.8/drivers/oprofile/oprofilefs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/oprofilefs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/oprofilefs.c linux-3.0.9/drivers/oprofile/oprofilefs.c +--- linux-3.0.9/drivers/oprofile/oprofilefs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/oprofilefs.c 2011-11-12 12:47:14.000000000 -0500 @@ -186,7 +186,7 @@ static const struct file_operations atom @@ -33199,9 +33199,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/oprofilefs.c linux-3.0.8/drivers/oprofil { return __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444, val); -diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.c linux-3.0.8/drivers/oprofile/oprofile_stats.c ---- linux-3.0.8/drivers/oprofile/oprofile_stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/oprofile_stats.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.c linux-3.0.9/drivers/oprofile/oprofile_stats.c +--- linux-3.0.9/drivers/oprofile/oprofile_stats.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/oprofile_stats.c 2011-11-12 12:47:14.000000000 -0500 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -33219,9 +33219,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.c linux-3.0.8/drivers/opr } -diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.h linux-3.0.8/drivers/oprofile/oprofile_stats.h ---- linux-3.0.8/drivers/oprofile/oprofile_stats.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/oprofile/oprofile_stats.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/oprofile/oprofile_stats.h linux-3.0.9/drivers/oprofile/oprofile_stats.h +--- linux-3.0.9/drivers/oprofile/oprofile_stats.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/oprofile/oprofile_stats.h 2011-11-12 12:47:14.000000000 -0500 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -33239,9 +33239,9 @@ diff -urNp linux-3.0.8/drivers/oprofile/oprofile_stats.h linux-3.0.8/drivers/opr }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-3.0.8/drivers/parport/procfs.c linux-3.0.8/drivers/parport/procfs.c ---- linux-3.0.8/drivers/parport/procfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/parport/procfs.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/parport/procfs.c linux-3.0.9/drivers/parport/procfs.c +--- linux-3.0.9/drivers/parport/procfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/parport/procfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t *ppos += len; @@ -33260,9 +33260,9 @@ diff -urNp linux-3.0.8/drivers/parport/procfs.c linux-3.0.8/drivers/parport/proc } #endif /* IEEE1284.3 support. */ -diff -urNp linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h ---- linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h +--- linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/hotplug/cpci_hotplug.h 2011-11-12 12:47:14.000000000 -0500 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops { int (*hardware_test) (struct slot* slot, u32 value); u8 (*get_power) (struct slot* slot); @@ -33272,9 +33272,9 @@ diff -urNp linux-3.0.8/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.8/drivers/pc struct cpci_hp_controller { unsigned int irq; -diff -urNp linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/hotplug/cpqphp_nvram.c 2011-11-12 12:47:14.000000000 -0500 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -33289,9 +33289,9 @@ diff -urNp linux-3.0.8/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.8/drivers/pc dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-3.0.8/drivers/pci/pcie/aspm.c linux-3.0.8/drivers/pci/pcie/aspm.c ---- linux-3.0.8/drivers/pci/pcie/aspm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/pcie/aspm.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/pcie/aspm.c linux-3.0.9/drivers/pci/pcie/aspm.c +--- linux-3.0.9/drivers/pci/pcie/aspm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/pcie/aspm.c 2011-11-12 12:47:14.000000000 -0500 @@ -27,9 +27,9 @@ #define MODULE_PARAM_PREFIX "pcie_aspm." @@ -33305,9 +33305,9 @@ diff -urNp linux-3.0.8/drivers/pci/pcie/aspm.c linux-3.0.8/drivers/pci/pcie/aspm #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) -diff -urNp linux-3.0.8/drivers/pci/probe.c linux-3.0.8/drivers/pci/probe.c ---- linux-3.0.8/drivers/pci/probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/probe.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/probe.c linux-3.0.9/drivers/pci/probe.c +--- linux-3.0.9/drivers/pci/probe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/probe.c 2011-11-12 12:47:14.000000000 -0500 @@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev, u32 l, sz, mask; u16 orig_cmd; @@ -33317,9 +33317,9 @@ diff -urNp linux-3.0.8/drivers/pci/probe.c linux-3.0.8/drivers/pci/probe.c if (!dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &orig_cmd); -diff -urNp linux-3.0.8/drivers/pci/proc.c linux-3.0.8/drivers/pci/proc.c ---- linux-3.0.8/drivers/pci/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/proc.c linux-3.0.9/drivers/pci/proc.c +--- linux-3.0.9/drivers/pci/proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -476,7 +476,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -33337,9 +33337,9 @@ diff -urNp linux-3.0.8/drivers/pci/proc.c linux-3.0.8/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-3.0.8/drivers/pci/xen-pcifront.c linux-3.0.8/drivers/pci/xen-pcifront.c ---- linux-3.0.8/drivers/pci/xen-pcifront.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pci/xen-pcifront.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pci/xen-pcifront.c linux-3.0.9/drivers/pci/xen-pcifront.c +--- linux-3.0.9/drivers/pci/xen-pcifront.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pci/xen-pcifront.c 2011-11-12 12:47:14.000000000 -0500 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_ struct pcifront_sd *sd = bus->sysdata; struct pcifront_device *pdev = pcifront_get_pdev(sd); @@ -33385,9 +33385,9 @@ diff -urNp linux-3.0.8/drivers/pci/xen-pcifront.c linux-3.0.8/drivers/pci/xen-pc err = do_pci_op(pdev, &op); if (likely(!err)) { vector[0] = op.value; -diff -urNp linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c ---- linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c +--- linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/platform/x86/thinkpad_acpi.c 2011-11-12 12:47:14.000000000 -0500 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void) return 0; } @@ -33397,9 +33397,9 @@ diff -urNp linux-3.0.8/drivers/platform/x86/thinkpad_acpi.c linux-3.0.8/drivers/ { /* log only what the user can fix... */ const u32 wantedmask = hotkey_driver_mask & -diff -urNp linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c ---- linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c +--- linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pnp/pnpbios/bioscalls.c 2011-11-12 12:47:14.000000000 -0500 @@ -59,7 +59,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -33456,9 +33456,9 @@ diff -urNp linux-3.0.8/drivers/pnp/pnpbios/bioscalls.c linux-3.0.8/drivers/pnp/p + + pax_close_kernel(); } -diff -urNp linux-3.0.8/drivers/pnp/resource.c linux-3.0.8/drivers/pnp/resource.c ---- linux-3.0.8/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/pnp/resource.c linux-3.0.9/drivers/pnp/resource.c +--- linux-3.0.9/drivers/pnp/resource.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/pnp/resource.c 2011-11-12 12:47:14.000000000 -0500 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -33477,9 +33477,9 @@ diff -urNp linux-3.0.8/drivers/pnp/resource.c linux-3.0.8/drivers/pnp/resource.c return 0; /* check if the resource is reserved */ -diff -urNp linux-3.0.8/drivers/power/bq27x00_battery.c linux-3.0.8/drivers/power/bq27x00_battery.c ---- linux-3.0.8/drivers/power/bq27x00_battery.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/power/bq27x00_battery.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/power/bq27x00_battery.c linux-3.0.9/drivers/power/bq27x00_battery.c +--- linux-3.0.9/drivers/power/bq27x00_battery.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/power/bq27x00_battery.c 2011-11-12 12:47:14.000000000 -0500 @@ -67,7 +67,7 @@ struct bq27x00_device_info; struct bq27x00_access_methods { @@ -33489,9 +33489,9 @@ diff -urNp linux-3.0.8/drivers/power/bq27x00_battery.c linux-3.0.8/drivers/power enum bq27x00_chip { BQ27000, BQ27500 }; -diff -urNp linux-3.0.8/drivers/regulator/max8660.c linux-3.0.8/drivers/regulator/max8660.c ---- linux-3.0.8/drivers/regulator/max8660.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/regulator/max8660.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/regulator/max8660.c linux-3.0.9/drivers/regulator/max8660.c +--- linux-3.0.9/drivers/regulator/max8660.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/regulator/max8660.c 2011-11-12 12:47:14.000000000 -0500 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc max8660->shadow_regs[MAX8660_OVER1] = 5; } else { @@ -33505,9 +33505,9 @@ diff -urNp linux-3.0.8/drivers/regulator/max8660.c linux-3.0.8/drivers/regulator } /* -diff -urNp linux-3.0.8/drivers/regulator/mc13892-regulator.c linux-3.0.8/drivers/regulator/mc13892-regulator.c ---- linux-3.0.8/drivers/regulator/mc13892-regulator.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/regulator/mc13892-regulator.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/regulator/mc13892-regulator.c linux-3.0.9/drivers/regulator/mc13892-regulator.c +--- linux-3.0.9/drivers/regulator/mc13892-regulator.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/regulator/mc13892-regulator.c 2011-11-12 12:47:14.000000000 -0500 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p } mc13xxx_unlock(mc13892); @@ -33523,9 +33523,9 @@ diff -urNp linux-3.0.8/drivers/regulator/mc13892-regulator.c linux-3.0.8/drivers for (i = 0; i < pdata->num_regulators; i++) { init_data = &pdata->regulators[i]; priv->regulators[i] = regulator_register( -diff -urNp linux-3.0.8/drivers/rtc/rtc-dev.c linux-3.0.8/drivers/rtc/rtc-dev.c ---- linux-3.0.8/drivers/rtc/rtc-dev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/rtc/rtc-dev.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/rtc/rtc-dev.c linux-3.0.9/drivers/rtc/rtc-dev.c +--- linux-3.0.9/drivers/rtc/rtc-dev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/rtc/rtc-dev.c 2011-11-12 12:47:14.000000000 -0500 @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/rtc.h> @@ -33543,9 +33543,9 @@ diff -urNp linux-3.0.8/drivers/rtc/rtc-dev.c linux-3.0.8/drivers/rtc/rtc-dev.c return rtc_set_time(rtc, &tm); case RTC_PIE_ON: -diff -urNp linux-3.0.8/drivers/scsi/aacraid/aacraid.h linux-3.0.8/drivers/scsi/aacraid/aacraid.h ---- linux-3.0.8/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/aacraid/aacraid.h linux-3.0.9/drivers/scsi/aacraid/aacraid.h +--- linux-3.0.9/drivers/scsi/aacraid/aacraid.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/aacraid/aacraid.h 2011-11-12 12:47:14.000000000 -0500 @@ -492,7 +492,7 @@ struct adapter_ops int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd); /* Administrative operations */ @@ -33555,9 +33555,9 @@ diff -urNp linux-3.0.8/drivers/scsi/aacraid/aacraid.h linux-3.0.8/drivers/scsi/a /* * Define which interrupt handler needs to be installed -diff -urNp linux-3.0.8/drivers/scsi/aacraid/commctrl.c linux-3.0.8/drivers/scsi/aacraid/commctrl.c ---- linux-3.0.8/drivers/scsi/aacraid/commctrl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/aacraid/commctrl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/aacraid/commctrl.c linux-3.0.9/drivers/scsi/aacraid/commctrl.c +--- linux-3.0.9/drivers/scsi/aacraid/commctrl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/aacraid/commctrl.c 2011-11-12 12:47:14.000000000 -0500 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d u32 actual_fibsize64, actual_fibsize = 0; int i; @@ -33566,9 +33566,9 @@ diff -urNp linux-3.0.8/drivers/scsi/aacraid/commctrl.c linux-3.0.8/drivers/scsi/ if (dev->in_reset) { dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); -diff -urNp linux-3.0.8/drivers/scsi/aacraid/linit.c linux-3.0.8/drivers/scsi/aacraid/linit.c ---- linux-3.0.8/drivers/scsi/aacraid/linit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/aacraid/linit.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/aacraid/linit.c linux-3.0.9/drivers/scsi/aacraid/linit.c +--- linux-3.0.9/drivers/scsi/aacraid/linit.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/aacraid/linit.c 2011-11-12 12:47:14.000000000 -0500 @@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_ #elif defined(__devinitconst) static const struct pci_device_id aac_pci_tbl[] __devinitconst = { @@ -33578,9 +33578,9 @@ diff -urNp linux-3.0.8/drivers/scsi/aacraid/linit.c linux-3.0.8/drivers/scsi/aac #endif { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ -diff -urNp linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c ---- linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/aic94xx/aic94xx_init.c 2011-11-12 12:47:14.000000000 -0500 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa .lldd_control_phy = asd_control_phy, }; @@ -33590,9 +33590,9 @@ diff -urNp linux-3.0.8/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.8/drivers/s {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1}, {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1}, {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1}, -diff -urNp linux-3.0.8/drivers/scsi/bfa/bfad.c linux-3.0.8/drivers/scsi/bfa/bfad.c ---- linux-3.0.8/drivers/scsi/bfa/bfad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/bfa/bfad.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/bfa/bfad.c linux-3.0.9/drivers/scsi/bfa/bfad.c +--- linux-3.0.9/drivers/scsi/bfa/bfad.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/bfa/bfad.c 2011-11-12 12:47:14.000000000 -0500 @@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) { struct bfad_vport_s *vport, *vport_new; struct bfa_fcs_driver_info_s driver_info; @@ -33602,9 +33602,9 @@ diff -urNp linux-3.0.8/drivers/scsi/bfa/bfad.c linux-3.0.8/drivers/scsi/bfa/bfad /* Fill the driver_info info to fcs*/ memset(&driver_info, 0, sizeof(driver_info)); strncpy(driver_info.version, BFAD_DRIVER_VERSION, -diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c ---- linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c +--- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_lport.c 2011-11-12 12:47:14.000000000 -0500 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc u16 len, count; u16 templen; @@ -33623,9 +33623,9 @@ diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.8/drivers/scsi /* * get port attributes */ -diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c ---- linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c +--- linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/bfa/bfa_fcs_rport.c 2011-11-12 12:47:14.000000000 -0500 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc struct fc_rpsc_speed_info_s speeds; struct bfa_port_attr_s pport_attr; @@ -33635,9 +33635,9 @@ diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.8/drivers/scsi bfa_trc(port->fcs, rx_fchs->s_id); bfa_trc(port->fcs, rx_fchs->d_id); -diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa.h linux-3.0.8/drivers/scsi/bfa/bfa.h ---- linux-3.0.8/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa.h linux-3.0.9/drivers/scsi/bfa/bfa.h +--- linux-3.0.9/drivers/scsi/bfa/bfa.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/bfa/bfa.h 2011-11-12 12:47:14.000000000 -0500 @@ -238,7 +238,7 @@ struct bfa_hwif_s { u32 *nvecs, u32 *maxvec); void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start, @@ -33647,9 +33647,9 @@ diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa.h linux-3.0.8/drivers/scsi/bfa/bfa.h typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status); struct bfa_iocfc_s { -diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h ---- linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h +--- linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/bfa/bfa_ioc.h 2011-11-12 12:47:14.000000000 -0500 @@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s { bfa_ioc_disable_cbfn_t disable_cbfn; bfa_ioc_hbfail_cbfn_t hbfail_cbfn; @@ -33668,9 +33668,9 @@ diff -urNp linux-3.0.8/drivers/scsi/bfa/bfa_ioc.h linux-3.0.8/drivers/scsi/bfa/b #define bfa_ioc_pcifn(__ioc) ((__ioc)->pcidev.pci_func) #define bfa_ioc_devid(__ioc) ((__ioc)->pcidev.device_id) -diff -urNp linux-3.0.8/drivers/scsi/BusLogic.c linux-3.0.8/drivers/scsi/BusLogic.c ---- linux-3.0.8/drivers/scsi/BusLogic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/BusLogic.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/BusLogic.c linux-3.0.9/drivers/scsi/BusLogic.c +--- linux-3.0.9/drivers/scsi/BusLogic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/BusLogic.c 2011-11-12 12:47:14.000000000 -0500 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter *PrototypeHostAdapter) @@ -33680,9 +33680,9 @@ diff -urNp linux-3.0.8/drivers/scsi/BusLogic.c linux-3.0.8/drivers/scsi/BusLogic /* If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint Host Adapters; otherwise, default to the standard ISA MultiMaster probe. -diff -urNp linux-3.0.8/drivers/scsi/dpt_i2o.c linux-3.0.8/drivers/scsi/dpt_i2o.c ---- linux-3.0.8/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/dpt_i2o.c linux-3.0.9/drivers/scsi/dpt_i2o.c +--- linux-3.0.9/drivers/scsi/dpt_i2o.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/dpt_i2o.c 2011-11-12 12:47:14.000000000 -0500 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p dma_addr_t addr; ulong flags = 0; @@ -33701,9 +33701,9 @@ diff -urNp linux-3.0.8/drivers/scsi/dpt_i2o.c linux-3.0.8/drivers/scsi/dpt_i2o.c memset(msg, 0 , sizeof(msg)); len = scsi_bufflen(cmd); direction = 0x00000000; -diff -urNp linux-3.0.8/drivers/scsi/eata.c linux-3.0.8/drivers/scsi/eata.c ---- linux-3.0.8/drivers/scsi/eata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/eata.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/eata.c linux-3.0.9/drivers/scsi/eata.c +--- linux-3.0.9/drivers/scsi/eata.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/eata.c 2011-11-12 12:47:14.000000000 -0500 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por struct hostdata *ha; char name[16]; @@ -33713,9 +33713,9 @@ diff -urNp linux-3.0.8/drivers/scsi/eata.c linux-3.0.8/drivers/scsi/eata.c sprintf(name, "%s%d", driver_name, j); if (!request_region(port_base, REGION_SIZE, driver_name)) { -diff -urNp linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c ---- linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c +--- linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/fcoe/fcoe_ctlr.c 2011-11-12 12:47:14.000000000 -0500 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe } buf; int rc; @@ -33725,9 +33725,9 @@ diff -urNp linux-3.0.8/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.8/drivers/scsi/fc fiph = (struct fip_header *)skb->data; sub = fiph->fip_subcode; -diff -urNp linux-3.0.8/drivers/scsi/gdth.c linux-3.0.8/drivers/scsi/gdth.c ---- linux-3.0.8/drivers/scsi/gdth.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/gdth.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/gdth.c linux-3.0.9/drivers/scsi/gdth.c +--- linux-3.0.9/drivers/scsi/gdth.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/gdth.c 2011-11-12 12:47:14.000000000 -0500 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg) unsigned long flags; gdth_ha_str *ha; @@ -33765,9 +33765,9 @@ diff -urNp linux-3.0.8/drivers/scsi/gdth.c linux-3.0.8/drivers/scsi/gdth.c memset(cmnd, 0xff, MAX_COMMAND_SIZE); TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); -diff -urNp linux-3.0.8/drivers/scsi/gdth_proc.c linux-3.0.8/drivers/scsi/gdth_proc.c ---- linux-3.0.8/drivers/scsi/gdth_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/gdth_proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/gdth_proc.c linux-3.0.9/drivers/scsi/gdth_proc.c +--- linux-3.0.9/drivers/scsi/gdth_proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/gdth_proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi u64 paddr; @@ -33787,9 +33787,9 @@ diff -urNp linux-3.0.8/drivers/scsi/gdth_proc.c linux-3.0.8/drivers/scsi/gdth_pr gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL); estr = kmalloc(sizeof(*estr), GFP_KERNEL); if (!gdtcmd || !estr) -diff -urNp linux-3.0.8/drivers/scsi/hosts.c linux-3.0.8/drivers/scsi/hosts.c ---- linux-3.0.8/drivers/scsi/hosts.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/hosts.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/hosts.c linux-3.0.9/drivers/scsi/hosts.c +--- linux-3.0.9/drivers/scsi/hosts.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/hosts.c 2011-11-12 12:47:14.000000000 -0500 @@ -42,7 +42,7 @@ #include "scsi_logging.h" @@ -33799,7 +33799,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hosts.c linux-3.0.8/drivers/scsi/hosts.c static void scsi_host_cls_release(struct device *dev) -@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct +@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct * subtract one because we increment first then return, but we need to * know what the next host number was before increment */ @@ -33808,9 +33808,9 @@ diff -urNp linux-3.0.8/drivers/scsi/hosts.c linux-3.0.8/drivers/scsi/hosts.c shost->dma_channel = 0xff; /* These three are default values which can be overridden */ -diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c ---- linux-3.0.8/drivers/scsi/hpsa.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/hpsa.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/hpsa.c linux-3.0.9/drivers/scsi/hpsa.c +--- linux-3.0.9/drivers/scsi/hpsa.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/hpsa.c 2011-11-12 12:47:14.000000000 -0500 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct u32 a; @@ -33859,7 +33859,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c (h->interrupts_enabled == 0); } -@@ -3874,7 +3874,7 @@ static int __devinit hpsa_pci_init(struc +@@ -3881,7 +3881,7 @@ static int __devinit hpsa_pci_init(struc if (prod_index < 0) return -ENODEV; h->product_name = products[prod_index].product_name; @@ -33868,7 +33868,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c if (hpsa_board_disabled(h->pdev)) { dev_warn(&h->pdev->dev, "controller appears to be disabled\n"); -@@ -4151,7 +4151,7 @@ reinit_after_soft_reset: +@@ -4158,7 +4158,7 @@ reinit_after_soft_reset: } /* make sure the board interrupts are off */ @@ -33877,7 +33877,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx)) goto clean2; -@@ -4185,7 +4185,7 @@ reinit_after_soft_reset: +@@ -4192,7 +4192,7 @@ reinit_after_soft_reset: * fake ones to scoop up any residual completions. */ spin_lock_irqsave(&h->lock, flags); @@ -33886,7 +33886,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c spin_unlock_irqrestore(&h->lock, flags); free_irq(h->intr[h->intr_mode], h); rc = hpsa_request_irq(h, hpsa_msix_discard_completions, -@@ -4204,9 +4204,9 @@ reinit_after_soft_reset: +@@ -4211,9 +4211,9 @@ reinit_after_soft_reset: dev_info(&h->pdev->dev, "Board READY.\n"); dev_info(&h->pdev->dev, "Waiting for stale completions to drain.\n"); @@ -33898,7 +33898,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c rc = controller_reset_failed(h->cfgtable); if (rc) -@@ -4227,7 +4227,7 @@ reinit_after_soft_reset: +@@ -4234,7 +4234,7 @@ reinit_after_soft_reset: } /* Turn the interrupts on so we can service requests */ @@ -33907,7 +33907,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c hpsa_hba_inquiry(h); hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ -@@ -4280,7 +4280,7 @@ static void hpsa_shutdown(struct pci_dev +@@ -4287,7 +4287,7 @@ static void hpsa_shutdown(struct pci_dev * To write all data in the battery backed cache to disks */ hpsa_flush_cache(h); @@ -33916,7 +33916,7 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c free_irq(h->intr[h->intr_mode], h); #ifdef CONFIG_PCI_MSI if (h->msix_vector) -@@ -4443,7 +4443,7 @@ static __devinit void hpsa_enter_perform +@@ -4450,7 +4450,7 @@ static __devinit void hpsa_enter_perform return; } /* Change the access methods to the performant access methods */ @@ -33925,9 +33925,9 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.c linux-3.0.8/drivers/scsi/hpsa.c h->transMethod = CFGTBL_Trans_Performant; } -diff -urNp linux-3.0.8/drivers/scsi/hpsa.h linux-3.0.8/drivers/scsi/hpsa.h ---- linux-3.0.8/drivers/scsi/hpsa.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/hpsa.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/hpsa.h linux-3.0.9/drivers/scsi/hpsa.h +--- linux-3.0.9/drivers/scsi/hpsa.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/hpsa.h 2011-11-12 12:47:14.000000000 -0500 @@ -73,7 +73,7 @@ struct ctlr_info { unsigned int msix_vector; unsigned int msi_vector; @@ -33937,9 +33937,9 @@ diff -urNp linux-3.0.8/drivers/scsi/hpsa.h linux-3.0.8/drivers/scsi/hpsa.h /* queue and queue Info */ struct list_head reqQ; -diff -urNp linux-3.0.8/drivers/scsi/ips.h linux-3.0.8/drivers/scsi/ips.h ---- linux-3.0.8/drivers/scsi/ips.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/ips.h 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/ips.h linux-3.0.9/drivers/scsi/ips.h +--- linux-3.0.9/drivers/scsi/ips.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/ips.h 2011-11-12 12:47:14.000000000 -0500 @@ -1027,7 +1027,7 @@ typedef struct { int (*intr)(struct ips_ha *); void (*enableint)(struct ips_ha *); @@ -33949,9 +33949,9 @@ diff -urNp linux-3.0.8/drivers/scsi/ips.h linux-3.0.8/drivers/scsi/ips.h typedef struct ips_ha { uint8_t ha_id[IPS_MAX_CHANNELS+1]; -diff -urNp linux-3.0.8/drivers/scsi/libfc/fc_exch.c linux-3.0.8/drivers/scsi/libfc/fc_exch.c ---- linux-3.0.8/drivers/scsi/libfc/fc_exch.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/libfc/fc_exch.c linux-3.0.9/drivers/scsi/libfc/fc_exch.c +--- linux-3.0.9/drivers/scsi/libfc/fc_exch.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/libfc/fc_exch.c 2011-11-12 12:47:14.000000000 -0500 @@ -105,12 +105,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -34073,9 +34073,9 @@ diff -urNp linux-3.0.8/drivers/scsi/libfc/fc_exch.c linux-3.0.8/drivers/scsi/lib fc_frame_free(fp); } -diff -urNp linux-3.0.8/drivers/scsi/libsas/sas_ata.c linux-3.0.8/drivers/scsi/libsas/sas_ata.c ---- linux-3.0.8/drivers/scsi/libsas/sas_ata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/libsas/sas_ata.c 2011-08-23 21:47:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/libsas/sas_ata.c linux-3.0.9/drivers/scsi/libsas/sas_ata.c +--- linux-3.0.9/drivers/scsi/libsas/sas_ata.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/libsas/sas_ata.c 2011-11-12 12:47:14.000000000 -0500 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa .postreset = ata_std_postreset, .error_handler = ata_std_error_handler, @@ -34085,9 +34085,9 @@ diff -urNp linux-3.0.8/drivers/scsi/libsas/sas_ata.c linux-3.0.8/drivers/scsi/li .qc_prep = ata_noop_qc_prep, .qc_issue = sas_ata_qc_issue, .qc_fill_rtf = sas_ata_qc_fill_rtf, -diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c ---- linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c +--- linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_debugfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_ #include <linux/debugfs.h> @@ -34176,9 +34176,9 @@ diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.8/drivers/scsi snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = -diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc.h linux-3.0.8/drivers/scsi/lpfc/lpfc.h ---- linux-3.0.8/drivers/scsi/lpfc/lpfc.h 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/lpfc/lpfc.h 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc.h linux-3.0.9/drivers/scsi/lpfc/lpfc.h +--- linux-3.0.9/drivers/scsi/lpfc/lpfc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/lpfc/lpfc.h 2011-11-12 12:47:14.000000000 -0500 @@ -425,7 +425,7 @@ struct lpfc_vport { struct dentry *debug_nodelist; struct dentry *vport_debugfs_root; @@ -34208,9 +34208,9 @@ diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc.h linux-3.0.8/drivers/scsi/lpfc/lp /* iDiag debugfs sub-directory */ struct dentry *idiag_root; struct dentry *idiag_pci_cfg; -diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c ---- linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c +--- linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_init.c 2011-11-12 12:47:14.000000000 -0500 @@ -9971,8 +9971,10 @@ lpfc_init(void) printk(LPFC_COPYRIGHT "\n"); @@ -34224,9 +34224,9 @@ diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_init.c linux-3.0.8/drivers/scsi/lp } lpfc_transport_template = fc_attach_transport(&lpfc_transport_functions); -diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c ---- linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c 2011-10-16 21:55:27.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c +--- linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/lpfc/lpfc_scsi.c 2011-11-12 12:47:14.000000000 -0500 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb uint32_t evt_posted; @@ -34278,9 +34278,9 @@ diff -urNp linux-3.0.8/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.8/drivers/scsi/lp } /** -diff -urNp linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c ---- linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c +--- linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/megaraid/megaraid_mbox.c 2011-11-12 12:47:14.000000000 -0500 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter int rval; int i; @@ -34290,9 +34290,9 @@ diff -urNp linux-3.0.8/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.8/drivers // Allocate memory for the base list of scb for management module. adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL); -diff -urNp linux-3.0.8/drivers/scsi/osd/osd_initiator.c linux-3.0.8/drivers/scsi/osd/osd_initiator.c ---- linux-3.0.8/drivers/scsi/osd/osd_initiator.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/osd/osd_initiator.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/osd/osd_initiator.c linux-3.0.9/drivers/scsi/osd/osd_initiator.c +--- linux-3.0.9/drivers/scsi/osd/osd_initiator.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/osd/osd_initiator.c 2011-11-12 12:47:14.000000000 -0500 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st int nelem = ARRAY_SIZE(get_attrs), a = 0; int ret; @@ -34302,9 +34302,9 @@ diff -urNp linux-3.0.8/drivers/scsi/osd/osd_initiator.c linux-3.0.8/drivers/scsi or = osd_start_request(od, GFP_KERNEL); if (!or) return -ENOMEM; -diff -urNp linux-3.0.8/drivers/scsi/pmcraid.c linux-3.0.8/drivers/scsi/pmcraid.c ---- linux-3.0.8/drivers/scsi/pmcraid.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/pmcraid.c linux-3.0.9/drivers/scsi/pmcraid.c +--- linux-3.0.9/drivers/scsi/pmcraid.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/pmcraid.c 2011-11-12 12:47:14.000000000 -0500 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc res->scsi_dev = scsi_dev; scsi_dev->hostdata = res; @@ -34375,9 +34375,9 @@ diff -urNp linux-3.0.8/drivers/scsi/pmcraid.c linux-3.0.8/drivers/scsi/pmcraid.c schedule_work(&pinstance->worker_q); return rc; -diff -urNp linux-3.0.8/drivers/scsi/pmcraid.h linux-3.0.8/drivers/scsi/pmcraid.h ---- linux-3.0.8/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/pmcraid.h linux-3.0.9/drivers/scsi/pmcraid.h +--- linux-3.0.9/drivers/scsi/pmcraid.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/pmcraid.h 2011-11-12 12:47:14.000000000 -0500 @@ -749,7 +749,7 @@ struct pmcraid_instance { struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS]; @@ -34407,9 +34407,9 @@ diff -urNp linux-3.0.8/drivers/scsi/pmcraid.h linux-3.0.8/drivers/scsi/pmcraid.h /* To indicate add/delete/modify during CCN */ u8 change_detected; -diff -urNp linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h ---- linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h +--- linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/qla2xxx/qla_def.h 2011-11-12 12:47:14.000000000 -0500 @@ -2244,7 +2244,7 @@ struct isp_operations { int (*get_flash_version) (struct scsi_qla_host *, void *); int (*start_scsi) (srb_t *); @@ -34419,9 +34419,9 @@ diff -urNp linux-3.0.8/drivers/scsi/qla2xxx/qla_def.h linux-3.0.8/drivers/scsi/q /* MSI-X Support *************************************************************/ -diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h ---- linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h +--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_def.h 2011-11-12 12:47:14.000000000 -0500 @@ -256,7 +256,7 @@ struct ddb_entry { atomic_t retry_relogin_timer; /* Min Time between relogins * (4000 only) */ @@ -34431,9 +34431,9 @@ diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.8/drivers/scsi/q * retried */ uint16_t port; -diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c ---- linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c +--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_init.c 2011-11-12 12:47:14.000000000 -0500 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ ddb_entry->fw_ddb_index = fw_ddb_index; atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); @@ -34452,9 +34452,9 @@ diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.8/drivers/scsi/ atomic_set(&ddb_entry->relogin_timer, 0); clear_bit(DF_RELOGIN, &ddb_entry->flags); iscsi_unblock_session(ddb_entry->sess); -diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c ---- linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c +--- linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/qla4xxx/ql4_os.c 2011-11-12 12:47:14.000000000 -0500 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED) { @@ -34471,9 +34471,9 @@ diff -urNp linux-3.0.8/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.8/drivers/scsi/ql relogin_retry_count)) ); start_dpc++; -diff -urNp linux-3.0.8/drivers/scsi/scsi.c linux-3.0.8/drivers/scsi/scsi.c ---- linux-3.0.8/drivers/scsi/scsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi.c linux-3.0.9/drivers/scsi/scsi.c +--- linux-3.0.9/drivers/scsi/scsi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi.c 2011-11-12 12:47:14.000000000 -0500 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * unsigned long timeout; int rtn = 0; @@ -34483,9 +34483,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi.c linux-3.0.8/drivers/scsi/scsi.c /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { -diff -urNp linux-3.0.8/drivers/scsi/scsi_debug.c linux-3.0.8/drivers/scsi/scsi_debug.c ---- linux-3.0.8/drivers/scsi/scsi_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_debug.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_debug.c linux-3.0.9/drivers/scsi/scsi_debug.c +--- linux-3.0.9/drivers/scsi/scsi_debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_ unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; unsigned char *cmd = (unsigned char *)scp->cmnd; @@ -34504,9 +34504,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_debug.c linux-3.0.8/drivers/scsi/scsi_d if ((errsts = check_readiness(scp, 1, devip))) return errsts; memset(arr, 0, sizeof(arr)); -diff -urNp linux-3.0.8/drivers/scsi/scsi_lib.c linux-3.0.8/drivers/scsi/scsi_lib.c ---- linux-3.0.8/drivers/scsi/scsi_lib.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_lib.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_lib.c linux-3.0.9/drivers/scsi/scsi_lib.c +--- linux-3.0.9/drivers/scsi/scsi_lib.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_lib.c 2011-11-12 12:47:14.000000000 -0500 @@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req shost = sdev->host; scsi_init_cmd_errh(cmd); @@ -34528,9 +34528,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_lib.c linux-3.0.8/drivers/scsi/scsi_lib disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && -diff -urNp linux-3.0.8/drivers/scsi/scsi_sysfs.c linux-3.0.8/drivers/scsi/scsi_sysfs.c ---- linux-3.0.8/drivers/scsi/scsi_sysfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_sysfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_sysfs.c linux-3.0.9/drivers/scsi/scsi_sysfs.c +--- linux-3.0.9/drivers/scsi/scsi_sysfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_sysfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, char *buf) \ { \ @@ -34540,9 +34540,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_sysfs.c linux-3.0.8/drivers/scsi/scsi_s return snprintf(buf, 20, "0x%llx\n", count); \ } \ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) -diff -urNp linux-3.0.8/drivers/scsi/scsi_tgt_lib.c linux-3.0.8/drivers/scsi/scsi_tgt_lib.c ---- linux-3.0.8/drivers/scsi/scsi_tgt_lib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_tgt_lib.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_tgt_lib.c linux-3.0.9/drivers/scsi/scsi_tgt_lib.c +--- linux-3.0.9/drivers/scsi/scsi_tgt_lib.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_tgt_lib.c 2011-11-12 12:47:14.000000000 -0500 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc int err; @@ -34552,9 +34552,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_tgt_lib.c linux-3.0.8/drivers/scsi/scsi if (err) { /* * TODO: need to fixup sg_tablesize, max_segment_size, -diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_fc.c linux-3.0.8/drivers/scsi/scsi_transport_fc.c ---- linux-3.0.8/drivers/scsi/scsi_transport_fc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_transport_fc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_fc.c linux-3.0.9/drivers/scsi/scsi_transport_fc.c +--- linux-3.0.9/drivers/scsi/scsi_transport_fc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_transport_fc.c 2011-11-12 12:47:14.000000000 -0500 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_ * Netlink Infrastructure */ @@ -34591,9 +34591,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_fc.c linux-3.0.8/drivers/scsi return -EINVAL; /* * Check for overflow; dev_loss_tmo is u32 -diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c ---- linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c +--- linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_transport_iscsi.c 2011-11-12 12:47:14.000000000 -0500 @@ -83,7 +83,7 @@ struct iscsi_internal { struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; }; @@ -34621,9 +34621,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_iscsi.c linux-3.0.8/drivers/s err = class_register(&iscsi_transport_class); if (err) -diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_srp.c linux-3.0.8/drivers/scsi/scsi_transport_srp.c ---- linux-3.0.8/drivers/scsi/scsi_transport_srp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/scsi_transport_srp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/scsi_transport_srp.c linux-3.0.9/drivers/scsi/scsi_transport_srp.c +--- linux-3.0.9/drivers/scsi/scsi_transport_srp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/scsi_transport_srp.c 2011-11-12 12:47:14.000000000 -0500 @@ -33,7 +33,7 @@ #include "scsi_transport_srp_internal.h" @@ -34651,9 +34651,9 @@ diff -urNp linux-3.0.8/drivers/scsi/scsi_transport_srp.c linux-3.0.8/drivers/scs dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); transport_setup_device(&rport->dev); -diff -urNp linux-3.0.8/drivers/scsi/sg.c linux-3.0.8/drivers/scsi/sg.c ---- linux-3.0.8/drivers/scsi/sg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/sg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/sg.c linux-3.0.9/drivers/scsi/sg.c +--- linux-3.0.9/drivers/scsi/sg.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/sg.c 2011-11-12 12:47:14.000000000 -0500 @@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int sdp->disk->disk_name, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), @@ -34681,9 +34681,9 @@ diff -urNp linux-3.0.8/drivers/scsi/sg.c linux-3.0.8/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c ---- linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c +--- linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-11-12 12:47:14.000000000 -0500 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p int do_iounmap = 0; int do_disable_device = 1; @@ -34693,9 +34693,9 @@ diff -urNp linux-3.0.8/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.8/drivers/s memset(&sym_dev, 0, sizeof(sym_dev)); memset(&nvram, 0, sizeof(nvram)); sym_dev.pdev = pdev; -diff -urNp linux-3.0.8/drivers/scsi/vmw_pvscsi.c linux-3.0.8/drivers/scsi/vmw_pvscsi.c ---- linux-3.0.8/drivers/scsi/vmw_pvscsi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/scsi/vmw_pvscsi.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/scsi/vmw_pvscsi.c linux-3.0.9/drivers/scsi/vmw_pvscsi.c +--- linux-3.0.9/drivers/scsi/vmw_pvscsi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/scsi/vmw_pvscsi.c 2011-11-12 12:47:14.000000000 -0500 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const dma_addr_t base; unsigned i; @@ -34705,9 +34705,9 @@ diff -urNp linux-3.0.8/drivers/scsi/vmw_pvscsi.c linux-3.0.8/drivers/scsi/vmw_pv cmd.ringsStatePPN = adapter->ringStatePA >> PAGE_SHIFT; cmd.reqRingNumPages = adapter->req_pages; cmd.cmpRingNumPages = adapter->cmp_pages; -diff -urNp linux-3.0.8/drivers/spi/dw_spi_pci.c linux-3.0.8/drivers/spi/dw_spi_pci.c ---- linux-3.0.8/drivers/spi/dw_spi_pci.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/spi/dw_spi_pci.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/spi/dw_spi_pci.c linux-3.0.9/drivers/spi/dw_spi_pci.c +--- linux-3.0.9/drivers/spi/dw_spi_pci.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/spi/dw_spi_pci.c 2011-11-12 12:47:14.000000000 -0500 @@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd #define spi_resume NULL #endif @@ -34717,9 +34717,9 @@ diff -urNp linux-3.0.8/drivers/spi/dw_spi_pci.c linux-3.0.8/drivers/spi/dw_spi_p /* Intel MID platform SPI controller 0 */ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, {}, -diff -urNp linux-3.0.8/drivers/spi/spi.c linux-3.0.8/drivers/spi/spi.c ---- linux-3.0.8/drivers/spi/spi.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/spi/spi.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/spi/spi.c linux-3.0.9/drivers/spi/spi.c +--- linux-3.0.9/drivers/spi/spi.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/spi/spi.c 2011-11-12 12:47:14.000000000 -0500 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma EXPORT_SYMBOL_GPL(spi_bus_unlock); @@ -34729,9 +34729,9 @@ diff -urNp linux-3.0.8/drivers/spi/spi.c linux-3.0.8/drivers/spi/spi.c static u8 *buf; -diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c ---- linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c +--- linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/ath6kl/os/linux/ar6000_drv.c 2011-11-12 12:47:14.000000000 -0500 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[ (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0)) @@ -34741,9 +34741,9 @@ diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.8/ .ndo_init = NULL, .ndo_open = ar6000_open, .ndo_stop = ar6000_close, -diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h ---- linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h +--- linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h 2011-11-12 12:47:14.000000000 -0500 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void typedef struct ar6k_pal_config_s { @@ -34753,9 +34753,9 @@ diff -urNp linux-3.0.8/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux- void register_pal_cb(ar6k_pal_config_t *palConfig_p); #endif /* _AR6K_PAL_H_ */ -diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c ---- linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +--- linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-11-12 12:47:14.000000000 -0500 @@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp) free_netdev(ifp->net); } @@ -34800,9 +34800,9 @@ diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0. #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) g_bus = bus; -diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h ---- linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h +--- linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h 2011-11-12 12:47:14.000000000 -0500 @@ -593,7 +593,7 @@ struct phy_func_ptr { initfn_t carrsuppr; rxsigpwrfn_t rxsigpwr; @@ -34812,9 +34812,9 @@ diff -urNp linux-3.0.8/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu typedef struct phy_func_ptr phy_func_ptr_t; struct phy_info { -diff -urNp linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h ---- linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h +--- linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/brcm80211/include/bcmsdh.h 2011-11-12 12:47:14.000000000 -0500 @@ -185,7 +185,7 @@ typedef struct { u16 func, uint bustype, void *regsva, void *param); /* detach from device */ @@ -34824,9 +34824,9 @@ diff -urNp linux-3.0.8/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.8/dr /* platform specific/high level functions */ extern int bcmsdh_register(bcmsdh_driver_t *driver); -diff -urNp linux-3.0.8/drivers/staging/et131x/et1310_tx.c linux-3.0.8/drivers/staging/et131x/et1310_tx.c ---- linux-3.0.8/drivers/staging/et131x/et1310_tx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/et131x/et1310_tx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/et131x/et1310_tx.c linux-3.0.9/drivers/staging/et131x/et1310_tx.c +--- linux-3.0.9/drivers/staging/et131x/et1310_tx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/et131x/et1310_tx.c 2011-11-12 12:47:14.000000000 -0500 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru struct net_device_stats *stats = &etdev->net_stats; @@ -34842,9 +34842,9 @@ diff -urNp linux-3.0.8/drivers/staging/et131x/et1310_tx.c linux-3.0.8/drivers/st if (tcb->skb) { stats->tx_bytes += tcb->skb->len; -diff -urNp linux-3.0.8/drivers/staging/et131x/et131x_adapter.h linux-3.0.8/drivers/staging/et131x/et131x_adapter.h ---- linux-3.0.8/drivers/staging/et131x/et131x_adapter.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/et131x/et131x_adapter.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/et131x/et131x_adapter.h linux-3.0.9/drivers/staging/et131x/et131x_adapter.h +--- linux-3.0.9/drivers/staging/et131x/et131x_adapter.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/et131x/et131x_adapter.h 2011-11-12 12:47:14.000000000 -0500 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t { * operations */ @@ -34860,9 +34860,9 @@ diff -urNp linux-3.0.8/drivers/staging/et131x/et131x_adapter.h linux-3.0.8/drive u32 norcvbuf; /* # Rx packets discarded */ u32 noxmtbuf; /* # Tx packets discarded */ -diff -urNp linux-3.0.8/drivers/staging/hv/channel.c linux-3.0.8/drivers/staging/hv/channel.c ---- linux-3.0.8/drivers/staging/hv/channel.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/channel.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/channel.c linux-3.0.9/drivers/staging/hv/channel.c +--- linux-3.0.9/drivers/staging/hv/channel.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/channel.c 2011-11-12 12:47:14.000000000 -0500 @@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c int ret = 0; int t; @@ -34874,9 +34874,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/channel.c linux-3.0.8/drivers/staging/ ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount); if (ret) -diff -urNp linux-3.0.8/drivers/staging/hv/hv.c linux-3.0.8/drivers/staging/hv/hv.c ---- linux-3.0.8/drivers/staging/hv/hv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/hv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/hv.c linux-3.0.9/drivers/staging/hv/hv.c +--- linux-3.0.9/drivers/staging/hv/hv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/hv.c 2011-11-12 12:47:14.000000000 -0500 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi u64 output_address = (output) ? virt_to_phys(output) : 0; u32 output_address_hi = output_address >> 32; @@ -34886,9 +34886,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/hv.c linux-3.0.8/drivers/staging/hv/hv __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi), "=a"(hv_status_lo) : "d" (control_hi), -diff -urNp linux-3.0.8/drivers/staging/hv/hv_mouse.c linux-3.0.8/drivers/staging/hv/hv_mouse.c ---- linux-3.0.8/drivers/staging/hv/hv_mouse.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/hv_mouse.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/hv_mouse.c linux-3.0.9/drivers/staging/hv/hv_mouse.c +--- linux-3.0.9/drivers/staging/hv/hv_mouse.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/hv_mouse.c 2011-11-12 12:47:14.000000000 -0500 @@ -879,8 +879,10 @@ static void reportdesc_callback(struct h if (hid_dev) { DPRINT_INFO(INPUTVSC_DRV, "hid_device created"); @@ -34902,9 +34902,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/hv_mouse.c linux-3.0.8/drivers/staging hid_dev->bus = BUS_VIRTUAL; hid_dev->vendor = input_device_ctx->device_info.vendor; -diff -urNp linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h ---- linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h +--- linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/hyperv_vmbus.h 2011-11-12 12:47:14.000000000 -0500 @@ -559,7 +559,7 @@ enum vmbus_connect_state { struct vmbus_connection { enum vmbus_connect_state conn_state; @@ -34914,9 +34914,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/hyperv_vmbus.h linux-3.0.8/drivers/sta /* * Represents channel interrupts. Each bit position represents a -diff -urNp linux-3.0.8/drivers/staging/hv/rndis_filter.c linux-3.0.8/drivers/staging/hv/rndis_filter.c ---- linux-3.0.8/drivers/staging/hv/rndis_filter.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/rndis_filter.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/rndis_filter.c linux-3.0.9/drivers/staging/hv/rndis_filter.c +--- linux-3.0.9/drivers/staging/hv/rndis_filter.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/rndis_filter.c 2011-11-12 12:47:14.000000000 -0500 @@ -43,7 +43,7 @@ struct rndis_device { enum rndis_device_state state; @@ -34944,9 +34944,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/rndis_filter.c linux-3.0.8/drivers/sta /* Ignore return since this msg is optional. */ rndis_filter_send_request(dev, request); -diff -urNp linux-3.0.8/drivers/staging/hv/vmbus_drv.c linux-3.0.8/drivers/staging/hv/vmbus_drv.c ---- linux-3.0.8/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/hv/vmbus_drv.c linux-3.0.9/drivers/staging/hv/vmbus_drv.c +--- linux-3.0.9/drivers/staging/hv/vmbus_drv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/hv/vmbus_drv.c 2011-11-12 12:47:14.000000000 -0500 @@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h { int ret = 0; @@ -34961,9 +34961,9 @@ diff -urNp linux-3.0.8/drivers/staging/hv/vmbus_drv.c linux-3.0.8/drivers/stagin /* The new device belongs to this bus */ child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */ -diff -urNp linux-3.0.8/drivers/staging/iio/ring_generic.h linux-3.0.8/drivers/staging/iio/ring_generic.h ---- linux-3.0.8/drivers/staging/iio/ring_generic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/iio/ring_generic.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/iio/ring_generic.h linux-3.0.9/drivers/staging/iio/ring_generic.h +--- linux-3.0.9/drivers/staging/iio/ring_generic.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/iio/ring_generic.h 2011-11-12 12:47:14.000000000 -0500 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs { int (*is_enabled)(struct iio_ring_buffer *ring); @@ -34973,9 +34973,9 @@ diff -urNp linux-3.0.8/drivers/staging/iio/ring_generic.h linux-3.0.8/drivers/st struct iio_ring_setup_ops { int (*preenable)(struct iio_dev *); -diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet.c linux-3.0.8/drivers/staging/octeon/ethernet.c ---- linux-3.0.8/drivers/staging/octeon/ethernet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/octeon/ethernet.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet.c linux-3.0.9/drivers/staging/octeon/ethernet.c +--- linux-3.0.9/drivers/staging/octeon/ethernet.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/octeon/ethernet.c 2011-11-12 12:47:14.000000000 -0500 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_ * since the RX tasklet also increments it. */ @@ -34992,9 +34992,9 @@ diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet.c linux-3.0.8/drivers/sta #endif } -diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet-rx.c linux-3.0.8/drivers/staging/octeon/ethernet-rx.c ---- linux-3.0.8/drivers/staging/octeon/ethernet-rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/octeon/ethernet-rx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/octeon/ethernet-rx.c linux-3.0.9/drivers/staging/octeon/ethernet-rx.c +--- linux-3.0.9/drivers/staging/octeon/ethernet-rx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/octeon/ethernet-rx.c 2011-11-12 12:47:14.000000000 -0500 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { @@ -35023,9 +35023,9 @@ diff -urNp linux-3.0.8/drivers/staging/octeon/ethernet-rx.c linux-3.0.8/drivers/ #endif dev_kfree_skb_irq(skb); } -diff -urNp linux-3.0.8/drivers/staging/pohmelfs/inode.c linux-3.0.8/drivers/staging/pohmelfs/inode.c ---- linux-3.0.8/drivers/staging/pohmelfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/pohmelfs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/pohmelfs/inode.c linux-3.0.9/drivers/staging/pohmelfs/inode.c +--- linux-3.0.9/drivers/staging/pohmelfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/pohmelfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -35044,9 +35044,9 @@ diff -urNp linux-3.0.8/drivers/staging/pohmelfs/inode.c linux-3.0.8/drivers/stag atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); -diff -urNp linux-3.0.8/drivers/staging/pohmelfs/mcache.c linux-3.0.8/drivers/staging/pohmelfs/mcache.c ---- linux-3.0.8/drivers/staging/pohmelfs/mcache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/pohmelfs/mcache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/pohmelfs/mcache.c linux-3.0.9/drivers/staging/pohmelfs/mcache.c +--- linux-3.0.9/drivers/staging/pohmelfs/mcache.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/pohmelfs/mcache.c 2011-11-12 12:47:14.000000000 -0500 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -35056,9 +35056,9 @@ diff -urNp linux-3.0.8/drivers/staging/pohmelfs/mcache.c linux-3.0.8/drivers/sta mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-3.0.8/drivers/staging/pohmelfs/netfs.h linux-3.0.8/drivers/staging/pohmelfs/netfs.h ---- linux-3.0.8/drivers/staging/pohmelfs/netfs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/pohmelfs/netfs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/pohmelfs/netfs.h linux-3.0.9/drivers/staging/pohmelfs/netfs.h +--- linux-3.0.9/drivers/staging/pohmelfs/netfs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/pohmelfs/netfs.h 2011-11-12 12:47:14.000000000 -0500 @@ -571,14 +571,14 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -35076,9 +35076,9 @@ diff -urNp linux-3.0.8/drivers/staging/pohmelfs/netfs.h linux-3.0.8/drivers/stag unsigned int crypto_attached_size; unsigned int crypto_align_size; -diff -urNp linux-3.0.8/drivers/staging/pohmelfs/trans.c linux-3.0.8/drivers/staging/pohmelfs/trans.c ---- linux-3.0.8/drivers/staging/pohmelfs/trans.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/pohmelfs/trans.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/pohmelfs/trans.c linux-3.0.9/drivers/staging/pohmelfs/trans.c +--- linux-3.0.9/drivers/staging/pohmelfs/trans.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/pohmelfs/trans.c 2011-11-12 12:47:14.000000000 -0500 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran int err; struct netfs_cmd *cmd = t->iovec.iov_base; @@ -35088,9 +35088,9 @@ diff -urNp linux-3.0.8/drivers/staging/pohmelfs/trans.c linux-3.0.8/drivers/stag cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); -diff -urNp linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h ---- linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h +--- linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/rtl8712/rtl871x_io.h 2011-11-12 12:47:14.000000000 -0500 @@ -83,7 +83,7 @@ struct _io_ops { u8 *pmem); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, @@ -35100,9 +35100,9 @@ diff -urNp linux-3.0.8/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.8/drivers/ struct io_req { struct list_head list; -diff -urNp linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c ---- linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c 2011-08-24 18:21:41.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c +--- linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/sbe-2t3e3/netdev.c 2011-11-12 12:47:14.000000000 -0500 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s t3e3_if_config(sc, cmd_2t3e3, (char *)¶m, &resp, &rlen); @@ -35112,9 +35112,9 @@ diff -urNp linux-3.0.8/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.8/drivers/st return -EFAULT; return 0; -diff -urNp linux-3.0.8/drivers/staging/tty/stallion.c linux-3.0.8/drivers/staging/tty/stallion.c ---- linux-3.0.8/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/tty/stallion.c linux-3.0.9/drivers/staging/tty/stallion.c +--- linux-3.0.9/drivers/staging/tty/stallion.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/tty/stallion.c 2011-11-12 12:47:14.000000000 -0500 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp struct stlport stl_dummyport; struct stlport *portp; @@ -35124,9 +35124,9 @@ diff -urNp linux-3.0.8/drivers/staging/tty/stallion.c linux-3.0.8/drivers/stagin if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) return -EFAULT; portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, -diff -urNp linux-3.0.8/drivers/staging/usbip/usbip_common.h linux-3.0.8/drivers/staging/usbip/usbip_common.h ---- linux-3.0.8/drivers/staging/usbip/usbip_common.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/usbip/usbip_common.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/usbip/usbip_common.h linux-3.0.9/drivers/staging/usbip/usbip_common.h +--- linux-3.0.9/drivers/staging/usbip/usbip_common.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/usbip/usbip_common.h 2011-11-12 12:47:14.000000000 -0500 @@ -315,7 +315,7 @@ struct usbip_device { void (*shutdown)(struct usbip_device *); void (*reset)(struct usbip_device *); @@ -35136,9 +35136,9 @@ diff -urNp linux-3.0.8/drivers/staging/usbip/usbip_common.h linux-3.0.8/drivers/ }; void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd, -diff -urNp linux-3.0.8/drivers/staging/usbip/vhci.h linux-3.0.8/drivers/staging/usbip/vhci.h ---- linux-3.0.8/drivers/staging/usbip/vhci.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/usbip/vhci.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/usbip/vhci.h linux-3.0.9/drivers/staging/usbip/vhci.h +--- linux-3.0.9/drivers/staging/usbip/vhci.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/usbip/vhci.h 2011-11-12 12:47:14.000000000 -0500 @@ -94,7 +94,7 @@ struct vhci_hcd { unsigned resuming:1; unsigned long re_timeout; @@ -35148,9 +35148,9 @@ diff -urNp linux-3.0.8/drivers/staging/usbip/vhci.h linux-3.0.8/drivers/staging/ /* * NOTE: -diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_hcd.c linux-3.0.8/drivers/staging/usbip/vhci_hcd.c ---- linux-3.0.8/drivers/staging/usbip/vhci_hcd.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/staging/usbip/vhci_hcd.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_hcd.c linux-3.0.9/drivers/staging/usbip/vhci_hcd.c +--- linux-3.0.9/drivers/staging/usbip/vhci_hcd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/usbip/vhci_hcd.c 2011-11-12 12:47:14.000000000 -0500 @@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb) return; } @@ -35178,9 +35178,9 @@ diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_hcd.c linux-3.0.8/drivers/stag spin_lock_init(&vhci->lock); hcd->power_budget = 0; /* no limit */ -diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_rx.c linux-3.0.8/drivers/staging/usbip/vhci_rx.c ---- linux-3.0.8/drivers/staging/usbip/vhci_rx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/usbip/vhci_rx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/usbip/vhci_rx.c linux-3.0.9/drivers/staging/usbip/vhci_rx.c +--- linux-3.0.9/drivers/staging/usbip/vhci_rx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/usbip/vhci_rx.c 2011-11-12 12:47:14.000000000 -0500 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct if (!urb) { pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum); @@ -35190,9 +35190,9 @@ diff -urNp linux-3.0.8/drivers/staging/usbip/vhci_rx.c linux-3.0.8/drivers/stagi usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; } -diff -urNp linux-3.0.8/drivers/staging/vt6655/hostap.c linux-3.0.8/drivers/staging/vt6655/hostap.c ---- linux-3.0.8/drivers/staging/vt6655/hostap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/vt6655/hostap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/vt6655/hostap.c linux-3.0.9/drivers/staging/vt6655/hostap.c +--- linux-3.0.9/drivers/staging/vt6655/hostap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/vt6655/hostap.c 2011-11-12 12:47:14.000000000 -0500 @@ -79,14 +79,13 @@ static int msglevel * */ @@ -35219,9 +35219,9 @@ diff -urNp linux-3.0.8/drivers/staging/vt6655/hostap.c linux-3.0.8/drivers/stagi pDevice->apdev->netdev_ops = &apdev_netdev_ops; pDevice->apdev->type = ARPHRD_IEEE80211; -diff -urNp linux-3.0.8/drivers/staging/vt6656/hostap.c linux-3.0.8/drivers/staging/vt6656/hostap.c ---- linux-3.0.8/drivers/staging/vt6656/hostap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/vt6656/hostap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/vt6656/hostap.c linux-3.0.9/drivers/staging/vt6656/hostap.c +--- linux-3.0.9/drivers/staging/vt6656/hostap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/vt6656/hostap.c 2011-11-12 12:47:14.000000000 -0500 @@ -80,14 +80,13 @@ static int msglevel * */ @@ -35248,9 +35248,9 @@ diff -urNp linux-3.0.8/drivers/staging/vt6656/hostap.c linux-3.0.8/drivers/stagi pDevice->apdev->netdev_ops = &apdev_netdev_ops; pDevice->apdev->type = ARPHRD_IEEE80211; -diff -urNp linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c ---- linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c +--- linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/wlan-ng/hfa384x_usb.c 2011-11-12 12:47:14.000000000 -0500 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf struct usbctlx_completor { @@ -35260,9 +35260,9 @@ diff -urNp linux-3.0.8/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.8/drivers static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw, -diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.c linux-3.0.8/drivers/staging/zcache/tmem.c ---- linux-3.0.8/drivers/staging/zcache/tmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/zcache/tmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.c linux-3.0.9/drivers/staging/zcache/tmem.c +--- linux-3.0.9/drivers/staging/zcache/tmem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/zcache/tmem.c 2011-11-12 12:47:14.000000000 -0500 @@ -39,7 +39,7 @@ * A tmem host implementation must use this function to register callbacks * for memory allocation. @@ -35281,9 +35281,9 @@ diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.c linux-3.0.8/drivers/staging void tmem_register_pamops(struct tmem_pamops *m) { -diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.h linux-3.0.8/drivers/staging/zcache/tmem.h ---- linux-3.0.8/drivers/staging/zcache/tmem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/staging/zcache/tmem.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/staging/zcache/tmem.h linux-3.0.9/drivers/staging/zcache/tmem.h +--- linux-3.0.9/drivers/staging/zcache/tmem.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/staging/zcache/tmem.h 2011-11-12 12:47:14.000000000 -0500 @@ -171,6 +171,7 @@ struct tmem_pamops { int (*get_data)(struct page *, void *, struct tmem_pool *); void (*free)(void *, struct tmem_pool *); @@ -35300,10 +35300,10 @@ diff -urNp linux-3.0.8/drivers/staging/zcache/tmem.h linux-3.0.8/drivers/staging extern void tmem_register_hostops(struct tmem_hostops *m); /* core tmem accessor functions */ -diff -urNp linux-3.0.8/drivers/target/target_core_alua.c linux-3.0.8/drivers/target/target_core_alua.c ---- linux-3.0.8/drivers/target/target_core_alua.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_alua.c 2011-08-23 21:48:14.000000000 -0400 -@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_ +diff -urNp linux-3.0.9/drivers/target/target_core_alua.c linux-3.0.9/drivers/target/target_core_alua.c +--- linux-3.0.9/drivers/target/target_core_alua.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_alua.c 2011-11-12 12:47:14.000000000 -0500 +@@ -695,6 +695,8 @@ static int core_alua_update_tpg_primary_ char path[ALUA_METADATA_PATH_LEN]; int len; @@ -35312,7 +35312,7 @@ diff -urNp linux-3.0.8/drivers/target/target_core_alua.c linux-3.0.8/drivers/tar memset(path, 0, ALUA_METADATA_PATH_LEN); len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len, -@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar +@@ -958,6 +960,8 @@ static int core_alua_update_tpg_secondar char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN]; int len; @@ -35321,9 +35321,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_alua.c linux-3.0.8/drivers/tar memset(path, 0, ALUA_METADATA_PATH_LEN); memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN); -diff -urNp linux-3.0.8/drivers/target/target_core_cdb.c linux-3.0.8/drivers/target/target_core_cdb.c ---- linux-3.0.8/drivers/target/target_core_cdb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_cdb.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/target/target_core_cdb.c linux-3.0.9/drivers/target/target_core_cdb.c +--- linux-3.0.9/drivers/target/target_core_cdb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_cdb.c 2011-11-12 12:47:14.000000000 -0500 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd * int length = 0; unsigned char buf[SE_MODE_PAGE_BUF]; @@ -35333,9 +35333,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_cdb.c linux-3.0.8/drivers/targ memset(buf, 0, SE_MODE_PAGE_BUF); switch (cdb[2] & 0x3f) { -diff -urNp linux-3.0.8/drivers/target/target_core_configfs.c linux-3.0.8/drivers/target/target_core_configfs.c ---- linux-3.0.8/drivers/target/target_core_configfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_configfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/target/target_core_configfs.c linux-3.0.9/drivers/target/target_core_configfs.c +--- linux-3.0.9/drivers/target/target_core_configfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_configfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a ssize_t len = 0; int reg_count = 0, prf_isid; @@ -35345,9 +35345,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_configfs.c linux-3.0.8/drivers if (!(su_dev->se_dev_ptr)) return -ENODEV; -diff -urNp linux-3.0.8/drivers/target/target_core_pr.c linux-3.0.8/drivers/target/target_core_pr.c ---- linux-3.0.8/drivers/target/target_core_pr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_pr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/target/target_core_pr.c linux-3.0.9/drivers/target/target_core_pr.c +--- linux-3.0.9/drivers/target/target_core_pr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_pr.c 2011-11-12 12:47:14.000000000 -0500 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi unsigned char t_port[PR_APTPL_MAX_TPORT_LEN]; u16 tpgt; @@ -35375,9 +35375,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_pr.c linux-3.0.8/drivers/targe memset(iov, 0, sizeof(struct iovec)); memset(path, 0, 512); -diff -urNp linux-3.0.8/drivers/target/target_core_tmr.c linux-3.0.8/drivers/target/target_core_tmr.c ---- linux-3.0.8/drivers/target/target_core_tmr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_tmr.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/target/target_core_tmr.c linux-3.0.9/drivers/target/target_core_tmr.c +--- linux-3.0.9/drivers/target/target_core_tmr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_tmr.c 2011-11-12 12:47:14.000000000 -0500 @@ -269,7 +269,7 @@ int core_tmr_lun_reset( CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key, T_TASK(cmd)->t_task_cdbs, @@ -35405,9 +35405,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_tmr.c linux-3.0.8/drivers/targ spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count); -diff -urNp linux-3.0.8/drivers/target/target_core_transport.c linux-3.0.8/drivers/target/target_core_transport.c ---- linux-3.0.8/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/target/target_core_transport.c linux-3.0.9/drivers/target/target_core_transport.c +--- linux-3.0.9/drivers/target/target_core_transport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/target/target_core_transport.c 2011-11-12 12:47:14.000000000 -0500 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t dev->queue_depth = dev_limits->queue_depth; @@ -35483,9 +35483,9 @@ diff -urNp linux-3.0.8/drivers/target/target_core_transport.c linux-3.0.8/driver atomic_read(&T_TASK(cmd)->t_transport_active), atomic_read(&T_TASK(cmd)->t_transport_stop), atomic_read(&T_TASK(cmd)->t_transport_sent)); -diff -urNp linux-3.0.8/drivers/telephony/ixj.c linux-3.0.8/drivers/telephony/ixj.c ---- linux-3.0.8/drivers/telephony/ixj.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/telephony/ixj.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/telephony/ixj.c linux-3.0.9/drivers/telephony/ixj.c +--- linux-3.0.9/drivers/telephony/ixj.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/telephony/ixj.c 2011-11-12 12:47:14.000000000 -0500 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) bool mContinue; char *pIn, *pOut; @@ -35495,9 +35495,9 @@ diff -urNp linux-3.0.8/drivers/telephony/ixj.c linux-3.0.8/drivers/telephony/ixj if (!SCI_Prepare(j)) return 0; -diff -urNp linux-3.0.8/drivers/tty/hvc/hvcs.c linux-3.0.8/drivers/tty/hvc/hvcs.c ---- linux-3.0.8/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/hvc/hvcs.c linux-3.0.9/drivers/tty/hvc/hvcs.c +--- linux-3.0.9/drivers/tty/hvc/hvcs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/hvc/hvcs.c 2011-11-12 12:47:14.000000000 -0500 @@ -83,6 +83,7 @@ #include <asm/hvcserver.h> #include <asm/uaccess.h> @@ -35600,9 +35600,9 @@ diff -urNp linux-3.0.8/drivers/tty/hvc/hvcs.c linux-3.0.8/drivers/tty/hvc/hvcs.c return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-3.0.8/drivers/tty/ipwireless/tty.c linux-3.0.8/drivers/tty/ipwireless/tty.c ---- linux-3.0.8/drivers/tty/ipwireless/tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/ipwireless/tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/ipwireless/tty.c linux-3.0.9/drivers/tty/ipwireless/tty.c +--- linux-3.0.9/drivers/tty/ipwireless/tty.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/ipwireless/tty.c 2011-11-12 12:47:14.000000000 -0500 @@ -29,6 +29,7 @@ #include <linux/tty_driver.h> #include <linux/tty_flip.h> @@ -35725,9 +35725,9 @@ diff -urNp linux-3.0.8/drivers/tty/ipwireless/tty.c linux-3.0.8/drivers/tty/ipwi do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-3.0.8/drivers/tty/n_gsm.c linux-3.0.8/drivers/tty/n_gsm.c ---- linux-3.0.8/drivers/tty/n_gsm.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/drivers/tty/n_gsm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/n_gsm.c linux-3.0.9/drivers/tty/n_gsm.c +--- linux-3.0.9/drivers/tty/n_gsm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/n_gsm.c 2011-11-12 12:47:14.000000000 -0500 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s return NULL; spin_lock_init(&dlci->lock); @@ -35737,9 +35737,9 @@ diff -urNp linux-3.0.8/drivers/tty/n_gsm.c linux-3.0.8/drivers/tty/n_gsm.c kfree(dlci); return NULL; } -diff -urNp linux-3.0.8/drivers/tty/n_tty.c linux-3.0.8/drivers/tty/n_tty.c ---- linux-3.0.8/drivers/tty/n_tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/n_tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/n_tty.c linux-3.0.9/drivers/tty/n_tty.c +--- linux-3.0.9/drivers/tty/n_tty.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/n_tty.c 2011-11-12 12:47:14.000000000 -0500 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ { *ops = tty_ldisc_N_TTY; @@ -35749,10 +35749,10 @@ diff -urNp linux-3.0.8/drivers/tty/n_tty.c linux-3.0.8/drivers/tty/n_tty.c + ops->flags = 0; } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); -diff -urNp linux-3.0.8/drivers/tty/pty.c linux-3.0.8/drivers/tty/pty.c ---- linux-3.0.8/drivers/tty/pty.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/tty/pty.c 2011-10-16 21:55:28.000000000 -0400 -@@ -767,8 +767,10 @@ static void __init unix98_pty_init(void) +diff -urNp linux-3.0.9/drivers/tty/pty.c linux-3.0.9/drivers/tty/pty.c +--- linux-3.0.9/drivers/tty/pty.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/pty.c 2011-11-12 12:47:14.000000000 -0500 +@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void) register_sysctl_table(pty_root_table); /* Now create the /dev/ptmx special device */ @@ -35764,9 +35764,9 @@ diff -urNp linux-3.0.8/drivers/tty/pty.c linux-3.0.8/drivers/tty/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || -diff -urNp linux-3.0.8/drivers/tty/rocket.c linux-3.0.8/drivers/tty/rocket.c ---- linux-3.0.8/drivers/tty/rocket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/rocket.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/rocket.c linux-3.0.9/drivers/tty/rocket.c +--- linux-3.0.9/drivers/tty/rocket.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/rocket.c 2011-11-12 12:47:14.000000000 -0500 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info struct rocket_ports tmp; int board; @@ -35776,9 +35776,9 @@ diff -urNp linux-3.0.8/drivers/tty/rocket.c linux-3.0.8/drivers/tty/rocket.c if (!retports) return -EFAULT; memset(&tmp, 0, sizeof (tmp)); -diff -urNp linux-3.0.8/drivers/tty/serial/kgdboc.c linux-3.0.8/drivers/tty/serial/kgdboc.c ---- linux-3.0.8/drivers/tty/serial/kgdboc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/serial/kgdboc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/serial/kgdboc.c linux-3.0.9/drivers/tty/serial/kgdboc.c +--- linux-3.0.9/drivers/tty/serial/kgdboc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/serial/kgdboc.c 2011-11-12 12:47:14.000000000 -0500 @@ -23,8 +23,9 @@ #define MAX_CONFIG_LEN 40 @@ -35877,9 +35877,9 @@ diff -urNp linux-3.0.8/drivers/tty/serial/kgdboc.c linux-3.0.8/drivers/tty/seria #ifdef CONFIG_KGDB_SERIAL_CONSOLE /* This is only available if kgdboc is a built in for early debugging */ static int __init kgdboc_early_init(char *opt) -diff -urNp linux-3.0.8/drivers/tty/serial/mfd.c linux-3.0.8/drivers/tty/serial/mfd.c ---- linux-3.0.8/drivers/tty/serial/mfd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/serial/mfd.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/serial/mfd.c linux-3.0.9/drivers/tty/serial/mfd.c +--- linux-3.0.9/drivers/tty/serial/mfd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/serial/mfd.c 2011-11-12 12:47:14.000000000 -0500 @@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci } @@ -35889,9 +35889,9 @@ diff -urNp linux-3.0.8/drivers/tty/serial/mfd.c linux-3.0.8/drivers/tty/serial/m { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) }, -diff -urNp linux-3.0.8/drivers/tty/serial/mrst_max3110.c linux-3.0.8/drivers/tty/serial/mrst_max3110.c ---- linux-3.0.8/drivers/tty/serial/mrst_max3110.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/tty/serial/mrst_max3110.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/serial/mrst_max3110.c linux-3.0.9/drivers/tty/serial/mrst_max3110.c +--- linux-3.0.9/drivers/tty/serial/mrst_max3110.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/serial/mrst_max3110.c 2011-11-12 12:47:14.000000000 -0500 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u int loop = 1, num, total = 0; u8 recv_buf[512], *pbuf; @@ -35901,10 +35901,10 @@ diff -urNp linux-3.0.8/drivers/tty/serial/mrst_max3110.c linux-3.0.8/drivers/tty pbuf = recv_buf; do { num = max3110_read_multi(max, pbuf); -diff -urNp linux-3.0.8/drivers/tty/tty_io.c linux-3.0.8/drivers/tty/tty_io.c ---- linux-3.0.8/drivers/tty/tty_io.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/drivers/tty/tty_io.c 2011-10-16 21:55:28.000000000 -0400 -@@ -3214,7 +3214,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); +diff -urNp linux-3.0.9/drivers/tty/tty_io.c linux-3.0.9/drivers/tty/tty_io.c +--- linux-3.0.9/drivers/tty/tty_io.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/tty_io.c 2011-11-12 12:47:14.000000000 -0500 +@@ -3238,7 +3238,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); void tty_default_fops(struct file_operations *fops) { @@ -35913,9 +35913,9 @@ diff -urNp linux-3.0.8/drivers/tty/tty_io.c linux-3.0.8/drivers/tty/tty_io.c } /* -diff -urNp linux-3.0.8/drivers/tty/tty_ldisc.c linux-3.0.8/drivers/tty/tty_ldisc.c ---- linux-3.0.8/drivers/tty/tty_ldisc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/tty_ldisc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/tty_ldisc.c linux-3.0.9/drivers/tty/tty_ldisc.c +--- linux-3.0.9/drivers/tty/tty_ldisc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/tty_ldisc.c 2011-11-12 12:47:14.000000000 -0500 @@ -74,7 +74,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; @@ -35961,9 +35961,9 @@ diff -urNp linux-3.0.8/drivers/tty/tty_ldisc.c linux-3.0.8/drivers/tty/tty_ldisc module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-3.0.8/drivers/tty/vt/keyboard.c linux-3.0.8/drivers/tty/vt/keyboard.c ---- linux-3.0.8/drivers/tty/vt/keyboard.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/vt/keyboard.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/vt/keyboard.c linux-3.0.9/drivers/tty/vt/keyboard.c +--- linux-3.0.9/drivers/tty/vt/keyboard.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/vt/keyboard.c 2011-11-12 12:47:14.000000000 -0500 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_OFF) && value != KVAL(K_SAK)) @@ -35981,9 +35981,9 @@ diff -urNp linux-3.0.8/drivers/tty/vt/keyboard.c linux-3.0.8/drivers/tty/vt/keyb fn_handler[value](vc); } -diff -urNp linux-3.0.8/drivers/tty/vt/vt.c linux-3.0.8/drivers/tty/vt/vt.c ---- linux-3.0.8/drivers/tty/vt/vt.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/vt/vt.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/vt/vt.c linux-3.0.9/drivers/tty/vt/vt.c +--- linux-3.0.9/drivers/tty/vt/vt.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/vt/vt.c 2011-11-12 12:47:14.000000000 -0500 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier static void notify_write(struct vc_data *vc, unsigned int unicode) @@ -35993,9 +35993,9 @@ diff -urNp linux-3.0.8/drivers/tty/vt/vt.c linux-3.0.8/drivers/tty/vt/vt.c atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); } -diff -urNp linux-3.0.8/drivers/tty/vt/vt_ioctl.c linux-3.0.8/drivers/tty/vt/vt_ioctl.c ---- linux-3.0.8/drivers/tty/vt/vt_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/tty/vt/vt_ioctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/tty/vt/vt_ioctl.c linux-3.0.9/drivers/tty/vt/vt_ioctl.c +--- linux-3.0.9/drivers/tty/vt/vt_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/tty/vt/vt_ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -36036,9 +36036,9 @@ diff -urNp linux-3.0.8/drivers/tty/vt/vt_ioctl.c linux-3.0.8/drivers/tty/vt/vt_i if (!perm) { ret = -EPERM; goto reterr; -diff -urNp linux-3.0.8/drivers/uio/uio.c linux-3.0.8/drivers/uio/uio.c ---- linux-3.0.8/drivers/uio/uio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/uio/uio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/uio/uio.c linux-3.0.9/drivers/uio/uio.c +--- linux-3.0.9/drivers/uio/uio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/uio/uio.c 2011-11-12 12:47:14.000000000 -0500 @@ -25,6 +25,7 @@ #include <linux/kobject.h> #include <linux/cdev.h> @@ -36130,9 +36130,9 @@ diff -urNp linux-3.0.8/drivers/uio/uio.c linux-3.0.8/drivers/uio/uio.c ret = uio_get_minor(idev); if (ret) -diff -urNp linux-3.0.8/drivers/usb/atm/cxacru.c linux-3.0.8/drivers/usb/atm/cxacru.c ---- linux-3.0.8/drivers/usb/atm/cxacru.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/atm/cxacru.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/atm/cxacru.c linux-3.0.9/drivers/usb/atm/cxacru.c +--- linux-3.0.9/drivers/usb/atm/cxacru.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/atm/cxacru.c 2011-11-12 12:47:14.000000000 -0500 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp); if (ret < 2) @@ -36142,9 +36142,9 @@ diff -urNp linux-3.0.8/drivers/usb/atm/cxacru.c linux-3.0.8/drivers/usb/atm/cxac return -EINVAL; pos += tmp; -diff -urNp linux-3.0.8/drivers/usb/atm/usbatm.c linux-3.0.8/drivers/usb/atm/usbatm.c ---- linux-3.0.8/drivers/usb/atm/usbatm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/atm/usbatm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/atm/usbatm.c linux-3.0.9/drivers/usb/atm/usbatm.c +--- linux-3.0.9/drivers/usb/atm/usbatm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/atm/usbatm.c 2011-11-12 12:47:14.000000000 -0500 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -36224,9 +36224,9 @@ diff -urNp linux-3.0.8/drivers/usb/atm/usbatm.c linux-3.0.8/drivers/usb/atm/usba if (!left--) { if (instance->disconnected) -diff -urNp linux-3.0.8/drivers/usb/core/devices.c linux-3.0.8/drivers/usb/core/devices.c ---- linux-3.0.8/drivers/usb/core/devices.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/core/devices.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/core/devices.c linux-3.0.9/drivers/usb/core/devices.c +--- linux-3.0.9/drivers/usb/core/devices.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/core/devices.c 2011-11-12 12:47:14.000000000 -0500 @@ -126,7 +126,7 @@ static const char format_endpt[] = * time it gets called. */ @@ -36254,9 +36254,9 @@ diff -urNp linux-3.0.8/drivers/usb/core/devices.c linux-3.0.8/drivers/usb/core/d if (file->f_version != event_count) { file->f_version = event_count; return POLLIN | POLLRDNORM; -diff -urNp linux-3.0.8/drivers/usb/core/message.c linux-3.0.8/drivers/usb/core/message.c ---- linux-3.0.8/drivers/usb/core/message.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/core/message.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/core/message.c linux-3.0.9/drivers/usb/core/message.c +--- linux-3.0.9/drivers/usb/core/message.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/core/message.c 2011-11-12 12:47:14.000000000 -0500 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -36268,9 +36268,9 @@ diff -urNp linux-3.0.8/drivers/usb/core/message.c linux-3.0.8/drivers/usb/core/m if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-3.0.8/drivers/usb/early/ehci-dbgp.c linux-3.0.8/drivers/usb/early/ehci-dbgp.c ---- linux-3.0.8/drivers/usb/early/ehci-dbgp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/early/ehci-dbgp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/early/ehci-dbgp.c linux-3.0.9/drivers/usb/early/ehci-dbgp.c +--- linux-3.0.9/drivers/usb/early/ehci-dbgp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/early/ehci-dbgp.c 2011-11-12 12:47:14.000000000 -0500 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, #ifdef CONFIG_KGDB @@ -36308,10 +36308,10 @@ diff -urNp linux-3.0.8/drivers/usb/early/ehci-dbgp.c linux-3.0.8/drivers/usb/ear return 0; } -diff -urNp linux-3.0.8/drivers/usb/host/xhci-mem.c linux-3.0.8/drivers/usb/host/xhci-mem.c ---- linux-3.0.8/drivers/usb/host/xhci-mem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/host/xhci-mem.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str +diff -urNp linux-3.0.9/drivers/usb/host/xhci-mem.c linux-3.0.9/drivers/usb/host/xhci-mem.c +--- linux-3.0.9/drivers/usb/host/xhci-mem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/host/xhci-mem.c 2011-11-12 12:47:14.000000000 -0500 +@@ -1690,6 +1690,8 @@ static int xhci_check_trb_in_td_math(str unsigned int num_tests; int i, ret; @@ -36320,9 +36320,9 @@ diff -urNp linux-3.0.8/drivers/usb/host/xhci-mem.c linux-3.0.8/drivers/usb/host/ num_tests = ARRAY_SIZE(simple_test_vector); for (i = 0; i < num_tests; i++) { ret = xhci_test_trb_in_td(xhci, -diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-hc.h linux-3.0.8/drivers/usb/wusbcore/wa-hc.h ---- linux-3.0.8/drivers/usb/wusbcore/wa-hc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/wusbcore/wa-hc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-hc.h linux-3.0.9/drivers/usb/wusbcore/wa-hc.h +--- linux-3.0.9/drivers/usb/wusbcore/wa-hc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/wusbcore/wa-hc.h 2011-11-12 12:47:14.000000000 -0500 @@ -192,7 +192,7 @@ struct wahc { struct list_head xfer_delayed_list; spinlock_t xfer_list_lock; @@ -36341,9 +36341,9 @@ diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-hc.h linux-3.0.8/drivers/usb/wusb } /** -diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c ---- linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c +--- linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/usb/wusbcore/wa-xfer.c 2011-11-12 12:47:14.000000000 -0500 @@ -294,7 +294,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) @@ -36353,9 +36353,9 @@ diff -urNp linux-3.0.8/drivers/usb/wusbcore/wa-xfer.c linux-3.0.8/drivers/usb/wu } /* -diff -urNp linux-3.0.8/drivers/vhost/vhost.c linux-3.0.8/drivers/vhost/vhost.c ---- linux-3.0.8/drivers/vhost/vhost.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/vhost/vhost.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/vhost/vhost.c linux-3.0.9/drivers/vhost/vhost.c +--- linux-3.0.9/drivers/vhost/vhost.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/vhost/vhost.c 2011-11-12 12:47:14.000000000 -0500 @@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu return get_user(vq->last_used_idx, &used->idx); } @@ -36365,9 +36365,9 @@ diff -urNp linux-3.0.8/drivers/vhost/vhost.c linux-3.0.8/drivers/vhost/vhost.c { struct file *eventfp, *filep = NULL, *pollstart = NULL, *pollstop = NULL; -diff -urNp linux-3.0.8/drivers/video/aty/aty128fb.c linux-3.0.8/drivers/video/aty/aty128fb.c ---- linux-3.0.8/drivers/video/aty/aty128fb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/aty/aty128fb.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/aty/aty128fb.c linux-3.0.9/drivers/video/aty/aty128fb.c +--- linux-3.0.9/drivers/video/aty/aty128fb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/aty/aty128fb.c 2011-11-12 12:47:14.000000000 -0500 @@ -148,7 +148,7 @@ enum { }; @@ -36377,9 +36377,9 @@ diff -urNp linux-3.0.8/drivers/video/aty/aty128fb.c linux-3.0.8/drivers/video/at "AGP", "PCI", "PRO AGP", -diff -urNp linux-3.0.8/drivers/video/fbcmap.c linux-3.0.8/drivers/video/fbcmap.c ---- linux-3.0.8/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/fbcmap.c linux-3.0.9/drivers/video/fbcmap.c +--- linux-3.0.9/drivers/video/fbcmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/fbcmap.c 2011-11-12 12:47:14.000000000 -0500 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user rc = -ENODEV; goto out; @@ -36390,9 +36390,9 @@ diff -urNp linux-3.0.8/drivers/video/fbcmap.c linux-3.0.8/drivers/video/fbcmap.c rc = -EINVAL; goto out1; } -diff -urNp linux-3.0.8/drivers/video/fbmem.c linux-3.0.8/drivers/video/fbmem.c ---- linux-3.0.8/drivers/video/fbmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/fbmem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/fbmem.c linux-3.0.9/drivers/video/fbmem.c +--- linux-3.0.9/drivers/video/fbmem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/fbmem.c 2011-11-12 12:47:14.000000000 -0500 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -36438,9 +36438,9 @@ diff -urNp linux-3.0.8/drivers/video/fbmem.c linux-3.0.8/drivers/video/fbmem.c return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-3.0.8/drivers/video/geode/gx1fb_core.c linux-3.0.8/drivers/video/geode/gx1fb_core.c ---- linux-3.0.8/drivers/video/geode/gx1fb_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/geode/gx1fb_core.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/geode/gx1fb_core.c linux-3.0.9/drivers/video/geode/gx1fb_core.c +--- linux-3.0.9/drivers/video/geode/gx1fb_core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/geode/gx1fb_core.c 2011-11-12 12:47:14.000000000 -0500 @@ -29,7 +29,7 @@ static int crt_option = 1; static char panel_option[32] = ""; @@ -36450,9 +36450,9 @@ diff -urNp linux-3.0.8/drivers/video/geode/gx1fb_core.c linux-3.0.8/drivers/vide /* 640x480-60 VESA */ { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, -diff -urNp linux-3.0.8/drivers/video/gxt4500.c linux-3.0.8/drivers/video/gxt4500.c ---- linux-3.0.8/drivers/video/gxt4500.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/gxt4500.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/gxt4500.c linux-3.0.9/drivers/video/gxt4500.c +--- linux-3.0.9/drivers/video/gxt4500.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/gxt4500.c 2011-11-12 12:47:14.000000000 -0500 @@ -156,7 +156,7 @@ struct gxt4500_par { static char *mode_option; @@ -36471,9 +36471,9 @@ diff -urNp linux-3.0.8/drivers/video/gxt4500.c linux-3.0.8/drivers/video/gxt4500 .id = "IBM GXT4500P", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_PSEUDOCOLOR, -diff -urNp linux-3.0.8/drivers/video/i810/i810_accel.c linux-3.0.8/drivers/video/i810/i810_accel.c ---- linux-3.0.8/drivers/video/i810/i810_accel.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/i810/i810_accel.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/i810/i810_accel.c linux-3.0.9/drivers/video/i810/i810_accel.c +--- linux-3.0.9/drivers/video/i810/i810_accel.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/i810/i810_accel.c 2011-11-12 12:47:14.000000000 -0500 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -36482,9 +36482,9 @@ diff -urNp linux-3.0.8/drivers/video/i810/i810_accel.c linux-3.0.8/drivers/video i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-3.0.8/drivers/video/i810/i810_main.c linux-3.0.8/drivers/video/i810/i810_main.c ---- linux-3.0.8/drivers/video/i810/i810_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/i810/i810_main.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/i810/i810_main.c linux-3.0.9/drivers/video/i810/i810_main.c +--- linux-3.0.9/drivers/video/i810/i810_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/i810/i810_main.c 2011-11-12 12:47:14.000000000 -0500 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_ static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par); @@ -36494,9 +36494,9 @@ diff -urNp linux-3.0.8/drivers/video/i810/i810_main.c linux-3.0.8/drivers/video/ "Intel(R) 810 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810E Framebuffer Device" , -diff -urNp linux-3.0.8/drivers/video/jz4740_fb.c linux-3.0.8/drivers/video/jz4740_fb.c ---- linux-3.0.8/drivers/video/jz4740_fb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/jz4740_fb.c 2011-10-11 10:44:33.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/jz4740_fb.c linux-3.0.9/drivers/video/jz4740_fb.c +--- linux-3.0.9/drivers/video/jz4740_fb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/jz4740_fb.c 2011-11-12 12:47:14.000000000 -0500 @@ -136,7 +136,7 @@ struct jzfb { uint32_t pseudo_palette[16]; }; @@ -36506,9 +36506,9 @@ diff -urNp linux-3.0.8/drivers/video/jz4740_fb.c linux-3.0.8/drivers/video/jz474 .id = "JZ4740 FB", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, -diff -urNp linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm 2011-08-29 23:49:40.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/logo/logo_linux_clut224.ppm 2011-11-12 12:47:14.000000000 -0500 @@ -1,1604 +1,1123 @@ P3 -# Standard 224-color Linux logo @@ -39234,9 +39234,9 @@ diff -urNp linux-3.0.8/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.8/dri +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 -diff -urNp linux-3.0.8/drivers/video/udlfb.c linux-3.0.8/drivers/video/udlfb.c ---- linux-3.0.8/drivers/video/udlfb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/udlfb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/udlfb.c linux-3.0.9/drivers/video/udlfb.c +--- linux-3.0.9/drivers/video/udlfb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/udlfb.c 2011-11-12 12:47:14.000000000 -0500 @@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data dlfb_urb_completion(urb); @@ -39320,9 +39320,9 @@ diff -urNp linux-3.0.8/drivers/video/udlfb.c linux-3.0.8/drivers/video/udlfb.c return count; } -diff -urNp linux-3.0.8/drivers/video/uvesafb.c linux-3.0.8/drivers/video/uvesafb.c ---- linux-3.0.8/drivers/video/uvesafb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/uvesafb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/uvesafb.c linux-3.0.9/drivers/video/uvesafb.c +--- linux-3.0.9/drivers/video/uvesafb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/uvesafb.c 2011-11-12 12:47:14.000000000 -0500 @@ -19,6 +19,7 @@ #include <linux/io.h> #include <linux/mutex.h> @@ -39398,9 +39398,9 @@ diff -urNp linux-3.0.8/drivers/video/uvesafb.c linux-3.0.8/drivers/video/uvesafb } framebuffer_release(info); -diff -urNp linux-3.0.8/drivers/video/vesafb.c linux-3.0.8/drivers/video/vesafb.c ---- linux-3.0.8/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/vesafb.c linux-3.0.9/drivers/video/vesafb.c +--- linux-3.0.9/drivers/video/vesafb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/vesafb.c 2011-11-12 12:47:14.000000000 -0500 @@ -9,6 +9,7 @@ */ @@ -39503,9 +39503,9 @@ diff -urNp linux-3.0.8/drivers/video/vesafb.c linux-3.0.8/drivers/video/vesafb.c if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-3.0.8/drivers/video/via/via_clock.h linux-3.0.8/drivers/video/via/via_clock.h ---- linux-3.0.8/drivers/video/via/via_clock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/video/via/via_clock.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/drivers/video/via/via_clock.h linux-3.0.9/drivers/video/via/via_clock.h +--- linux-3.0.9/drivers/video/via/via_clock.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/video/via/via_clock.h 2011-11-12 12:47:14.000000000 -0500 @@ -56,7 +56,7 @@ struct via_clock { void (*set_engine_pll_state)(u8 state); @@ -39515,9 +39515,9 @@ diff -urNp linux-3.0.8/drivers/video/via/via_clock.h linux-3.0.8/drivers/video/v static inline u32 get_pll_internal_frequency(u32 ref_freq, -diff -urNp linux-3.0.8/drivers/virtio/virtio_balloon.c linux-3.0.8/drivers/virtio/virtio_balloon.c ---- linux-3.0.8/drivers/virtio/virtio_balloon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/drivers/virtio/virtio_balloon.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/drivers/virtio/virtio_balloon.c linux-3.0.9/drivers/virtio/virtio_balloon.c +--- linux-3.0.9/drivers/virtio/virtio_balloon.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/drivers/virtio/virtio_balloon.c 2011-11-12 12:47:14.000000000 -0500 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct struct sysinfo i; int idx = 0; @@ -39527,9 +39527,9 @@ diff -urNp linux-3.0.8/drivers/virtio/virtio_balloon.c linux-3.0.8/drivers/virti all_vm_events(events); si_meminfo(&i); -diff -urNp linux-3.0.8/fs/9p/vfs_inode.c linux-3.0.8/fs/9p/vfs_inode.c ---- linux-3.0.8/fs/9p/vfs_inode.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/fs/9p/vfs_inode.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/fs/9p/vfs_inode.c linux-3.0.9/fs/9p/vfs_inode.c +--- linux-3.0.9/fs/9p/vfs_inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/9p/vfs_inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -1264,7 +1264,7 @@ static void *v9fs_vfs_follow_link(struct void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -39539,9 +39539,9 @@ diff -urNp linux-3.0.8/fs/9p/vfs_inode.c linux-3.0.8/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-3.0.8/fs/aio.c linux-3.0.8/fs/aio.c ---- linux-3.0.8/fs/aio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/aio.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/aio.c linux-3.0.9/fs/aio.c +--- linux-3.0.9/fs/aio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/aio.c 2011-11-12 12:47:14.000000000 -0500 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -39590,9 +39590,9 @@ diff -urNp linux-3.0.8/fs/aio.c linux-3.0.8/fs/aio.c kiocb->ki_nr_segs = kiocb->ki_nbytes; kiocb->ki_cur_seg = 0; /* ki_nbytes/left now reflect bytes instead of segs */ -diff -urNp linux-3.0.8/fs/attr.c linux-3.0.8/fs/attr.c ---- linux-3.0.8/fs/attr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/attr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/attr.c linux-3.0.9/fs/attr.c +--- linux-3.0.9/fs/attr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/attr.c 2011-11-12 12:47:14.000000000 -0500 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -39601,9 +39601,9 @@ diff -urNp linux-3.0.8/fs/attr.c linux-3.0.8/fs/attr.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -diff -urNp linux-3.0.8/fs/autofs4/waitq.c linux-3.0.8/fs/autofs4/waitq.c ---- linux-3.0.8/fs/autofs4/waitq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/autofs4/waitq.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/autofs4/waitq.c linux-3.0.9/fs/autofs4/waitq.c +--- linux-3.0.9/fs/autofs4/waitq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/autofs4/waitq.c 2011-11-12 12:47:14.000000000 -0500 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi { unsigned long sigpipe, flags; @@ -39613,9 +39613,9 @@ diff -urNp linux-3.0.8/fs/autofs4/waitq.c linux-3.0.8/fs/autofs4/waitq.c ssize_t wr = 0; /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/ -diff -urNp linux-3.0.8/fs/befs/linuxvfs.c linux-3.0.8/fs/befs/linuxvfs.c ---- linux-3.0.8/fs/befs/linuxvfs.c 2011-10-24 08:05:23.000000000 -0400 -+++ linux-3.0.8/fs/befs/linuxvfs.c 2011-08-29 23:26:27.000000000 -0400 +diff -urNp linux-3.0.9/fs/befs/linuxvfs.c linux-3.0.9/fs/befs/linuxvfs.c +--- linux-3.0.9/fs/befs/linuxvfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/befs/linuxvfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -39625,9 +39625,9 @@ diff -urNp linux-3.0.8/fs/befs/linuxvfs.c linux-3.0.8/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-3.0.8/fs/binfmt_aout.c linux-3.0.8/fs/binfmt_aout.c ---- linux-3.0.8/fs/binfmt_aout.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/binfmt_aout.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/binfmt_aout.c linux-3.0.9/fs/binfmt_aout.c +--- linux-3.0.9/fs/binfmt_aout.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/binfmt_aout.c 2011-11-12 12:47:14.000000000 -0500 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -39704,9 +39704,9 @@ diff -urNp linux-3.0.8/fs/binfmt_aout.c linux-3.0.8/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c ---- linux-3.0.8/fs/binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/binfmt_elf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/binfmt_elf.c linux-3.0.9/fs/binfmt_elf.c +--- linux-3.0.9/fs/binfmt_elf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/binfmt_elf.c 2011-11-12 12:47:14.000000000 -0500 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump #define elf_core_dump NULL #endif @@ -40140,7 +40140,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; -@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_ +@@ -809,6 +1096,20 @@ static int load_elf_binary(struct linux_ #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif @@ -40161,7 +40161,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, -@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_ +@@ -841,9 +1142,9 @@ static int load_elf_binary(struct linux_ * allowed task size. Note that p_filesz must always be * <= p_memsz so it is only necessary to check p_memsz. */ @@ -40174,7 +40174,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c /* set_brk can never work. Avoid overflows. */ send_sig(SIGKILL, current, 0); retval = -EINVAL; -@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_ +@@ -871,6 +1172,11 @@ static int load_elf_binary(struct linux_ start_data += load_bias; end_data += load_bias; @@ -40186,7 +40186,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c /* Calling set_brk effectively mmaps the pages that we need * for the bss and break sections. We must do this before * mapping in the interpreter, to make sure it doesn't wind -@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_ +@@ -882,9 +1188,11 @@ static int load_elf_binary(struct linux_ goto out_free_dentry; } if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { @@ -40201,7 +40201,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c } if (elf_interpreter) { -@@ -1090,7 +1398,7 @@ out: +@@ -1099,7 +1407,7 @@ out: * Decide what to dump of a segment, part, all or none. */ static unsigned long vma_dump_size(struct vm_area_struct *vma, @@ -40210,7 +40210,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) -@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struc +@@ -1133,7 +1441,7 @@ static unsigned long vma_dump_size(struc if (vma->vm_file == NULL) return 0; @@ -40219,7 +40219,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c goto whole; /* -@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelf +@@ -1355,9 +1663,9 @@ static void fill_auxv_note(struct memelf { elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; int i = 0; @@ -40231,7 +40231,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } -@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfh +@@ -1863,14 +2171,14 @@ static void fill_extnum_info(struct elfh } static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma, @@ -40248,7 +40248,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c return size; } -@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump +@@ -1964,7 +2272,7 @@ static int elf_core_dump(struct coredump dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE); @@ -40257,7 +40257,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c offset += elf_core_extra_data_size(); e_shoff = offset; -@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump +@@ -1978,10 +2286,12 @@ static int elf_core_dump(struct coredump offset = dataoff; size += sizeof(*elf); @@ -40270,7 +40270,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note))) goto end_coredump; -@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump +@@ -1995,7 +2305,7 @@ static int elf_core_dump(struct coredump phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -40279,7 +40279,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c phdr.p_memsz = vma->vm_end - vma->vm_start; offset += phdr.p_filesz; phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; -@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump +@@ -2006,6 +2316,7 @@ static int elf_core_dump(struct coredump phdr.p_align = ELF_EXEC_PAGESIZE; size += sizeof(phdr); @@ -40287,7 +40287,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, &phdr, sizeof(phdr))) goto end_coredump; -@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump +@@ -2030,7 +2341,7 @@ static int elf_core_dump(struct coredump unsigned long addr; unsigned long end; @@ -40296,7 +40296,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump +@@ -2039,6 +2350,7 @@ static int elf_core_dump(struct coredump page = get_dump_page(addr); if (page) { void *kaddr = kmap(page); @@ -40304,7 +40304,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c stop = ((size += PAGE_SIZE) > cprm->limit) || !dump_write(cprm->file, kaddr, PAGE_SIZE); -@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump +@@ -2056,6 +2368,7 @@ static int elf_core_dump(struct coredump if (e_phnum == PN_XNUM) { size += sizeof(*shdr4extnum); @@ -40312,7 +40312,7 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c if (size > cprm->limit || !dump_write(cprm->file, shdr4extnum, sizeof(*shdr4extnum))) -@@ -2067,6 +2380,97 @@ out: +@@ -2076,6 +2389,97 @@ out: #endif /* CONFIG_ELF_CORE */ @@ -40410,9 +40410,9 @@ diff -urNp linux-3.0.8/fs/binfmt_elf.c linux-3.0.8/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-3.0.8/fs/binfmt_flat.c linux-3.0.8/fs/binfmt_flat.c ---- linux-3.0.8/fs/binfmt_flat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/binfmt_flat.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/binfmt_flat.c linux-3.0.9/fs/binfmt_flat.c +--- linux-3.0.9/fs/binfmt_flat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/binfmt_flat.c 2011-11-12 12:47:14.000000000 -0500 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", @@ -40445,9 +40445,9 @@ diff -urNp linux-3.0.8/fs/binfmt_flat.c linux-3.0.8/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-3.0.8/fs/bio.c linux-3.0.8/fs/bio.c ---- linux-3.0.8/fs/bio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/bio.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/bio.c linux-3.0.9/fs/bio.c +--- linux-3.0.9/fs/bio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/bio.c 2011-11-12 12:47:14.000000000 -0500 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b const int read = bio_data_dir(bio) == READ; struct bio_map_data *bmd = bio->bi_private; @@ -40457,9 +40457,9 @@ diff -urNp linux-3.0.8/fs/bio.c linux-3.0.8/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-3.0.8/fs/block_dev.c linux-3.0.8/fs/block_dev.c ---- linux-3.0.8/fs/block_dev.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/fs/block_dev.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/fs/block_dev.c linux-3.0.9/fs/block_dev.c +--- linux-3.0.9/fs/block_dev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/block_dev.c 2011-11-12 12:47:14.000000000 -0500 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de else if (bdev->bd_contains == bdev) return true; /* is a whole device which isn't held */ @@ -40469,9 +40469,9 @@ diff -urNp linux-3.0.8/fs/block_dev.c linux-3.0.8/fs/block_dev.c return true; /* is a partition of a device that is being partitioned */ else if (whole->bd_holder != NULL) return false; /* is a partition of a held device */ -diff -urNp linux-3.0.8/fs/btrfs/ctree.c linux-3.0.8/fs/btrfs/ctree.c ---- linux-3.0.8/fs/btrfs/ctree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/btrfs/ctree.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/btrfs/ctree.c linux-3.0.9/fs/btrfs/ctree.c +--- linux-3.0.9/fs/btrfs/ctree.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/btrfs/ctree.c 2011-11-12 12:47:14.000000000 -0500 @@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st free_extent_buffer(buf); add_root_to_dirty_list(root); @@ -40488,9 +40488,9 @@ diff -urNp linux-3.0.8/fs/btrfs/ctree.c linux-3.0.8/fs/btrfs/ctree.c parent_start = 0; WARN_ON(trans->transid != btrfs_header_generation(parent)); -diff -urNp linux-3.0.8/fs/btrfs/inode.c linux-3.0.8/fs/btrfs/inode.c ---- linux-3.0.8/fs/btrfs/inode.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/fs/btrfs/inode.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/fs/btrfs/inode.c linux-3.0.9/fs/btrfs/inode.c +--- linux-3.0.9/fs/btrfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/btrfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -6896,7 +6896,7 @@ fail: return -ENOMEM; } @@ -40515,9 +40515,9 @@ diff -urNp linux-3.0.8/fs/btrfs/inode.c linux-3.0.8/fs/btrfs/inode.c /* * If a file is moved, it will inherit the cow and compression flags of the new * directory. -diff -urNp linux-3.0.8/fs/btrfs/ioctl.c linux-3.0.8/fs/btrfs/ioctl.c ---- linux-3.0.8/fs/btrfs/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/btrfs/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/btrfs/ioctl.c linux-3.0.9/fs/btrfs/ioctl.c +--- linux-3.0.9/fs/btrfs/ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/btrfs/ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs for (i = 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -40548,9 +40548,9 @@ diff -urNp linux-3.0.8/fs/btrfs/ioctl.c linux-3.0.8/fs/btrfs/ioctl.c (arg + sizeof(struct btrfs_ioctl_space_args)); if (copy_to_user(user_dest, dest_orig, alloc_size)) -diff -urNp linux-3.0.8/fs/btrfs/relocation.c linux-3.0.8/fs/btrfs/relocation.c ---- linux-3.0.8/fs/btrfs/relocation.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/btrfs/relocation.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/btrfs/relocation.c linux-3.0.9/fs/btrfs/relocation.c +--- linux-3.0.9/fs/btrfs/relocation.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/btrfs/relocation.c 2011-11-12 12:47:14.000000000 -0500 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt } spin_unlock(&rc->reloc_root_tree.lock); @@ -40560,9 +40560,9 @@ diff -urNp linux-3.0.8/fs/btrfs/relocation.c linux-3.0.8/fs/btrfs/relocation.c if (!del) { spin_lock(&rc->reloc_root_tree.lock); -diff -urNp linux-3.0.8/fs/cachefiles/bind.c linux-3.0.8/fs/cachefiles/bind.c ---- linux-3.0.8/fs/cachefiles/bind.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/bind.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/bind.c linux-3.0.9/fs/cachefiles/bind.c +--- linux-3.0.9/fs/cachefiles/bind.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/bind.c 2011-11-12 12:47:14.000000000 -0500 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef args); @@ -40579,9 +40579,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/bind.c linux-3.0.8/fs/cachefiles/bind.c cache->bcull_percent < cache->brun_percent && cache->brun_percent < 100); -diff -urNp linux-3.0.8/fs/cachefiles/daemon.c linux-3.0.8/fs/cachefiles/daemon.c ---- linux-3.0.8/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/daemon.c linux-3.0.9/fs/cachefiles/daemon.c +--- linux-3.0.9/fs/cachefiles/daemon.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/daemon.c 2011-11-12 12:47:14.000000000 -0500 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st if (n > buflen) return -EMSGSIZE; @@ -40618,9 +40618,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/daemon.c linux-3.0.8/fs/cachefiles/daemon.c return cachefiles_daemon_range_error(cache, args); cache->bstop_percent = bstop; -diff -urNp linux-3.0.8/fs/cachefiles/internal.h linux-3.0.8/fs/cachefiles/internal.h ---- linux-3.0.8/fs/cachefiles/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/internal.h linux-3.0.9/fs/cachefiles/internal.h +--- linux-3.0.9/fs/cachefiles/internal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/internal.h 2011-11-12 12:47:14.000000000 -0500 @@ -57,7 +57,7 @@ struct cachefiles_cache { wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */ struct rb_root active_nodes; /* active nodes (can't be culled) */ @@ -40655,9 +40655,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/internal.h linux-3.0.8/fs/cachefiles/intern } #else -diff -urNp linux-3.0.8/fs/cachefiles/namei.c linux-3.0.8/fs/cachefiles/namei.c ---- linux-3.0.8/fs/cachefiles/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/namei.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/namei.c linux-3.0.9/fs/cachefiles/namei.c +--- linux-3.0.9/fs/cachefiles/namei.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/namei.c 2011-11-12 12:47:14.000000000 -0500 @@ -318,7 +318,7 @@ try_again: /* first step is to make up a grave dentry in the graveyard */ sprintf(nbuffer, "%08x%08x", @@ -40667,9 +40667,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/namei.c linux-3.0.8/fs/cachefiles/namei.c /* do the multiway lock magic */ trap = lock_rename(cache->graveyard, dir); -diff -urNp linux-3.0.8/fs/cachefiles/proc.c linux-3.0.8/fs/cachefiles/proc.c ---- linux-3.0.8/fs/cachefiles/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/proc.c linux-3.0.9/fs/cachefiles/proc.c +--- linux-3.0.9/fs/cachefiles/proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -14,9 +14,9 @@ #include <linux/seq_file.h> #include "internal.h" @@ -40696,9 +40696,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/proc.c linux-3.0.8/fs/cachefiles/proc.c if (x == 0 && y == 0 && z == 0) return 0; -diff -urNp linux-3.0.8/fs/cachefiles/rdwr.c linux-3.0.8/fs/cachefiles/rdwr.c ---- linux-3.0.8/fs/cachefiles/rdwr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cachefiles/rdwr.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/cachefiles/rdwr.c linux-3.0.9/fs/cachefiles/rdwr.c +--- linux-3.0.9/fs/cachefiles/rdwr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cachefiles/rdwr.c 2011-11-12 12:47:14.000000000 -0500 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -40708,9 +40708,9 @@ diff -urNp linux-3.0.8/fs/cachefiles/rdwr.c linux-3.0.8/fs/cachefiles/rdwr.c set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-3.0.8/fs/ceph/dir.c linux-3.0.8/fs/ceph/dir.c ---- linux-3.0.8/fs/ceph/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ceph/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ceph/dir.c linux-3.0.9/fs/ceph/dir.c +--- linux-3.0.9/fs/ceph/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ceph/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil struct ceph_fs_client *fsc = ceph_inode_to_client(inode); struct ceph_mds_client *mdsc = fsc->mdsc; @@ -40720,9 +40720,9 @@ diff -urNp linux-3.0.8/fs/ceph/dir.c linux-3.0.8/fs/ceph/dir.c int err; u32 ftype; struct ceph_mds_reply_info_parsed *rinfo; -diff -urNp linux-3.0.8/fs/cifs/cifs_debug.c linux-3.0.8/fs/cifs/cifs_debug.c ---- linux-3.0.8/fs/cifs/cifs_debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cifs/cifs_debug.c 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.9/fs/cifs/cifs_debug.c linux-3.0.9/fs/cifs/cifs_debug.c +--- linux-3.0.9/fs/cifs/cifs_debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cifs/cifs_debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str if (c == '1' || c == 'y' || c == 'Y' || c == '0') { @@ -40852,9 +40852,9 @@ diff -urNp linux-3.0.8/fs/cifs/cifs_debug.c linux-3.0.8/fs/cifs/cifs_debug.c } } } -diff -urNp linux-3.0.8/fs/cifs/cifsfs.c linux-3.0.8/fs/cifs/cifsfs.c ---- linux-3.0.8/fs/cifs/cifsfs.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/fs/cifs/cifsfs.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/fs/cifs/cifsfs.c linux-3.0.9/fs/cifs/cifsfs.c +--- linux-3.0.9/fs/cifs/cifsfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cifs/cifsfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -996,7 +996,7 @@ cifs_init_request_bufs(void) cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + @@ -40884,9 +40884,9 @@ diff -urNp linux-3.0.8/fs/cifs/cifsfs.c linux-3.0.8/fs/cifs/cifsfs.c #endif /* CONFIG_CIFS_STATS2 */ atomic_set(&midCount, 0); -diff -urNp linux-3.0.8/fs/cifs/cifsglob.h linux-3.0.8/fs/cifs/cifsglob.h ---- linux-3.0.8/fs/cifs/cifsglob.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cifs/cifsglob.h 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.9/fs/cifs/cifsglob.h linux-3.0.9/fs/cifs/cifsglob.h +--- linux-3.0.9/fs/cifs/cifsglob.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cifs/cifsglob.h 2011-11-12 12:47:14.000000000 -0500 @@ -381,28 +381,28 @@ struct cifs_tcon { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; @@ -40958,9 +40958,9 @@ diff -urNp linux-3.0.8/fs/cifs/cifsglob.h linux-3.0.8/fs/cifs/cifsglob.h #endif GLOBAL_EXTERN atomic_t smBufAllocCount; GLOBAL_EXTERN atomic_t midCount; -diff -urNp linux-3.0.8/fs/cifs/link.c linux-3.0.8/fs/cifs/link.c ---- linux-3.0.8/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/cifs/link.c linux-3.0.9/fs/cifs/link.c +--- linux-3.0.9/fs/cifs/link.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cifs/link.c 2011-11-12 12:47:14.000000000 -0500 @@ -587,7 +587,7 @@ symlink_exit: void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -40970,9 +40970,9 @@ diff -urNp linux-3.0.8/fs/cifs/link.c linux-3.0.8/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-3.0.8/fs/cifs/misc.c linux-3.0.8/fs/cifs/misc.c ---- linux-3.0.8/fs/cifs/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/cifs/misc.c 2011-08-25 17:18:05.000000000 -0400 +diff -urNp linux-3.0.9/fs/cifs/misc.c linux-3.0.9/fs/cifs/misc.c +--- linux-3.0.9/fs/cifs/misc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/cifs/misc.c 2011-11-12 12:47:14.000000000 -0500 @@ -156,7 +156,7 @@ cifs_buf_get(void) memset(ret_buf, 0, sizeof(struct smb_hdr) + 3); atomic_inc(&bufAllocCount); @@ -40991,9 +40991,9 @@ diff -urNp linux-3.0.8/fs/cifs/misc.c linux-3.0.8/fs/cifs/misc.c #endif /* CONFIG_CIFS_STATS2 */ } -diff -urNp linux-3.0.8/fs/coda/cache.c linux-3.0.8/fs/coda/cache.c ---- linux-3.0.8/fs/coda/cache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/coda/cache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/coda/cache.c linux-3.0.9/fs/coda/cache.c +--- linux-3.0.9/fs/coda/cache.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/coda/cache.c 2011-11-12 12:47:14.000000000 -0500 @@ -24,7 +24,7 @@ #include "coda_linux.h" #include "coda_cache.h" @@ -41038,9 +41038,9 @@ diff -urNp linux-3.0.8/fs/coda/cache.c linux-3.0.8/fs/coda/cache.c spin_unlock(&cii->c_lock); return hit; -diff -urNp linux-3.0.8/fs/compat_binfmt_elf.c linux-3.0.8/fs/compat_binfmt_elf.c ---- linux-3.0.8/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/compat_binfmt_elf.c linux-3.0.9/fs/compat_binfmt_elf.c +--- linux-3.0.9/fs/compat_binfmt_elf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/compat_binfmt_elf.c 2011-11-12 12:47:14.000000000 -0500 @@ -30,11 +30,13 @@ #undef elf_phdr #undef elf_shdr @@ -41055,9 +41055,9 @@ diff -urNp linux-3.0.8/fs/compat_binfmt_elf.c linux-3.0.8/fs/compat_binfmt_elf.c #define elf_addr_t Elf32_Addr /* -diff -urNp linux-3.0.8/fs/compat.c linux-3.0.8/fs/compat.c ---- linux-3.0.8/fs/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/compat.c linux-3.0.9/fs/compat.c +--- linux-3.0.9/fs/compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) { @@ -41194,9 +41194,9 @@ diff -urNp linux-3.0.8/fs/compat.c linux-3.0.8/fs/compat.c set_fs(oldfs); if (err) -diff -urNp linux-3.0.8/fs/compat_ioctl.c linux-3.0.8/fs/compat_ioctl.c ---- linux-3.0.8/fs/compat_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/compat_ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/compat_ioctl.c linux-3.0.9/fs/compat_ioctl.c +--- linux-3.0.9/fs/compat_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/compat_ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi err = get_user(palp, &up->palette); @@ -41235,9 +41235,9 @@ diff -urNp linux-3.0.8/fs/compat_ioctl.c linux-3.0.8/fs/compat_ioctl.c if (a > b) return 1; if (a < b) -diff -urNp linux-3.0.8/fs/configfs/dir.c linux-3.0.8/fs/configfs/dir.c ---- linux-3.0.8/fs/configfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/configfs/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/configfs/dir.c linux-3.0.9/fs/configfs/dir.c +--- linux-3.0.9/fs/configfs/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/configfs/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file } for (p=q->next; p!= &parent_sd->s_children; p=p->next) { @@ -41262,9 +41262,9 @@ diff -urNp linux-3.0.8/fs/configfs/dir.c linux-3.0.8/fs/configfs/dir.c /* * We'll have a dentry and an inode for -diff -urNp linux-3.0.8/fs/dcache.c linux-3.0.8/fs/dcache.c ---- linux-3.0.8/fs/dcache.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/dcache.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/dcache.c linux-3.0.9/fs/dcache.c +--- linux-3.0.9/fs/dcache.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/dcache.c 2011-11-12 12:47:14.000000000 -0500 @@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon mempages -= reserve; @@ -41274,9 +41274,9 @@ diff -urNp linux-3.0.8/fs/dcache.c linux-3.0.8/fs/dcache.c dcache_init(); inode_init(); -diff -urNp linux-3.0.8/fs/ecryptfs/inode.c linux-3.0.8/fs/ecryptfs/inode.c ---- linux-3.0.8/fs/ecryptfs/inode.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/ecryptfs/inode.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/ecryptfs/inode.c linux-3.0.9/fs/ecryptfs/inode.c +--- linux-3.0.9/fs/ecryptfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ecryptfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc old_fs = get_fs(); set_fs(get_ds()); @@ -41304,9 +41304,9 @@ diff -urNp linux-3.0.8/fs/ecryptfs/inode.c linux-3.0.8/fs/ecryptfs/inode.c if (!IS_ERR(buf)) { /* Free the char* */ kfree(buf); -diff -urNp linux-3.0.8/fs/ecryptfs/miscdev.c linux-3.0.8/fs/ecryptfs/miscdev.c ---- linux-3.0.8/fs/ecryptfs/miscdev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ecryptfs/miscdev.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ecryptfs/miscdev.c linux-3.0.9/fs/ecryptfs/miscdev.c +--- linux-3.0.9/fs/ecryptfs/miscdev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ecryptfs/miscdev.c 2011-11-12 12:47:14.000000000 -0500 @@ -328,7 +328,7 @@ check_list: goto out_unlock_msg_ctx; i = 5; @@ -41316,9 +41316,9 @@ diff -urNp linux-3.0.8/fs/ecryptfs/miscdev.c linux-3.0.8/fs/ecryptfs/miscdev.c goto out_unlock_msg_ctx; i += packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) -diff -urNp linux-3.0.8/fs/ecryptfs/read_write.c linux-3.0.8/fs/ecryptfs/read_write.c ---- linux-3.0.8/fs/ecryptfs/read_write.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/ecryptfs/read_write.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/ecryptfs/read_write.c linux-3.0.9/fs/ecryptfs/read_write.c +--- linux-3.0.9/fs/ecryptfs/read_write.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ecryptfs/read_write.c 2011-11-12 12:47:14.000000000 -0500 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e return -EIO; fs_save = get_fs(); @@ -41337,9 +41337,9 @@ diff -urNp linux-3.0.8/fs/ecryptfs/read_write.c linux-3.0.8/fs/ecryptfs/read_wri set_fs(fs_save); return rc; } -diff -urNp linux-3.0.8/fs/exec.c linux-3.0.8/fs/exec.c ---- linux-3.0.8/fs/exec.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/fs/exec.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/fs/exec.c linux-3.0.9/fs/exec.c +--- linux-3.0.9/fs/exec.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/exec.c 2011-11-12 12:47:14.000000000 -0500 @@ -55,12 +55,24 @@ #include <linux/pipe_fs_i.h> #include <linux/oom.h> @@ -42023,9 +42023,9 @@ diff -urNp linux-3.0.8/fs/exec.c linux-3.0.8/fs/exec.c } EXPORT_SYMBOL(dump_write); -diff -urNp linux-3.0.8/fs/ext2/balloc.c linux-3.0.8/fs/ext2/balloc.c ---- linux-3.0.8/fs/ext2/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext2/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext2/balloc.c linux-3.0.9/fs/ext2/balloc.c +--- linux-3.0.9/fs/ext2/balloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext2/balloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -42035,9 +42035,9 @@ diff -urNp linux-3.0.8/fs/ext2/balloc.c linux-3.0.8/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-3.0.8/fs/ext3/balloc.c linux-3.0.8/fs/ext3/balloc.c ---- linux-3.0.8/fs/ext3/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext3/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext3/balloc.c linux-3.0.9/fs/ext3/balloc.c +--- linux-3.0.9/fs/ext3/balloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext3/balloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -42047,9 +42047,9 @@ diff -urNp linux-3.0.8/fs/ext3/balloc.c linux-3.0.8/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-3.0.8/fs/ext3/ioctl.c linux-3.0.8/fs/ext3/ioctl.c ---- linux-3.0.8/fs/ext3/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext3/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext3/ioctl.c linux-3.0.9/fs/ext3/ioctl.c +--- linux-3.0.9/fs/ext3/ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext3/ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -285,7 +285,7 @@ group_add_out: if (!capable(CAP_SYS_ADMIN)) return -EPERM; @@ -42068,9 +42068,9 @@ diff -urNp linux-3.0.8/fs/ext3/ioctl.c linux-3.0.8/fs/ext3/ioctl.c sizeof(range))) return -EFAULT; -diff -urNp linux-3.0.8/fs/ext4/balloc.c linux-3.0.8/fs/ext4/balloc.c ---- linux-3.0.8/fs/ext4/balloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext4/balloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext4/balloc.c linux-3.0.9/fs/ext4/balloc.c +--- linux-3.0.9/fs/ext4/balloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext4/balloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -42082,9 +42082,9 @@ diff -urNp linux-3.0.8/fs/ext4/balloc.c linux-3.0.8/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; -diff -urNp linux-3.0.8/fs/ext4/ext4.h linux-3.0.8/fs/ext4/ext4.h ---- linux-3.0.8/fs/ext4/ext4.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext4/ext4.h linux-3.0.9/fs/ext4/ext4.h +--- linux-3.0.9/fs/ext4/ext4.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext4/ext4.h 2011-11-12 12:47:14.000000000 -0500 @@ -1177,19 +1177,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; @@ -42115,9 +42115,9 @@ diff -urNp linux-3.0.8/fs/ext4/ext4.h linux-3.0.8/fs/ext4/ext4.h atomic_t s_lock_busy; /* locality groups */ -diff -urNp linux-3.0.8/fs/ext4/file.c linux-3.0.8/fs/ext4/file.c ---- linux-3.0.8/fs/ext4/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext4/file.c 2011-10-17 02:30:30.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext4/file.c linux-3.0.9/fs/ext4/file.c +--- linux-3.0.9/fs/ext4/file.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext4/file.c 2011-11-12 12:47:14.000000000 -0500 @@ -181,8 +181,8 @@ static int ext4_file_open(struct inode * path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); @@ -42129,9 +42129,9 @@ diff -urNp linux-3.0.8/fs/ext4/file.c linux-3.0.8/fs/ext4/file.c ext4_mark_super_dirty(sb); } } -diff -urNp linux-3.0.8/fs/ext4/ioctl.c linux-3.0.8/fs/ext4/ioctl.c ---- linux-3.0.8/fs/ext4/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ext4/ioctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext4/ioctl.c linux-3.0.9/fs/ext4/ioctl.c +--- linux-3.0.9/fs/ext4/ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext4/ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -344,7 +344,7 @@ mext_out: if (!blk_queue_discard(q)) return -EOPNOTSUPP; @@ -42150,9 +42150,9 @@ diff -urNp linux-3.0.8/fs/ext4/ioctl.c linux-3.0.8/fs/ext4/ioctl.c sizeof(range))) return -EFAULT; -diff -urNp linux-3.0.8/fs/ext4/mballoc.c linux-3.0.8/fs/ext4/mballoc.c ---- linux-3.0.8/fs/ext4/mballoc.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/ext4/mballoc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ext4/mballoc.c linux-3.0.9/fs/ext4/mballoc.c +--- linux-3.0.9/fs/ext4/mballoc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ext4/mballoc.c 2011-11-12 12:47:14.000000000 -0500 @@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); @@ -42275,9 +42275,9 @@ diff -urNp linux-3.0.8/fs/ext4/mballoc.c linux-3.0.8/fs/ext4/mballoc.c trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len); return 0; -diff -urNp linux-3.0.8/fs/fcntl.c linux-3.0.8/fs/fcntl.c ---- linux-3.0.8/fs/fcntl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fcntl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/fcntl.c linux-3.0.9/fs/fcntl.c +--- linux-3.0.9/fs/fcntl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fcntl.c 2011-11-12 12:47:14.000000000 -0500 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct if (err) return err; @@ -42333,9 +42333,9 @@ diff -urNp linux-3.0.8/fs/fcntl.c linux-3.0.8/fs/fcntl.c )); fasync_cache = kmem_cache_create("fasync_cache", -diff -urNp linux-3.0.8/fs/fifo.c linux-3.0.8/fs/fifo.c ---- linux-3.0.8/fs/fifo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fifo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c +--- linux-3.0.9/fs/fifo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fifo.c 2011-11-12 12:47:14.000000000 -0500 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -42406,9 +42406,9 @@ diff -urNp linux-3.0.8/fs/fifo.c linux-3.0.8/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-3.0.8/fs/file.c linux-3.0.8/fs/file.c ---- linux-3.0.8/fs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/file.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/file.c linux-3.0.9/fs/file.c +--- linux-3.0.9/fs/file.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/file.c 2011-11-12 12:47:14.000000000 -0500 @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -42425,9 +42425,9 @@ diff -urNp linux-3.0.8/fs/file.c linux-3.0.8/fs/file.c if (nr >= rlimit(RLIMIT_NOFILE)) return -EMFILE; -diff -urNp linux-3.0.8/fs/filesystems.c linux-3.0.8/fs/filesystems.c ---- linux-3.0.8/fs/filesystems.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/filesystems.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/filesystems.c linux-3.0.9/fs/filesystems.c +--- linux-3.0.9/fs/filesystems.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/filesystems.c 2011-11-12 12:47:14.000000000 -0500 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con int len = dot ? dot - name : strlen(name); @@ -42441,9 +42441,9 @@ diff -urNp linux-3.0.8/fs/filesystems.c linux-3.0.8/fs/filesystems.c fs = __get_fs_type(name, len); if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) { -diff -urNp linux-3.0.8/fs/fscache/cookie.c linux-3.0.8/fs/fscache/cookie.c ---- linux-3.0.8/fs/fscache/cookie.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/cookie.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/cookie.c linux-3.0.9/fs/fscache/cookie.c +--- linux-3.0.9/fs/fscache/cookie.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/cookie.c 2011-11-12 12:47:14.000000000 -0500 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire parent ? (char *) parent->def->name : "<no-parent>", def->name, netfs_data); @@ -42562,9 +42562,9 @@ diff -urNp linux-3.0.8/fs/fscache/cookie.c linux-3.0.8/fs/fscache/cookie.c wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING, fscache_wait_bit, TASK_UNINTERRUPTIBLE); } -diff -urNp linux-3.0.8/fs/fscache/internal.h linux-3.0.8/fs/fscache/internal.h ---- linux-3.0.8/fs/fscache/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/internal.h linux-3.0.9/fs/fscache/internal.h +--- linux-3.0.9/fs/fscache/internal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/internal.h 2011-11-12 12:47:14.000000000 -0500 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void); extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS]; extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS]; @@ -42768,9 +42768,9 @@ diff -urNp linux-3.0.8/fs/fscache/internal.h linux-3.0.8/fs/fscache/internal.h #define fscache_stat_d(stat) do {} while (0) #endif -diff -urNp linux-3.0.8/fs/fscache/object.c linux-3.0.8/fs/fscache/object.c ---- linux-3.0.8/fs/fscache/object.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/object.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/object.c linux-3.0.9/fs/fscache/object.c +--- linux-3.0.9/fs/fscache/object.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/object.c 2011-11-12 12:47:14.000000000 -0500 @@ -128,7 +128,7 @@ static void fscache_object_state_machine /* update the object metadata on disk */ case FSCACHE_OBJECT_UPDATING: @@ -42882,9 +42882,9 @@ diff -urNp linux-3.0.8/fs/fscache/object.c linux-3.0.8/fs/fscache/object.c break; default: -diff -urNp linux-3.0.8/fs/fscache/operation.c linux-3.0.8/fs/fscache/operation.c ---- linux-3.0.8/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/operation.c linux-3.0.9/fs/fscache/operation.c +--- linux-3.0.9/fs/fscache/operation.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/operation.c 2011-11-12 12:47:14.000000000 -0500 @@ -17,7 +17,7 @@ #include <linux/slab.h> #include "internal.h" @@ -43000,9 +43000,9 @@ diff -urNp linux-3.0.8/fs/fscache/operation.c linux-3.0.8/fs/fscache/operation.c ASSERTCMP(atomic_read(&op->usage), ==, 0); -diff -urNp linux-3.0.8/fs/fscache/page.c linux-3.0.8/fs/fscache/page.c ---- linux-3.0.8/fs/fscache/page.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/page.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/page.c linux-3.0.9/fs/fscache/page.c +--- linux-3.0.9/fs/fscache/page.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/page.c 2011-11-12 12:47:14.000000000 -0500 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct val = radix_tree_lookup(&cookie->stores, page->index); if (!val) { @@ -43386,9 +43386,9 @@ diff -urNp linux-3.0.8/fs/fscache/page.c linux-3.0.8/fs/fscache/page.c #endif for (loop = 0; loop < pagevec->nr; loop++) { -diff -urNp linux-3.0.8/fs/fscache/stats.c linux-3.0.8/fs/fscache/stats.c ---- linux-3.0.8/fs/fscache/stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fscache/stats.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fscache/stats.c linux-3.0.9/fs/fscache/stats.c +--- linux-3.0.9/fs/fscache/stats.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fscache/stats.c 2011-11-12 12:47:14.000000000 -0500 @@ -18,95 +18,95 @@ /* * operation counters @@ -43764,9 +43764,9 @@ diff -urNp linux-3.0.8/fs/fscache/stats.c linux-3.0.8/fs/fscache/stats.c seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n", atomic_read(&fscache_n_cop_alloc_object), -diff -urNp linux-3.0.8/fs/fs_struct.c linux-3.0.8/fs/fs_struct.c ---- linux-3.0.8/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/fs_struct.c linux-3.0.9/fs/fs_struct.c +--- linux-3.0.9/fs/fs_struct.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fs_struct.c 2011-11-12 12:47:14.000000000 -0500 @@ -4,6 +4,7 @@ #include <linux/path.h> #include <linux/slab.h> @@ -43856,9 +43856,9 @@ diff -urNp linux-3.0.8/fs/fs_struct.c linux-3.0.8/fs/fs_struct.c spin_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-3.0.8/fs/fuse/cuse.c linux-3.0.8/fs/fuse/cuse.c ---- linux-3.0.8/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fuse/cuse.c linux-3.0.9/fs/fuse/cuse.c +--- linux-3.0.9/fs/fuse/cuse.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fuse/cuse.c 2011-11-12 12:47:14.000000000 -0500 @@ -586,10 +586,12 @@ static int __init cuse_init(void) INIT_LIST_HEAD(&cuse_conntbl[i]); @@ -43876,9 +43876,9 @@ diff -urNp linux-3.0.8/fs/fuse/cuse.c linux-3.0.8/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) -diff -urNp linux-3.0.8/fs/fuse/dev.c linux-3.0.8/fs/fuse/dev.c ---- linux-3.0.8/fs/fuse/dev.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/fs/fuse/dev.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/fs/fuse/dev.c linux-3.0.9/fs/fuse/dev.c +--- linux-3.0.9/fs/fuse/dev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fuse/dev.c 2011-11-12 12:47:14.000000000 -0500 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(stru ret = 0; pipe_lock(pipe); @@ -43888,9 +43888,9 @@ diff -urNp linux-3.0.8/fs/fuse/dev.c linux-3.0.8/fs/fuse/dev.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -diff -urNp linux-3.0.8/fs/fuse/dir.c linux-3.0.8/fs/fuse/dir.c ---- linux-3.0.8/fs/fuse/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/fuse/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/fuse/dir.c linux-3.0.9/fs/fuse/dir.c +--- linux-3.0.9/fs/fuse/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/fuse/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de return link; } @@ -43900,9 +43900,9 @@ diff -urNp linux-3.0.8/fs/fuse/dir.c linux-3.0.8/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-3.0.8/fs/gfs2/inode.c linux-3.0.8/fs/gfs2/inode.c ---- linux-3.0.8/fs/gfs2/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/gfs2/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/gfs2/inode.c linux-3.0.9/fs/gfs2/inode.c +--- linux-3.0.9/fs/gfs2/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/gfs2/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -1525,7 +1525,7 @@ out: static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -43912,9 +43912,9 @@ diff -urNp linux-3.0.8/fs/gfs2/inode.c linux-3.0.8/fs/gfs2/inode.c if (!IS_ERR(s)) kfree(s); } -diff -urNp linux-3.0.8/fs/hfsplus/catalog.c linux-3.0.8/fs/hfsplus/catalog.c ---- linux-3.0.8/fs/hfsplus/catalog.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/hfsplus/catalog.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/hfsplus/catalog.c linux-3.0.9/fs/hfsplus/catalog.c +--- linux-3.0.9/fs/hfsplus/catalog.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hfsplus/catalog.c 2011-11-12 12:47:14.000000000 -0500 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block int err; u16 type; @@ -43942,9 +43942,9 @@ diff -urNp linux-3.0.8/fs/hfsplus/catalog.c linux-3.0.8/fs/hfsplus/catalog.c dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); -diff -urNp linux-3.0.8/fs/hfsplus/dir.c linux-3.0.8/fs/hfsplus/dir.c ---- linux-3.0.8/fs/hfsplus/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/hfsplus/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/hfsplus/dir.c linux-3.0.9/fs/hfsplus/dir.c +--- linux-3.0.9/fs/hfsplus/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hfsplus/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file * struct hfsplus_readdir_data *rd; u16 type; @@ -43954,9 +43954,9 @@ diff -urNp linux-3.0.8/fs/hfsplus/dir.c linux-3.0.8/fs/hfsplus/dir.c if (filp->f_pos >= inode->i_size) return 0; -diff -urNp linux-3.0.8/fs/hfsplus/inode.c linux-3.0.8/fs/hfsplus/inode.c ---- linux-3.0.8/fs/hfsplus/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/hfsplus/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/hfsplus/inode.c linux-3.0.9/fs/hfsplus/inode.c +--- linux-3.0.9/fs/hfsplus/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hfsplus/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode int res = 0; u16 type; @@ -43975,9 +43975,9 @@ diff -urNp linux-3.0.8/fs/hfsplus/inode.c linux-3.0.8/fs/hfsplus/inode.c if (HFSPLUS_IS_RSRC(inode)) main_inode = HFSPLUS_I(inode)->rsrc_inode; -diff -urNp linux-3.0.8/fs/hfsplus/ioctl.c linux-3.0.8/fs/hfsplus/ioctl.c ---- linux-3.0.8/fs/hfsplus/ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/hfsplus/ioctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/hfsplus/ioctl.c linux-3.0.9/fs/hfsplus/ioctl.c +--- linux-3.0.9/fs/hfsplus/ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hfsplus/ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent struct hfsplus_cat_file *file; int res; @@ -43996,9 +43996,9 @@ diff -urNp linux-3.0.8/fs/hfsplus/ioctl.c linux-3.0.8/fs/hfsplus/ioctl.c if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode)) return -EOPNOTSUPP; -diff -urNp linux-3.0.8/fs/hfsplus/super.c linux-3.0.8/fs/hfsplus/super.c ---- linux-3.0.8/fs/hfsplus/super.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/fs/hfsplus/super.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/fs/hfsplus/super.c linux-3.0.9/fs/hfsplus/super.c +--- linux-3.0.9/fs/hfsplus/super.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hfsplus/super.c 2011-11-12 12:47:14.000000000 -0500 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup struct nls_table *nls = NULL; int err; @@ -44008,9 +44008,9 @@ diff -urNp linux-3.0.8/fs/hfsplus/super.c linux-3.0.8/fs/hfsplus/super.c err = -EINVAL; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) -diff -urNp linux-3.0.8/fs/hugetlbfs/inode.c linux-3.0.8/fs/hugetlbfs/inode.c ---- linux-3.0.8/fs/hugetlbfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/hugetlbfs/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/hugetlbfs/inode.c linux-3.0.9/fs/hugetlbfs/inode.c +--- linux-3.0.9/fs/hugetlbfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/hugetlbfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs .kill_sb = kill_litter_super, }; @@ -44020,9 +44020,9 @@ diff -urNp linux-3.0.8/fs/hugetlbfs/inode.c linux-3.0.8/fs/hugetlbfs/inode.c static int can_do_hugetlb_shm(void) { -diff -urNp linux-3.0.8/fs/inode.c linux-3.0.8/fs/inode.c ---- linux-3.0.8/fs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/inode.c linux-3.0.9/fs/inode.c +--- linux-3.0.9/fs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -829,8 +829,8 @@ unsigned int get_next_ino(void) #ifdef CONFIG_SMP @@ -44034,9 +44034,9 @@ diff -urNp linux-3.0.8/fs/inode.c linux-3.0.8/fs/inode.c res = next - LAST_INO_BATCH; } -diff -urNp linux-3.0.8/fs/jbd/checkpoint.c linux-3.0.8/fs/jbd/checkpoint.c ---- linux-3.0.8/fs/jbd/checkpoint.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jbd/checkpoint.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/jbd/checkpoint.c linux-3.0.9/fs/jbd/checkpoint.c +--- linux-3.0.9/fs/jbd/checkpoint.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jbd/checkpoint.c 2011-11-12 12:47:14.000000000 -0500 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal tid_t this_tid; int result; @@ -44046,9 +44046,9 @@ diff -urNp linux-3.0.8/fs/jbd/checkpoint.c linux-3.0.8/fs/jbd/checkpoint.c jbd_debug(1, "Start checkpoint\n"); /* -diff -urNp linux-3.0.8/fs/jffs2/compr_rtime.c linux-3.0.8/fs/jffs2/compr_rtime.c ---- linux-3.0.8/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/jffs2/compr_rtime.c linux-3.0.9/fs/jffs2/compr_rtime.c +--- linux-3.0.9/fs/jffs2/compr_rtime.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jffs2/compr_rtime.c 2011-11-12 12:47:14.000000000 -0500 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned int outpos = 0; int pos=0; @@ -44067,9 +44067,9 @@ diff -urNp linux-3.0.8/fs/jffs2/compr_rtime.c linux-3.0.8/fs/jffs2/compr_rtime.c memset(positions,0,sizeof(positions)); while (outpos<destlen) { -diff -urNp linux-3.0.8/fs/jffs2/compr_rubin.c linux-3.0.8/fs/jffs2/compr_rubin.c ---- linux-3.0.8/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/jffs2/compr_rubin.c linux-3.0.9/fs/jffs2/compr_rubin.c +--- linux-3.0.9/fs/jffs2/compr_rubin.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jffs2/compr_rubin.c 2011-11-12 12:47:14.000000000 -0500 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig int ret; uint32_t mysrclen, mydstlen; @@ -44079,9 +44079,9 @@ diff -urNp linux-3.0.8/fs/jffs2/compr_rubin.c linux-3.0.8/fs/jffs2/compr_rubin.c mysrclen = *sourcelen; mydstlen = *dstlen - 8; -diff -urNp linux-3.0.8/fs/jffs2/erase.c linux-3.0.8/fs/jffs2/erase.c ---- linux-3.0.8/fs/jffs2/erase.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jffs2/erase.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/jffs2/erase.c linux-3.0.9/fs/jffs2/erase.c +--- linux-3.0.9/fs/jffs2/erase.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jffs2/erase.c 2011-11-12 12:47:14.000000000 -0500 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -44092,9 +44092,9 @@ diff -urNp linux-3.0.8/fs/jffs2/erase.c linux-3.0.8/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-3.0.8/fs/jffs2/wbuf.c linux-3.0.8/fs/jffs2/wbuf.c ---- linux-3.0.8/fs/jffs2/wbuf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jffs2/wbuf.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/jffs2/wbuf.c linux-3.0.9/fs/jffs2/wbuf.c +--- linux-3.0.9/fs/jffs2/wbuf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jffs2/wbuf.c 2011-11-12 12:47:14.000000000 -0500 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -44105,9 +44105,9 @@ diff -urNp linux-3.0.8/fs/jffs2/wbuf.c linux-3.0.8/fs/jffs2/wbuf.c }; /* -diff -urNp linux-3.0.8/fs/jffs2/xattr.c linux-3.0.8/fs/jffs2/xattr.c ---- linux-3.0.8/fs/jffs2/xattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jffs2/xattr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/jffs2/xattr.c linux-3.0.9/fs/jffs2/xattr.c +--- linux-3.0.9/fs/jffs2/xattr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jffs2/xattr.c 2011-11-12 12:47:14.000000000 -0500 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING)); @@ -44117,9 +44117,9 @@ diff -urNp linux-3.0.8/fs/jffs2/xattr.c linux-3.0.8/fs/jffs2/xattr.c /* Phase.1 : Merge same xref */ for (i=0; i < XREF_TMPHASH_SIZE; i++) xref_tmphash[i] = NULL; -diff -urNp linux-3.0.8/fs/jfs/super.c linux-3.0.8/fs/jfs/super.c ---- linux-3.0.8/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/jfs/super.c linux-3.0.9/fs/jfs/super.c +--- linux-3.0.9/fs/jfs/super.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/jfs/super.c 2011-11-12 12:47:14.000000000 -0500 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void) jfs_inode_cachep = @@ -44129,9 +44129,9 @@ diff -urNp linux-3.0.8/fs/jfs/super.c linux-3.0.8/fs/jfs/super.c init_once); if (jfs_inode_cachep == NULL) return -ENOMEM; -diff -urNp linux-3.0.8/fs/Kconfig.binfmt linux-3.0.8/fs/Kconfig.binfmt ---- linux-3.0.8/fs/Kconfig.binfmt 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/Kconfig.binfmt 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/Kconfig.binfmt linux-3.0.9/fs/Kconfig.binfmt +--- linux-3.0.9/fs/Kconfig.binfmt 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/Kconfig.binfmt 2011-11-12 12:47:14.000000000 -0500 @@ -86,7 +86,7 @@ config HAVE_AOUT config BINFMT_AOUT @@ -44141,9 +44141,9 @@ diff -urNp linux-3.0.8/fs/Kconfig.binfmt linux-3.0.8/fs/Kconfig.binfmt ---help--- A.out (Assembler.OUTput) is a set of formats for libraries and executables used in the earliest versions of UNIX. Linux used -diff -urNp linux-3.0.8/fs/libfs.c linux-3.0.8/fs/libfs.c ---- linux-3.0.8/fs/libfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/libfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/libfs.c linux-3.0.9/fs/libfs.c +--- linux-3.0.9/fs/libfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/libfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v for (p=q->next; p != &dentry->d_subdirs; p=p->next) { @@ -44168,9 +44168,9 @@ diff -urNp linux-3.0.8/fs/libfs.c linux-3.0.8/fs/libfs.c next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0) -diff -urNp linux-3.0.8/fs/lockd/clntproc.c linux-3.0.8/fs/lockd/clntproc.c ---- linux-3.0.8/fs/lockd/clntproc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/lockd/clntproc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/lockd/clntproc.c linux-3.0.9/fs/lockd/clntproc.c +--- linux-3.0.9/fs/lockd/clntproc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/lockd/clntproc.c 2011-11-12 12:47:14.000000000 -0500 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt /* * Cookie counter for NLM requests @@ -44194,9 +44194,9 @@ diff -urNp linux-3.0.8/fs/lockd/clntproc.c linux-3.0.8/fs/lockd/clntproc.c req = &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); -diff -urNp linux-3.0.8/fs/locks.c linux-3.0.8/fs/locks.c ---- linux-3.0.8/fs/locks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/locks.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/locks.c linux-3.0.9/fs/locks.c +--- linux-3.0.9/fs/locks.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/locks.c 2011-11-12 12:47:14.000000000 -0500 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil return; @@ -44218,9 +44218,9 @@ diff -urNp linux-3.0.8/fs/locks.c linux-3.0.8/fs/locks.c } lock_flocks(); -diff -urNp linux-3.0.8/fs/logfs/super.c linux-3.0.8/fs/logfs/super.c ---- linux-3.0.8/fs/logfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/logfs/super.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/logfs/super.c linux-3.0.9/fs/logfs/super.c +--- linux-3.0.9/fs/logfs/super.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/logfs/super.c 2011-11-12 12:47:14.000000000 -0500 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super struct logfs_disk_super _ds1, *ds1 = &_ds1; int err, valid0, valid1; @@ -44230,10 +44230,10 @@ diff -urNp linux-3.0.8/fs/logfs/super.c linux-3.0.8/fs/logfs/super.c /* read first superblock */ err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0); if (err) -diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c ---- linux-3.0.8/fs/namei.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/fs/namei.c 2011-10-19 10:09:26.000000000 -0400 -@@ -237,21 +237,23 @@ int generic_permission(struct inode *ino +diff -urNp linux-3.0.9/fs/namei.c linux-3.0.9/fs/namei.c +--- linux-3.0.9/fs/namei.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/namei.c 2011-11-12 12:47:14.000000000 -0500 +@@ -239,21 +239,23 @@ int generic_permission(struct inode *ino return ret; /* @@ -44266,7 +44266,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c return -EACCES; } -@@ -593,9 +595,12 @@ static inline int exec_permission(struct +@@ -595,9 +597,12 @@ static inline int exec_permission(struct if (ret == -ECHILD) return ret; @@ -44281,7 +44281,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c return ret; ok: -@@ -703,11 +708,19 @@ follow_link(struct path *link, struct na +@@ -705,11 +710,19 @@ follow_link(struct path *link, struct na return error; } @@ -44302,7 +44302,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = 0; if (s) error = __vfs_follow_link(nd, s); -@@ -1598,6 +1611,12 @@ static int path_lookupat(int dfd, const +@@ -1606,6 +1619,12 @@ static int path_lookupat(int dfd, const if (!err) err = complete_walk(nd); @@ -44315,7 +44315,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c if (!err && nd->flags & LOOKUP_DIRECTORY) { if (!nd->inode->i_op->lookup) { path_put(&nd->path); -@@ -1625,6 +1644,9 @@ static int do_path_lookup(int dfd, const +@@ -1633,6 +1652,9 @@ static int do_path_lookup(int dfd, const retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd); if (likely(!retval)) { @@ -44325,7 +44325,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c if (unlikely(!audit_dummy_context())) { if (nd->path.dentry && nd->inode) audit_inode(name, nd->path.dentry); -@@ -1935,6 +1957,30 @@ int vfs_create(struct inode *dir, struct +@@ -1949,6 +1971,30 @@ int vfs_create(struct inode *dir, struct return error; } @@ -44356,7 +44356,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c static int may_open(struct path *path, int acc_mode, int flag) { struct dentry *dentry = path->dentry; -@@ -1987,7 +2033,27 @@ static int may_open(struct path *path, i +@@ -2001,7 +2047,27 @@ static int may_open(struct path *path, i /* * Ensure there are no outstanding leases on the file. */ @@ -44385,7 +44385,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c } static int handle_truncate(struct file *filp) -@@ -2013,30 +2079,6 @@ static int handle_truncate(struct file * +@@ -2027,30 +2093,6 @@ static int handle_truncate(struct file * } /* @@ -44416,7 +44416,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c * Handle the last step of open() */ static struct file *do_last(struct nameidata *nd, struct path *path, -@@ -2045,6 +2087,7 @@ static struct file *do_last(struct namei +@@ -2059,6 +2101,7 @@ static struct file *do_last(struct namei struct dentry *dir = nd->path.dentry; struct dentry *dentry; int open_flag = op->open_flag; @@ -44424,7 +44424,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c int will_truncate = open_flag & O_TRUNC; int want_write = 0; int acc_mode = op->acc_mode; -@@ -2065,6 +2108,10 @@ static struct file *do_last(struct namei +@@ -2079,6 +2122,10 @@ static struct file *do_last(struct namei error = complete_walk(nd); if (error) return ERR_PTR(error); @@ -44435,7 +44435,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c audit_inode(pathname, nd->path.dentry); if (open_flag & O_CREAT) { error = -EISDIR; -@@ -2075,6 +2122,10 @@ static struct file *do_last(struct namei +@@ -2089,6 +2136,10 @@ static struct file *do_last(struct namei error = complete_walk(nd); if (error) return ERR_PTR(error); @@ -44446,7 +44446,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c audit_inode(pathname, dir); goto ok; } -@@ -2097,6 +2148,11 @@ static struct file *do_last(struct namei +@@ -2111,6 +2162,11 @@ static struct file *do_last(struct namei if (error) return ERR_PTR(-ECHILD); @@ -44458,7 +44458,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = -ENOTDIR; if (nd->flags & LOOKUP_DIRECTORY) { if (!nd->inode->i_op->lookup) -@@ -2132,6 +2188,12 @@ static struct file *do_last(struct namei +@@ -2150,6 +2206,12 @@ static struct file *do_last(struct namei /* Negative dentry, just create the file */ if (!dentry->d_inode) { int mode = op->mode; @@ -44471,7 +44471,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c if (!IS_POSIXACL(dir->d_inode)) mode &= ~current_umask(); /* -@@ -2155,6 +2217,8 @@ static struct file *do_last(struct namei +@@ -2173,6 +2235,8 @@ static struct file *do_last(struct namei error = vfs_create(dir->d_inode, dentry, mode, nd); if (error) goto exit_mutex_unlock; @@ -44480,7 +44480,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c mutex_unlock(&dir->d_inode->i_mutex); dput(nd->path.dentry); nd->path.dentry = dentry; -@@ -2164,6 +2228,19 @@ static struct file *do_last(struct namei +@@ -2182,6 +2246,19 @@ static struct file *do_last(struct namei /* * It already exists. */ @@ -44500,7 +44500,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c mutex_unlock(&dir->d_inode->i_mutex); audit_inode(pathname, path->dentry); -@@ -2373,6 +2450,10 @@ struct dentry *lookup_create(struct name +@@ -2398,6 +2475,10 @@ struct dentry *lookup_create(struct name } return dentry; eexist: @@ -44511,7 +44511,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c dput(dentry); dentry = ERR_PTR(-EEXIST); fail: -@@ -2450,6 +2531,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2475,6 +2556,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const error = may_mknod(mode); if (error) goto out_dput; @@ -44529,7 +44529,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2470,6 +2562,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2495,6 +2587,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const } out_drop_write: mnt_drop_write(nd.path.mnt); @@ -44539,7 +44539,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2522,6 +2617,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2547,6 +2642,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const if (IS_ERR(dentry)) goto out_unlock; @@ -44551,7 +44551,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c if (!IS_POSIXACL(nd.path.dentry->d_inode)) mode &= ~current_umask(); error = mnt_want_write(nd.path.mnt); -@@ -2533,6 +2633,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2558,6 +2658,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); out_drop_write: mnt_drop_write(nd.path.mnt); @@ -44562,7 +44562,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2615,6 +2719,8 @@ static long do_rmdir(int dfd, const char +@@ -2640,6 +2744,8 @@ static long do_rmdir(int dfd, const char char * name; struct dentry *dentry; struct nameidata nd; @@ -44571,7 +44571,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2643,6 +2749,17 @@ static long do_rmdir(int dfd, const char +@@ -2668,6 +2774,17 @@ static long do_rmdir(int dfd, const char error = -ENOENT; goto exit3; } @@ -44589,7 +44589,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit3; -@@ -2650,6 +2767,8 @@ static long do_rmdir(int dfd, const char +@@ -2675,6 +2792,8 @@ static long do_rmdir(int dfd, const char if (error) goto exit4; error = vfs_rmdir(nd.path.dentry->d_inode, dentry); @@ -44598,7 +44598,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c exit4: mnt_drop_write(nd.path.mnt); exit3: -@@ -2712,6 +2831,8 @@ static long do_unlinkat(int dfd, const c +@@ -2737,6 +2856,8 @@ static long do_unlinkat(int dfd, const c struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -44607,7 +44607,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2734,6 +2855,16 @@ static long do_unlinkat(int dfd, const c +@@ -2759,6 +2880,16 @@ static long do_unlinkat(int dfd, const c if (!inode) goto slashes; ihold(inode); @@ -44624,7 +44624,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit2; -@@ -2741,6 +2872,8 @@ static long do_unlinkat(int dfd, const c +@@ -2766,6 +2897,8 @@ static long do_unlinkat(int dfd, const c if (error) goto exit3; error = vfs_unlink(nd.path.dentry->d_inode, dentry); @@ -44633,7 +44633,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c exit3: mnt_drop_write(nd.path.mnt); exit2: -@@ -2818,6 +2951,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -2843,6 +2976,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (IS_ERR(dentry)) goto out_unlock; @@ -44645,7 +44645,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2825,6 +2963,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -2850,6 +2988,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (error) goto out_drop_write; error = vfs_symlink(nd.path.dentry->d_inode, dentry, from); @@ -44654,7 +44654,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -2933,6 +3073,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -2958,6 +3098,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) goto out_unlock; @@ -44675,7 +44675,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2940,6 +3094,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -2965,6 +3119,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con if (error) goto out_drop_write; error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry); @@ -44684,7 +44684,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -3117,6 +3273,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3142,6 +3298,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c char *to; int error; @@ -44693,7 +44693,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = user_path_parent(olddfd, oldname, &oldnd, &from); if (error) goto exit; -@@ -3173,6 +3331,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3198,6 +3356,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c if (new_dentry == trap) goto exit5; @@ -44706,7 +44706,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c error = mnt_want_write(oldnd.path.mnt); if (error) goto exit5; -@@ -3182,6 +3346,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -3207,6 +3371,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c goto exit6; error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry); @@ -44716,7 +44716,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -@@ -3207,6 +3374,8 @@ SYSCALL_DEFINE2(rename, const char __use +@@ -3232,6 +3399,8 @@ SYSCALL_DEFINE2(rename, const char __use int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) { @@ -44725,7 +44725,7 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c int len; len = PTR_ERR(link); -@@ -3216,7 +3385,14 @@ int vfs_readlink(struct dentry *dentry, +@@ -3241,7 +3410,14 @@ int vfs_readlink(struct dentry *dentry, len = strlen(link); if (len > (unsigned) buflen) len = buflen; @@ -44741,10 +44741,10 @@ diff -urNp linux-3.0.8/fs/namei.c linux-3.0.8/fs/namei.c len = -EFAULT; out: return len; -diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c ---- linux-3.0.8/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn +diff -urNp linux-3.0.9/fs/namespace.c linux-3.0.9/fs/namespace.c +--- linux-3.0.9/fs/namespace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/namespace.c 2011-11-12 12:47:14.000000000 -0500 +@@ -1329,6 +1329,9 @@ static int do_umount(struct vfsmount *mn if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); up_write(&sb->s_umount); @@ -44754,7 +44754,7 @@ diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c return retval; } -@@ -1347,6 +1350,9 @@ static int do_umount(struct vfsmount *mn +@@ -1348,6 +1351,9 @@ static int do_umount(struct vfsmount *mn br_write_unlock(vfsmount_lock); up_write(&namespace_sem); release_mounts(&umount_list); @@ -44764,7 +44764,7 @@ diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c return retval; } -@@ -2338,6 +2344,16 @@ long do_mount(char *dev_name, char *dir_ +@@ -2339,6 +2345,16 @@ long do_mount(char *dev_name, char *dir_ MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | MS_STRICTATIME); @@ -44781,7 +44781,7 @@ diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -2352,6 +2368,9 @@ long do_mount(char *dev_name, char *dir_ +@@ -2353,6 +2369,9 @@ long do_mount(char *dev_name, char *dir_ dev_name, data_page); dput_out: path_put(&path); @@ -44791,7 +44791,7 @@ diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c return retval; } -@@ -2575,6 +2594,11 @@ SYSCALL_DEFINE2(pivot_root, const char _ +@@ -2576,6 +2595,11 @@ SYSCALL_DEFINE2(pivot_root, const char _ if (error) goto out2; @@ -44803,9 +44803,9 @@ diff -urNp linux-3.0.8/fs/namespace.c linux-3.0.8/fs/namespace.c get_fs_root(current->fs, &root); error = lock_mount(&old); if (error) -diff -urNp linux-3.0.8/fs/ncpfs/dir.c linux-3.0.8/fs/ncpfs/dir.c ---- linux-3.0.8/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ncpfs/dir.c linux-3.0.9/fs/ncpfs/dir.c +--- linux-3.0.9/fs/ncpfs/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ncpfs/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr int res, val = 0, len; __u8 __name[NCP_MAXPATHLEN + 1]; @@ -44851,9 +44851,9 @@ diff -urNp linux-3.0.8/fs/ncpfs/dir.c linux-3.0.8/fs/ncpfs/dir.c DPRINTK("ncp_rename: %s/%s to %s/%s\n", old_dentry->d_parent->d_name.name, old_dentry->d_name.name, new_dentry->d_parent->d_name.name, new_dentry->d_name.name); -diff -urNp linux-3.0.8/fs/ncpfs/inode.c linux-3.0.8/fs/ncpfs/inode.c ---- linux-3.0.8/fs/ncpfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ncpfs/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ncpfs/inode.c linux-3.0.9/fs/ncpfs/inode.c +--- linux-3.0.9/fs/ncpfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ncpfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b #endif struct ncp_entry_info finfo; @@ -44863,9 +44863,9 @@ diff -urNp linux-3.0.8/fs/ncpfs/inode.c linux-3.0.8/fs/ncpfs/inode.c memset(&data, 0, sizeof(data)); server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); if (!server) -diff -urNp linux-3.0.8/fs/nfs/inode.c linux-3.0.8/fs/nfs/inode.c ---- linux-3.0.8/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/nfs/inode.c linux-3.0.9/fs/nfs/inode.c +--- linux-3.0.9/fs/nfs/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/nfs/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); nfsi->attrtimeo_timestamp = jiffies; @@ -44895,10 +44895,10 @@ diff -urNp linux-3.0.8/fs/nfs/inode.c linux-3.0.8/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-3.0.8/fs/nfsd/nfs4state.c linux-3.0.8/fs/nfsd/nfs4state.c ---- linux-3.0.8/fs/nfsd/nfs4state.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/nfsd/nfs4state.c 2011-08-23 21:48:14.000000000 -0400 -@@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc +diff -urNp linux-3.0.9/fs/nfsd/nfs4state.c linux-3.0.9/fs/nfsd/nfs4state.c +--- linux-3.0.9/fs/nfsd/nfs4state.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/nfsd/nfs4state.c 2011-11-12 12:47:14.000000000 -0500 +@@ -3804,6 +3804,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc unsigned int strhashval; int err; @@ -44907,10 +44907,10 @@ diff -urNp linux-3.0.8/fs/nfsd/nfs4state.c linux-3.0.8/fs/nfsd/nfs4state.c dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", (long long) lock->lk_offset, (long long) lock->lk_length); -diff -urNp linux-3.0.8/fs/nfsd/nfs4xdr.c linux-3.0.8/fs/nfsd/nfs4xdr.c ---- linux-3.0.8/fs/nfsd/nfs4xdr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/nfsd/nfs4xdr.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s +diff -urNp linux-3.0.9/fs/nfsd/nfs4xdr.c linux-3.0.9/fs/nfsd/nfs4xdr.c +--- linux-3.0.9/fs/nfsd/nfs4xdr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/nfsd/nfs4xdr.c 2011-11-12 12:47:14.000000000 -0500 +@@ -1800,6 +1800,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s .dentry = dentry, }; @@ -44919,9 +44919,9 @@ diff -urNp linux-3.0.8/fs/nfsd/nfs4xdr.c linux-3.0.8/fs/nfsd/nfs4xdr.c BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); -diff -urNp linux-3.0.8/fs/nfsd/vfs.c linux-3.0.8/fs/nfsd/vfs.c ---- linux-3.0.8/fs/nfsd/vfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/nfsd/vfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/nfsd/vfs.c linux-3.0.9/fs/nfsd/vfs.c +--- linux-3.0.9/fs/nfsd/vfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/nfsd/vfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -44949,9 +44949,9 @@ diff -urNp linux-3.0.8/fs/nfsd/vfs.c linux-3.0.8/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-3.0.8/fs/notify/fanotify/fanotify_user.c linux-3.0.8/fs/notify/fanotify/fanotify_user.c ---- linux-3.0.8/fs/notify/fanotify/fanotify_user.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/notify/fanotify/fanotify_user.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/notify/fanotify/fanotify_user.c linux-3.0.9/fs/notify/fanotify/fanotify_user.c +--- linux-3.0.9/fs/notify/fanotify/fanotify_user.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/notify/fanotify/fanotify_user.c 2011-11-12 12:47:14.000000000 -0500 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct goto out_close_fd; @@ -44962,9 +44962,9 @@ diff -urNp linux-3.0.8/fs/notify/fanotify/fanotify_user.c linux-3.0.8/fs/notify/ fanotify_event_metadata.event_len)) goto out_kill_access_response; -diff -urNp linux-3.0.8/fs/notify/notification.c linux-3.0.8/fs/notify/notification.c ---- linux-3.0.8/fs/notify/notification.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/notify/notification.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/notify/notification.c linux-3.0.9/fs/notify/notification.c +--- linux-3.0.9/fs/notify/notification.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/notify/notification.c 2011-11-12 12:47:14.000000000 -0500 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event * get set to 0 so it will never get 'freed' */ @@ -44983,9 +44983,9 @@ diff -urNp linux-3.0.8/fs/notify/notification.c linux-3.0.8/fs/notify/notificati } EXPORT_SYMBOL_GPL(fsnotify_get_cookie); -diff -urNp linux-3.0.8/fs/ntfs/dir.c linux-3.0.8/fs/ntfs/dir.c ---- linux-3.0.8/fs/ntfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ntfs/dir.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ntfs/dir.c linux-3.0.9/fs/ntfs/dir.c +--- linux-3.0.9/fs/ntfs/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ntfs/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -1329,7 +1329,7 @@ find_next_index_buffer: ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK & ~(s64)(ndir->itype.index.block_size - 1))); @@ -44995,9 +44995,9 @@ diff -urNp linux-3.0.8/fs/ntfs/dir.c linux-3.0.8/fs/ntfs/dir.c 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-3.0.8/fs/ntfs/file.c linux-3.0.8/fs/ntfs/file.c ---- linux-3.0.8/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ntfs/file.c linux-3.0.9/fs/ntfs/file.c +--- linux-3.0.9/fs/ntfs/file.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ntfs/file.c 2011-11-12 12:47:14.000000000 -0500 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -45007,9 +45007,9 @@ diff -urNp linux-3.0.8/fs/ntfs/file.c linux-3.0.8/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-3.0.8/fs/ocfs2/localalloc.c linux-3.0.8/fs/ocfs2/localalloc.c ---- linux-3.0.8/fs/ocfs2/localalloc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/localalloc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/localalloc.c linux-3.0.9/fs/ocfs2/localalloc.c +--- linux-3.0.9/fs/ocfs2/localalloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/localalloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -45019,9 +45019,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/localalloc.c linux-3.0.8/fs/ocfs2/localalloc.c bail: if (handle) -diff -urNp linux-3.0.8/fs/ocfs2/namei.c linux-3.0.8/fs/ocfs2/namei.c ---- linux-3.0.8/fs/ocfs2/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/namei.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/namei.c linux-3.0.9/fs/ocfs2/namei.c +--- linux-3.0.9/fs/ocfs2/namei.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/namei.c 2011-11-12 12:47:14.000000000 -0500 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol struct ocfs2_dir_lookup_result orphan_insert = { NULL, }; struct ocfs2_dir_lookup_result target_insert = { NULL, }; @@ -45031,9 +45031,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/namei.c linux-3.0.8/fs/ocfs2/namei.c /* At some point it might be nice to break this function up a * bit. */ -diff -urNp linux-3.0.8/fs/ocfs2/ocfs2.h linux-3.0.8/fs/ocfs2/ocfs2.h ---- linux-3.0.8/fs/ocfs2/ocfs2.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/ocfs2.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/ocfs2.h linux-3.0.9/fs/ocfs2/ocfs2.h +--- linux-3.0.9/fs/ocfs2/ocfs2.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/ocfs2.h 2011-11-12 12:47:14.000000000 -0500 @@ -235,11 +235,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -45051,9 +45051,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/ocfs2.h linux-3.0.8/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-3.0.8/fs/ocfs2/suballoc.c linux-3.0.8/fs/ocfs2/suballoc.c ---- linux-3.0.8/fs/ocfs2/suballoc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/suballoc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/suballoc.c linux-3.0.9/fs/ocfs2/suballoc.c +--- linux-3.0.9/fs/ocfs2/suballoc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/suballoc.c 2011-11-12 12:47:14.000000000 -0500 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -45108,9 +45108,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/suballoc.c linux-3.0.8/fs/ocfs2/suballoc.c *num_clusters = res.sr_bits; } } -diff -urNp linux-3.0.8/fs/ocfs2/super.c linux-3.0.8/fs/ocfs2/super.c ---- linux-3.0.8/fs/ocfs2/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/super.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/super.c linux-3.0.9/fs/ocfs2/super.c +--- linux-3.0.9/fs/ocfs2/super.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/super.c 2011-11-12 12:47:14.000000000 -0500 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -45145,9 +45145,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/super.c linux-3.0.8/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-3.0.8/fs/ocfs2/symlink.c linux-3.0.8/fs/ocfs2/symlink.c ---- linux-3.0.8/fs/ocfs2/symlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/ocfs2/symlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/ocfs2/symlink.c linux-3.0.9/fs/ocfs2/symlink.c +--- linux-3.0.9/fs/ocfs2/symlink.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/ocfs2/symlink.c 2011-11-12 12:47:14.000000000 -0500 @@ -142,7 +142,7 @@ bail: static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -45157,9 +45157,9 @@ diff -urNp linux-3.0.8/fs/ocfs2/symlink.c linux-3.0.8/fs/ocfs2/symlink.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-3.0.8/fs/open.c linux-3.0.8/fs/open.c ---- linux-3.0.8/fs/open.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/open.c 2011-09-14 09:16:46.000000000 -0400 +diff -urNp linux-3.0.9/fs/open.c linux-3.0.9/fs/open.c +--- linux-3.0.9/fs/open.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/open.c 2011-11-12 12:47:14.000000000 -0500 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _ error = locks_verify_truncate(inode, NULL, length); if (!error) @@ -45292,9 +45292,9 @@ diff -urNp linux-3.0.8/fs/open.c linux-3.0.8/fs/open.c if (IS_ERR(f)) { put_unused_fd(fd); fd = PTR_ERR(f); -diff -urNp linux-3.0.8/fs/partitions/ldm.c linux-3.0.8/fs/partitions/ldm.c ---- linux-3.0.8/fs/partitions/ldm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/partitions/ldm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/partitions/ldm.c linux-3.0.9/fs/partitions/ldm.c +--- linux-3.0.9/fs/partitions/ldm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/partitions/ldm.c 2011-11-12 12:47:14.000000000 -0500 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data ldm_error ("A VBLK claims to have %d parts.", num); return false; @@ -45312,9 +45312,9 @@ diff -urNp linux-3.0.8/fs/partitions/ldm.c linux-3.0.8/fs/partitions/ldm.c if (!f) { ldm_crit ("Out of memory."); return false; -diff -urNp linux-3.0.8/fs/pipe.c linux-3.0.8/fs/pipe.c ---- linux-3.0.8/fs/pipe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/pipe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/pipe.c linux-3.0.9/fs/pipe.c +--- linux-3.0.9/fs/pipe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/pipe.c 2011-11-12 12:47:14.000000000 -0500 @@ -420,9 +420,9 @@ redo: } if (bufs) /* More to do? */ @@ -45438,9 +45438,9 @@ diff -urNp linux-3.0.8/fs/pipe.c linux-3.0.8/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-3.0.8/fs/proc/array.c linux-3.0.8/fs/proc/array.c ---- linux-3.0.8/fs/proc/array.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/array.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/array.c linux-3.0.9/fs/proc/array.c +--- linux-3.0.9/fs/proc/array.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/array.c 2011-11-12 12:47:14.000000000 -0500 @@ -60,6 +60,7 @@ #include <linux/tty.h> #include <linux/string.h> @@ -45564,9 +45564,9 @@ diff -urNp linux-3.0.8/fs/proc/array.c linux-3.0.8/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &curr_ip); +} +#endif -diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c ---- linux-3.0.8/fs/proc/base.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/fs/proc/base.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/base.c linux-3.0.9/fs/proc/base.c +--- linux-3.0.9/fs/proc/base.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/base.c 2011-11-12 12:47:14.000000000 -0500 @@ -107,6 +107,22 @@ struct pid_entry { union proc_op op; }; @@ -45823,7 +45823,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -2169,11 +2268,21 @@ static const struct file_operations proc +@@ -2177,11 +2276,21 @@ static const struct file_operations proc */ static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags) { @@ -45847,7 +45847,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c return rv; } -@@ -2283,6 +2392,9 @@ static struct dentry *proc_pident_lookup +@@ -2291,6 +2400,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -45857,7 +45857,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/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. -@@ -2327,6 +2439,9 @@ static int proc_pident_readdir(struct fi +@@ -2335,6 +2447,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -45867,7 +45867,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2597,7 +2712,7 @@ static void *proc_self_follow_link(struc +@@ -2605,7 +2720,7 @@ static void *proc_self_follow_link(struc static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -45876,7 +45876,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c if (!IS_ERR(s)) __putname(s); } -@@ -2656,6 +2771,7 @@ static struct dentry *proc_base_instanti +@@ -2664,6 +2779,7 @@ static struct dentry *proc_base_instanti if (p->fop) inode->i_fop = p->fop; ei->op = p->op; @@ -45884,7 +45884,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c d_add(dentry, inode); error = NULL; out: -@@ -2795,7 +2911,7 @@ static const struct pid_entry tgid_base_ +@@ -2803,7 +2919,7 @@ static const struct pid_entry tgid_base_ REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -45893,7 +45893,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2820,10 +2936,10 @@ static const struct pid_entry tgid_base_ +@@ -2828,10 +2944,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 @@ -45906,7 +45906,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2857,6 +2973,9 @@ static const struct pid_entry tgid_base_ +@@ -2865,6 +2981,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_HARDWALL INF("hardwall", S_IRUGO, proc_pid_hardwall), #endif @@ -45916,7 +45916,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2982,7 +3101,14 @@ static struct dentry *proc_pid_instantia +@@ -2990,7 +3109,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -45931,7 +45931,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -3024,7 +3150,14 @@ struct dentry *proc_pid_lookup(struct in +@@ -3032,7 +3158,14 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -45946,7 +45946,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c put_task_struct(task); out: return result; -@@ -3089,6 +3222,11 @@ int proc_pid_readdir(struct file * filp, +@@ -3097,6 +3230,11 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr; struct task_struct *reaper; @@ -45958,7 +45958,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -3112,8 +3250,27 @@ int proc_pid_readdir(struct file * filp, +@@ -3120,8 +3258,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -45987,7 +45987,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c put_task_struct(iter.task); goto out; } -@@ -3141,7 +3298,7 @@ static const struct pid_entry tid_base_s +@@ -3149,7 +3306,7 @@ static const struct pid_entry tid_base_s REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations), @@ -45996,7 +45996,7 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c INF("syscall", S_IRUGO, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -3165,10 +3322,10 @@ static const struct pid_entry tid_base_s +@@ -3173,10 +3330,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 @@ -46009,9 +46009,9 @@ diff -urNp linux-3.0.8/fs/proc/base.c linux-3.0.8/fs/proc/base.c ONE("stack", S_IRUGO, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-3.0.8/fs/proc/cmdline.c linux-3.0.8/fs/proc/cmdline.c ---- linux-3.0.8/fs/proc/cmdline.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/cmdline.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/cmdline.c linux-3.0.9/fs/proc/cmdline.c +--- linux-3.0.9/fs/proc/cmdline.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/cmdline.c 2011-11-12 12:47:14.000000000 -0500 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -46024,9 +46024,9 @@ diff -urNp linux-3.0.8/fs/proc/cmdline.c linux-3.0.8/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-3.0.8/fs/proc/devices.c linux-3.0.8/fs/proc/devices.c ---- linux-3.0.8/fs/proc/devices.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/devices.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/devices.c linux-3.0.9/fs/proc/devices.c +--- linux-3.0.9/fs/proc/devices.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/devices.c 2011-11-12 12:47:14.000000000 -0500 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -46039,9 +46039,9 @@ diff -urNp linux-3.0.8/fs/proc/devices.c linux-3.0.8/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-3.0.8/fs/proc/inode.c linux-3.0.8/fs/proc/inode.c ---- linux-3.0.8/fs/proc/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/inode.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/inode.c linux-3.0.9/fs/proc/inode.c +--- linux-3.0.9/fs/proc/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -18,12 +18,18 @@ #include <linux/module.h> #include <linux/sysctl.h> @@ -46087,9 +46087,9 @@ diff -urNp linux-3.0.8/fs/proc/inode.c linux-3.0.8/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-3.0.8/fs/proc/internal.h linux-3.0.8/fs/proc/internal.h ---- linux-3.0.8/fs/proc/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/internal.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/internal.h linux-3.0.9/fs/proc/internal.h +--- linux-3.0.9/fs/proc/internal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/internal.h 2011-11-12 12:47:14.000000000 -0500 @@ -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, @@ -46100,9 +46100,9 @@ diff -urNp linux-3.0.8/fs/proc/internal.h linux-3.0.8/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-3.0.8/fs/proc/Kconfig linux-3.0.8/fs/proc/Kconfig ---- linux-3.0.8/fs/proc/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/Kconfig linux-3.0.9/fs/proc/Kconfig +--- linux-3.0.9/fs/proc/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -46130,9 +46130,9 @@ diff -urNp linux-3.0.8/fs/proc/Kconfig linux-3.0.8/fs/proc/Kconfig bool "Enable /proc page monitoring" if EXPERT help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-3.0.8/fs/proc/kcore.c linux-3.0.8/fs/proc/kcore.c ---- linux-3.0.8/fs/proc/kcore.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/kcore.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/kcore.c linux-3.0.9/fs/proc/kcore.c +--- linux-3.0.9/fs/proc/kcore.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/kcore.c 2011-11-12 12:47:14.000000000 -0500 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu off_t offset = 0; struct kcore_list *m; @@ -46200,9 +46200,9 @@ diff -urNp linux-3.0.8/fs/proc/kcore.c linux-3.0.8/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-3.0.8/fs/proc/meminfo.c linux-3.0.8/fs/proc/meminfo.c ---- linux-3.0.8/fs/proc/meminfo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/meminfo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/meminfo.c linux-3.0.9/fs/proc/meminfo.c +--- linux-3.0.9/fs/proc/meminfo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/meminfo.c 2011-11-12 12:47:14.000000000 -0500 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_ unsigned long pages[NR_LRU_LISTS]; int lru; @@ -46221,9 +46221,9 @@ diff -urNp linux-3.0.8/fs/proc/meminfo.c linux-3.0.8/fs/proc/meminfo.c #endif #ifdef CONFIG_TRANSPARENT_HUGEPAGE ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * -diff -urNp linux-3.0.8/fs/proc/nommu.c linux-3.0.8/fs/proc/nommu.c ---- linux-3.0.8/fs/proc/nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/nommu.c linux-3.0.9/fs/proc/nommu.c +--- linux-3.0.9/fs/proc/nommu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/nommu.c 2011-11-12 12:47:14.000000000 -0500 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -46233,9 +46233,9 @@ diff -urNp linux-3.0.8/fs/proc/nommu.c linux-3.0.8/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-3.0.8/fs/proc/proc_net.c linux-3.0.8/fs/proc/proc_net.c ---- linux-3.0.8/fs/proc/proc_net.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/proc_net.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/proc_net.c linux-3.0.9/fs/proc/proc_net.c +--- linux-3.0.9/fs/proc/proc_net.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/proc_net.c 2011-11-12 12:47:14.000000000 -0500 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -46254,9 +46254,9 @@ diff -urNp linux-3.0.8/fs/proc/proc_net.c linux-3.0.8/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-3.0.8/fs/proc/proc_sysctl.c linux-3.0.8/fs/proc/proc_sysctl.c ---- linux-3.0.8/fs/proc/proc_sysctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/proc_sysctl.c 2011-10-19 03:59:32.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/proc_sysctl.c linux-3.0.9/fs/proc/proc_sysctl.c +--- linux-3.0.9/fs/proc/proc_sysctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/proc_sysctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -8,11 +8,13 @@ #include <linux/namei.h> #include "internal.h" @@ -46334,9 +46334,9 @@ diff -urNp linux-3.0.8/fs/proc/proc_sysctl.c linux-3.0.8/fs/proc/proc_sysctl.c .lookup = proc_sys_lookup, .permission = proc_sys_permission, .setattr = proc_sys_setattr, -diff -urNp linux-3.0.8/fs/proc/root.c linux-3.0.8/fs/proc/root.c ---- linux-3.0.8/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/root.c linux-3.0.9/fs/proc/root.c +--- linux-3.0.9/fs/proc/root.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/root.c 2011-11-12 12:47:14.000000000 -0500 @@ -123,7 +123,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -46353,9 +46353,9 @@ diff -urNp linux-3.0.8/fs/proc/root.c linux-3.0.8/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-3.0.8/fs/proc/task_mmu.c linux-3.0.8/fs/proc/task_mmu.c ---- linux-3.0.8/fs/proc/task_mmu.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/fs/proc/task_mmu.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/task_mmu.c linux-3.0.9/fs/proc/task_mmu.c +--- linux-3.0.9/fs/proc/task_mmu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/task_mmu.c 2011-11-12 12:47:14.000000000 -0500 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -46495,9 +46495,9 @@ diff -urNp linux-3.0.8/fs/proc/task_mmu.c linux-3.0.8/fs/proc/task_mmu.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-3.0.8/fs/proc/task_nommu.c linux-3.0.8/fs/proc/task_nommu.c ---- linux-3.0.8/fs/proc/task_nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/proc/task_nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/proc/task_nommu.c linux-3.0.9/fs/proc/task_nommu.c +--- linux-3.0.9/fs/proc/task_nommu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/proc/task_nommu.c 2011-11-12 12:47:14.000000000 -0500 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -46516,9 +46516,9 @@ diff -urNp linux-3.0.8/fs/proc/task_nommu.c linux-3.0.8/fs/proc/task_nommu.c } else if (mm) { if (vma->vm_start <= mm->start_stack && vma->vm_end >= mm->start_stack) { -diff -urNp linux-3.0.8/fs/quota/netlink.c linux-3.0.8/fs/quota/netlink.c ---- linux-3.0.8/fs/quota/netlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/quota/netlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/quota/netlink.c linux-3.0.9/fs/quota/netlink.c +--- linux-3.0.9/fs/quota/netlink.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/quota/netlink.c 2011-11-12 12:47:14.000000000 -0500 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam void quota_send_warning(short type, unsigned int id, dev_t dev, const char warntype) @@ -46537,9 +46537,9 @@ diff -urNp linux-3.0.8/fs/quota/netlink.c linux-3.0.8/fs/quota/netlink.c "a_genl_family, 0, QUOTA_NL_C_WARNING); if (!msg_head) { printk(KERN_ERR -diff -urNp linux-3.0.8/fs/readdir.c linux-3.0.8/fs/readdir.c ---- linux-3.0.8/fs/readdir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/readdir.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/readdir.c linux-3.0.9/fs/readdir.c +--- linux-3.0.9/fs/readdir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/readdir.c 2011-11-12 12:47:14.000000000 -0500 @@ -17,6 +17,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -46638,9 +46638,9 @@ diff -urNp linux-3.0.8/fs/readdir.c linux-3.0.8/fs/readdir.c if (__put_user(d_off, &lastdirent->d_off)) error = -EFAULT; else -diff -urNp linux-3.0.8/fs/reiserfs/dir.c linux-3.0.8/fs/reiserfs/dir.c ---- linux-3.0.8/fs/reiserfs/dir.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/dir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/dir.c linux-3.0.9/fs/reiserfs/dir.c +--- linux-3.0.9/fs/reiserfs/dir.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/dir.c 2011-11-12 12:47:14.000000000 -0500 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr struct reiserfs_dir_entry de; int ret = 0; @@ -46650,9 +46650,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/dir.c linux-3.0.8/fs/reiserfs/dir.c reiserfs_write_lock(inode->i_sb); reiserfs_check_lock_depth(inode->i_sb, "readdir"); -diff -urNp linux-3.0.8/fs/reiserfs/do_balan.c linux-3.0.8/fs/reiserfs/do_balan.c ---- linux-3.0.8/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/do_balan.c linux-3.0.9/fs/reiserfs/do_balan.c +--- linux-3.0.9/fs/reiserfs/do_balan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/do_balan.c 2011-11-12 12:47:14.000000000 -0500 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -46662,9 +46662,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/do_balan.c linux-3.0.8/fs/reiserfs/do_balan.c do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-3.0.8/fs/reiserfs/journal.c linux-3.0.8/fs/reiserfs/journal.c ---- linux-3.0.8/fs/reiserfs/journal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/journal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/journal.c linux-3.0.9/fs/reiserfs/journal.c +--- linux-3.0.9/fs/reiserfs/journal.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/journal.c 2011-11-12 12:47:14.000000000 -0500 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea struct buffer_head *bh; int i, j; @@ -46674,9 +46674,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/journal.c linux-3.0.8/fs/reiserfs/journal.c bh = __getblk(dev, block, bufsize); if (buffer_uptodate(bh)) return (bh); -diff -urNp linux-3.0.8/fs/reiserfs/namei.c linux-3.0.8/fs/reiserfs/namei.c ---- linux-3.0.8/fs/reiserfs/namei.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/namei.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/namei.c linux-3.0.9/fs/reiserfs/namei.c +--- linux-3.0.9/fs/reiserfs/namei.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/namei.c 2011-11-12 12:47:14.000000000 -0500 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode unsigned long savelink = 1; struct timespec ctime; @@ -46686,9 +46686,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/namei.c linux-3.0.8/fs/reiserfs/namei.c /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion stat data updates: (1) old directory, -diff -urNp linux-3.0.8/fs/reiserfs/procfs.c linux-3.0.8/fs/reiserfs/procfs.c ---- linux-3.0.8/fs/reiserfs/procfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/procfs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/procfs.c linux-3.0.9/fs/reiserfs/procfs.c +--- linux-3.0.9/fs/reiserfs/procfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/procfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -46707,9 +46707,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/procfs.c linux-3.0.8/fs/reiserfs/procfs.c seq_printf(m, /* on-disk fields */ "jp_journal_1st_block: \t%i\n" "jp_journal_dev: \t%s[%x]\n" -diff -urNp linux-3.0.8/fs/reiserfs/stree.c linux-3.0.8/fs/reiserfs/stree.c ---- linux-3.0.8/fs/reiserfs/stree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/stree.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/stree.c linux-3.0.9/fs/reiserfs/stree.c +--- linux-3.0.9/fs/reiserfs/stree.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/stree.c 2011-11-12 12:47:14.000000000 -0500 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs int iter = 0; #endif @@ -46755,9 +46755,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/stree.c linux-3.0.8/fs/reiserfs/stree.c BUG_ON(!th->t_trans_id); if (inode) { /* Do we count quotas for item? */ -diff -urNp linux-3.0.8/fs/reiserfs/super.c linux-3.0.8/fs/reiserfs/super.c ---- linux-3.0.8/fs/reiserfs/super.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/reiserfs/super.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/reiserfs/super.c linux-3.0.9/fs/reiserfs/super.c +--- linux-3.0.9/fs/reiserfs/super.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/reiserfs/super.c 2011-11-12 12:47:14.000000000 -0500 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct {.option_name = NULL} }; @@ -46767,9 +46767,9 @@ diff -urNp linux-3.0.8/fs/reiserfs/super.c linux-3.0.8/fs/reiserfs/super.c *blocks = 0; if (!options || !*options) /* use default configuration: create tails, journaling on, no -diff -urNp linux-3.0.8/fs/select.c linux-3.0.8/fs/select.c ---- linux-3.0.8/fs/select.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/select.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/select.c linux-3.0.9/fs/select.c +--- linux-3.0.9/fs/select.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/select.c 2011-11-12 12:47:14.000000000 -0500 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -46806,9 +46806,9 @@ diff -urNp linux-3.0.8/fs/select.c linux-3.0.8/fs/select.c if (nfds > rlimit(RLIMIT_NOFILE)) return -EINVAL; -diff -urNp linux-3.0.8/fs/seq_file.c linux-3.0.8/fs/seq_file.c ---- linux-3.0.8/fs/seq_file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/seq_file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/seq_file.c linux-3.0.9/fs/seq_file.c +--- linux-3.0.9/fs/seq_file.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/seq_file.c 2011-11-12 12:47:14.000000000 -0500 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -46858,9 +46858,9 @@ diff -urNp linux-3.0.8/fs/seq_file.c linux-3.0.8/fs/seq_file.c int res = -ENOMEM; if (op) { -diff -urNp linux-3.0.8/fs/splice.c linux-3.0.8/fs/splice.c ---- linux-3.0.8/fs/splice.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/splice.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/fs/splice.c linux-3.0.9/fs/splice.c +--- linux-3.0.9/fs/splice.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/splice.c 2011-11-12 12:47:14.000000000 -0500 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -47026,9 +47026,9 @@ diff -urNp linux-3.0.8/fs/splice.c linux-3.0.8/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-3.0.8/fs/sysfs/file.c linux-3.0.8/fs/sysfs/file.c ---- linux-3.0.8/fs/sysfs/file.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/sysfs/file.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/sysfs/file.c linux-3.0.9/fs/sysfs/file.c +--- linux-3.0.9/fs/sysfs/file.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/sysfs/file.c 2011-11-12 12:47:14.000000000 -0500 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent struct sysfs_open_dirent { @@ -47074,9 +47074,9 @@ diff -urNp linux-3.0.8/fs/sysfs/file.c linux-3.0.8/fs/sysfs/file.c wake_up_interruptible(&od->poll); } -diff -urNp linux-3.0.8/fs/sysfs/mount.c linux-3.0.8/fs/sysfs/mount.c ---- linux-3.0.8/fs/sysfs/mount.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/sysfs/mount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/sysfs/mount.c linux-3.0.9/fs/sysfs/mount.c +--- linux-3.0.9/fs/sysfs/mount.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/sysfs/mount.c 2011-11-12 12:47:14.000000000 -0500 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = { .s_name = "", .s_count = ATOMIC_INIT(1), @@ -47089,9 +47089,9 @@ diff -urNp linux-3.0.8/fs/sysfs/mount.c linux-3.0.8/fs/sysfs/mount.c .s_ino = 1, }; -diff -urNp linux-3.0.8/fs/sysfs/symlink.c linux-3.0.8/fs/sysfs/symlink.c ---- linux-3.0.8/fs/sysfs/symlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/sysfs/symlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/sysfs/symlink.c linux-3.0.9/fs/sysfs/symlink.c +--- linux-3.0.9/fs/sysfs/symlink.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/sysfs/symlink.c 2011-11-12 12:47:14.000000000 -0500 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -47101,9 +47101,9 @@ diff -urNp linux-3.0.8/fs/sysfs/symlink.c linux-3.0.8/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-3.0.8/fs/udf/inode.c linux-3.0.8/fs/udf/inode.c ---- linux-3.0.8/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/udf/inode.c linux-3.0.9/fs/udf/inode.c +--- linux-3.0.9/fs/udf/inode.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/udf/inode.c 2011-11-12 12:47:14.000000000 -0500 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk( int goal = 0, pgoal = iinfo->i_location.logicalBlockNum; int lastblock = 0; @@ -47113,9 +47113,9 @@ diff -urNp linux-3.0.8/fs/udf/inode.c linux-3.0.8/fs/udf/inode.c prev_epos.offset = udf_file_entry_alloc_offset(inode); prev_epos.block = iinfo->i_location; prev_epos.bh = NULL; -diff -urNp linux-3.0.8/fs/udf/misc.c linux-3.0.8/fs/udf/misc.c ---- linux-3.0.8/fs/udf/misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/udf/misc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/udf/misc.c linux-3.0.9/fs/udf/misc.c +--- linux-3.0.9/fs/udf/misc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/udf/misc.c 2011-11-12 12:47:14.000000000 -0500 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id u8 udf_tag_checksum(const struct tag *t) @@ -47125,9 +47125,9 @@ diff -urNp linux-3.0.8/fs/udf/misc.c linux-3.0.8/fs/udf/misc.c u8 checksum = 0; int i; for (i = 0; i < sizeof(struct tag); ++i) -diff -urNp linux-3.0.8/fs/utimes.c linux-3.0.8/fs/utimes.c ---- linux-3.0.8/fs/utimes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/utimes.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/utimes.c linux-3.0.9/fs/utimes.c +--- linux-3.0.9/fs/utimes.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/utimes.c 2011-11-12 12:47:14.000000000 -0500 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -47149,9 +47149,9 @@ diff -urNp linux-3.0.8/fs/utimes.c linux-3.0.8/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-3.0.8/fs/xattr_acl.c linux-3.0.8/fs/xattr_acl.c ---- linux-3.0.8/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/xattr_acl.c linux-3.0.9/fs/xattr_acl.c +--- linux-3.0.9/fs/xattr_acl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xattr_acl.c 2011-11-12 12:47:14.000000000 -0500 @@ -17,8 +17,8 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size) @@ -47163,9 +47163,9 @@ diff -urNp linux-3.0.8/fs/xattr_acl.c linux-3.0.8/fs/xattr_acl.c int count; struct posix_acl *acl; struct posix_acl_entry *acl_e; -diff -urNp linux-3.0.8/fs/xattr.c linux-3.0.8/fs/xattr.c ---- linux-3.0.8/fs/xattr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xattr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/xattr.c linux-3.0.9/fs/xattr.c +--- linux-3.0.9/fs/xattr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xattr.c 2011-11-12 12:47:14.000000000 -0500 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr); * Extended attribute SET operations */ @@ -47228,9 +47228,9 @@ diff -urNp linux-3.0.8/fs/xattr.c linux-3.0.8/fs/xattr.c mnt_drop_write(f->f_path.mnt); } fput(f); -diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c ---- linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c +--- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-11-12 12:47:14.000000000 -0500 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1( xfs_fsop_geom_t fsgeo; int error; @@ -47239,9 +47239,9 @@ diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.8/fs/xfs/linux-2 error = xfs_fs_geometry(mp, &fsgeo, 3); if (error) return -error; -diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c ---- linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c +--- linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -128,7 +128,7 @@ xfs_find_handle( } @@ -47251,9 +47251,9 @@ diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.8/fs/xfs/linux-2.6 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; -diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c ---- linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c +--- linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xfs/linux-2.6/xfs_iops.c 2011-11-12 12:47:14.000000000 -0500 @@ -437,7 +437,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -47263,9 +47263,9 @@ diff -urNp linux-3.0.8/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.8/fs/xfs/linux-2.6/ if (!IS_ERR(s)) kfree(s); -diff -urNp linux-3.0.8/fs/xfs/xfs_bmap.c linux-3.0.8/fs/xfs/xfs_bmap.c ---- linux-3.0.8/fs/xfs/xfs_bmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xfs/xfs_bmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/xfs/xfs_bmap.c linux-3.0.9/fs/xfs/xfs_bmap.c +--- linux-3.0.9/fs/xfs/xfs_bmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xfs/xfs_bmap.c 2011-11-12 12:47:14.000000000 -0500 @@ -253,7 +253,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -47275,9 +47275,9 @@ diff -urNp linux-3.0.8/fs/xfs/xfs_bmap.c linux-3.0.8/fs/xfs/xfs_bmap.c #endif /* DEBUG */ STATIC int -diff -urNp linux-3.0.8/fs/xfs/xfs_dir2_sf.c linux-3.0.8/fs/xfs/xfs_dir2_sf.c ---- linux-3.0.8/fs/xfs/xfs_dir2_sf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/fs/xfs/xfs_dir2_sf.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/fs/xfs/xfs_dir2_sf.c linux-3.0.9/fs/xfs/xfs_dir2_sf.c +--- linux-3.0.9/fs/xfs/xfs_dir2_sf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/fs/xfs/xfs_dir2_sf.c 2011-11-12 12:47:14.000000000 -0500 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents( } @@ -47295,9 +47295,9 @@ diff -urNp linux-3.0.8/fs/xfs/xfs_dir2_sf.c linux-3.0.8/fs/xfs/xfs_dir2_sf.c off & 0x7fffffff, ino, DT_UNKNOWN)) { *offset = off & 0x7fffffff; return 0; -diff -urNp linux-3.0.8/grsecurity/gracl_alloc.c linux-3.0.8/grsecurity/gracl_alloc.c ---- linux-3.0.8/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_alloc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_alloc.c linux-3.0.9/grsecurity/gracl_alloc.c +--- linux-3.0.9/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_alloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -47404,9 +47404,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_alloc.c linux-3.0.8/grsecurity/gracl_all + else + return 1; +} -diff -urNp linux-3.0.8/grsecurity/gracl.c linux-3.0.8/grsecurity/gracl.c ---- linux-3.0.8/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl.c 2011-10-17 06:42:59.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl.c linux-3.0.9/grsecurity/gracl.c +--- linux-3.0.9/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,4154 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -51562,9 +51562,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl.c linux-3.0.8/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-3.0.8/grsecurity/gracl_cap.c linux-3.0.8/grsecurity/gracl_cap.c ---- linux-3.0.8/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_cap.c 2011-09-14 09:21:24.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_cap.c linux-3.0.9/grsecurity/gracl_cap.c +--- linux-3.0.9/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_cap.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,101 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -51667,9 +51667,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_cap.c linux-3.0.8/grsecurity/gracl_cap.c + return 0; +} + -diff -urNp linux-3.0.8/grsecurity/gracl_fs.c linux-3.0.8/grsecurity/gracl_fs.c ---- linux-3.0.8/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_fs.c 2011-10-17 01:22:26.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_fs.c linux-3.0.9/grsecurity/gracl_fs.c +--- linux-3.0.9/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_fs.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,431 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -52102,9 +52102,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_fs.c linux-3.0.8/grsecurity/gracl_fs.c + + return 0; +} -diff -urNp linux-3.0.8/grsecurity/gracl_ip.c linux-3.0.8/grsecurity/gracl_ip.c ---- linux-3.0.8/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_ip.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_ip.c linux-3.0.9/grsecurity/gracl_ip.c +--- linux-3.0.9/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_ip.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,381 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -52487,9 +52487,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_ip.c linux-3.0.8/grsecurity/gracl_ip.c + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-3.0.8/grsecurity/gracl_learn.c linux-3.0.8/grsecurity/gracl_learn.c ---- linux-3.0.8/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_learn.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_learn.c linux-3.0.9/grsecurity/gracl_learn.c +--- linux-3.0.9/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_learn.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,207 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -52698,9 +52698,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_learn.c linux-3.0.8/grsecurity/gracl_lea + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-3.0.8/grsecurity/gracl_res.c linux-3.0.8/grsecurity/gracl_res.c ---- linux-3.0.8/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_res.c linux-3.0.9/grsecurity/gracl_res.c +--- linux-3.0.9/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_res.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,68 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -52770,9 +52770,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_res.c linux-3.0.8/grsecurity/gracl_res.c + rcu_read_unlock(); + return; +} -diff -urNp linux-3.0.8/grsecurity/gracl_segv.c linux-3.0.8/grsecurity/gracl_segv.c ---- linux-3.0.8/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_segv.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_segv.c linux-3.0.9/grsecurity/gracl_segv.c +--- linux-3.0.9/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_segv.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,299 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -53073,9 +53073,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_segv.c linux-3.0.8/grsecurity/gracl_segv + + return; +} -diff -urNp linux-3.0.8/grsecurity/gracl_shm.c linux-3.0.8/grsecurity/gracl_shm.c ---- linux-3.0.8/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/gracl_shm.c linux-3.0.9/grsecurity/gracl_shm.c +--- linux-3.0.9/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/gracl_shm.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,40 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -53117,9 +53117,9 @@ diff -urNp linux-3.0.8/grsecurity/gracl_shm.c linux-3.0.8/grsecurity/gracl_shm.c + + return 1; +} -diff -urNp linux-3.0.8/grsecurity/grsec_chdir.c linux-3.0.8/grsecurity/grsec_chdir.c ---- linux-3.0.8/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_chdir.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_chdir.c linux-3.0.9/grsecurity/grsec_chdir.c +--- linux-3.0.9/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_chdir.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -53140,9 +53140,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_chdir.c linux-3.0.8/grsecurity/grsec_chd +#endif + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_chroot.c linux-3.0.8/grsecurity/grsec_chroot.c ---- linux-3.0.8/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_chroot.c 2011-09-15 06:47:48.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_chroot.c linux-3.0.9/grsecurity/grsec_chroot.c +--- linux-3.0.9/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_chroot.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,351 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -53495,9 +53495,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_chroot.c linux-3.0.8/grsecurity/grsec_ch +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_disabled.c linux-3.0.8/grsecurity/grsec_disabled.c ---- linux-3.0.8/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_disabled.c 2011-10-25 09:17:34.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_disabled.c linux-3.0.9/grsecurity/grsec_disabled.c +--- linux-3.0.9/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_disabled.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,439 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -53938,9 +53938,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_disabled.c linux-3.0.8/grsecurity/grsec_ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-3.0.8/grsecurity/grsec_exec.c linux-3.0.8/grsecurity/grsec_exec.c ---- linux-3.0.8/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_exec.c 2011-10-20 00:50:54.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_exec.c linux-3.0.9/grsecurity/grsec_exec.c +--- linux-3.0.9/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_exec.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,146 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54088,9 +54088,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_exec.c linux-3.0.8/grsecurity/grsec_exec + +EXPORT_SYMBOL(gr_is_capable); +EXPORT_SYMBOL(gr_is_capable_nolog); -diff -urNp linux-3.0.8/grsecurity/grsec_fifo.c linux-3.0.8/grsecurity/grsec_fifo.c ---- linux-3.0.8/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_fifo.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_fifo.c linux-3.0.9/grsecurity/grsec_fifo.c +--- linux-3.0.9/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_fifo.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54116,9 +54116,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_fifo.c linux-3.0.8/grsecurity/grsec_fifo +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_fork.c linux-3.0.8/grsecurity/grsec_fork.c ---- linux-3.0.8/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_fork.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_fork.c linux-3.0.9/grsecurity/grsec_fork.c +--- linux-3.0.9/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_fork.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,23 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54143,9 +54143,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_fork.c linux-3.0.8/grsecurity/grsec_fork +#endif + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_init.c linux-3.0.8/grsecurity/grsec_init.c ---- linux-3.0.8/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_init.c 2011-08-25 17:25:12.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_init.c linux-3.0.9/grsecurity/grsec_init.c +--- linux-3.0.9/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_init.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,269 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54416,9 +54416,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_init.c linux-3.0.8/grsecurity/grsec_init + + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_link.c linux-3.0.8/grsecurity/grsec_link.c ---- linux-3.0.8/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_link.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_link.c linux-3.0.9/grsecurity/grsec_link.c +--- linux-3.0.9/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_link.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54463,9 +54463,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_link.c linux-3.0.8/grsecurity/grsec_link +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_log.c linux-3.0.8/grsecurity/grsec_log.c ---- linux-3.0.8/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_log.c 2011-09-26 10:46:21.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_log.c linux-3.0.9/grsecurity/grsec_log.c +--- linux-3.0.9/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_log.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,315 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54782,9 +54782,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_log.c linux-3.0.8/grsecurity/grsec_log.c + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-3.0.8/grsecurity/grsec_mem.c linux-3.0.8/grsecurity/grsec_mem.c ---- linux-3.0.8/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_mem.c linux-3.0.9/grsecurity/grsec_mem.c +--- linux-3.0.9/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_mem.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,33 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54819,9 +54819,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_mem.c linux-3.0.8/grsecurity/grsec_mem.c + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_mount.c linux-3.0.8/grsecurity/grsec_mount.c ---- linux-3.0.8/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_mount.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_mount.c linux-3.0.9/grsecurity/grsec_mount.c +--- linux-3.0.9/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_mount.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54885,9 +54885,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_mount.c linux-3.0.8/grsecurity/grsec_mou +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_pax.c linux-3.0.8/grsecurity/grsec_pax.c ---- linux-3.0.8/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_pax.c linux-3.0.9/grsecurity/grsec_pax.c +--- linux-3.0.9/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_pax.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,36 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54925,9 +54925,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_pax.c linux-3.0.8/grsecurity/grsec_pax.c +#endif + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_ptrace.c linux-3.0.8/grsecurity/grsec_ptrace.c ---- linux-3.0.8/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_ptrace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_ptrace.c linux-3.0.9/grsecurity/grsec_ptrace.c +--- linux-3.0.9/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_ptrace.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,14 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -54943,9 +54943,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_ptrace.c linux-3.0.8/grsecurity/grsec_pt +#endif + return; +} -diff -urNp linux-3.0.8/grsecurity/grsec_sig.c linux-3.0.8/grsecurity/grsec_sig.c ---- linux-3.0.8/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_sig.c linux-3.0.9/grsecurity/grsec_sig.c +--- linux-3.0.9/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_sig.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,206 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55153,9 +55153,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_sig.c linux-3.0.8/grsecurity/grsec_sig.c +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_sock.c linux-3.0.8/grsecurity/grsec_sock.c ---- linux-3.0.8/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_sock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_sock.c linux-3.0.9/grsecurity/grsec_sock.c +--- linux-3.0.9/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_sock.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,244 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -55401,9 +55401,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_sock.c linux-3.0.8/grsecurity/grsec_sock +#endif + return 0; +} -diff -urNp linux-3.0.8/grsecurity/grsec_sysctl.c linux-3.0.8/grsecurity/grsec_sysctl.c ---- linux-3.0.8/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_sysctl.c 2011-08-25 17:26:15.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_sysctl.c linux-3.0.9/grsecurity/grsec_sysctl.c +--- linux-3.0.9/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_sysctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,433 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55838,9 +55838,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_sysctl.c linux-3.0.8/grsecurity/grsec_sy + { } +}; +#endif -diff -urNp linux-3.0.8/grsecurity/grsec_time.c linux-3.0.8/grsecurity/grsec_time.c ---- linux-3.0.8/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_time.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_time.c linux-3.0.9/grsecurity/grsec_time.c +--- linux-3.0.9/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_time.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55858,9 +55858,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_time.c linux-3.0.8/grsecurity/grsec_time +} + +EXPORT_SYMBOL(gr_log_timechange); -diff -urNp linux-3.0.8/grsecurity/grsec_tpe.c linux-3.0.8/grsecurity/grsec_tpe.c ---- linux-3.0.8/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsec_tpe.c linux-3.0.9/grsecurity/grsec_tpe.c +--- linux-3.0.9/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsec_tpe.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,39 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -55901,9 +55901,9 @@ diff -urNp linux-3.0.8/grsecurity/grsec_tpe.c linux-3.0.8/grsecurity/grsec_tpe.c +#endif + return 1; +} -diff -urNp linux-3.0.8/grsecurity/grsum.c linux-3.0.8/grsecurity/grsum.c ---- linux-3.0.8/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/grsum.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/grsum.c linux-3.0.9/grsecurity/grsum.c +--- linux-3.0.9/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/grsum.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,61 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -55966,9 +55966,9 @@ diff -urNp linux-3.0.8/grsecurity/grsum.c linux-3.0.8/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-3.0.8/grsecurity/Kconfig linux-3.0.8/grsecurity/Kconfig ---- linux-3.0.8/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/Kconfig 2011-09-15 00:00:57.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/Kconfig linux-3.0.9/grsecurity/Kconfig +--- linux-3.0.9/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,1038 @@ +# +# grecurity configuration @@ -57008,9 +57008,9 @@ diff -urNp linux-3.0.8/grsecurity/Kconfig linux-3.0.8/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-3.0.8/grsecurity/Makefile linux-3.0.8/grsecurity/Makefile ---- linux-3.0.8/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/grsecurity/Makefile 2011-10-17 06:45:43.000000000 -0400 +diff -urNp linux-3.0.9/grsecurity/Makefile linux-3.0.9/grsecurity/Makefile +--- linux-3.0.9/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/grsecurity/Makefile 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,36 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -57048,9 +57048,9 @@ diff -urNp linux-3.0.8/grsecurity/Makefile linux-3.0.8/grsecurity/Makefile + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-3.0.8/include/acpi/acpi_bus.h linux-3.0.8/include/acpi/acpi_bus.h ---- linux-3.0.8/include/acpi/acpi_bus.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/acpi/acpi_bus.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/acpi/acpi_bus.h linux-3.0.9/include/acpi/acpi_bus.h +--- linux-3.0.9/include/acpi/acpi_bus.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/acpi/acpi_bus.h 2011-11-12 12:47:14.000000000 -0500 @@ -107,7 +107,7 @@ struct acpi_device_ops { acpi_op_bind bind; acpi_op_unbind unbind; @@ -57060,9 +57060,9 @@ diff -urNp linux-3.0.8/include/acpi/acpi_bus.h linux-3.0.8/include/acpi/acpi_bus #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */ -diff -urNp linux-3.0.8/include/asm-generic/atomic-long.h linux-3.0.8/include/asm-generic/atomic-long.h ---- linux-3.0.8/include/asm-generic/atomic-long.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/atomic-long.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/atomic-long.h linux-3.0.9/include/asm-generic/atomic-long.h +--- linux-3.0.9/include/asm-generic/atomic-long.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/atomic-long.h 2011-11-12 12:47:14.000000000 -0500 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -57363,9 +57363,9 @@ diff -urNp linux-3.0.8/include/asm-generic/atomic-long.h linux-3.0.8/include/asm +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-3.0.8/include/asm-generic/cache.h linux-3.0.8/include/asm-generic/cache.h ---- linux-3.0.8/include/asm-generic/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/cache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/cache.h linux-3.0.9/include/asm-generic/cache.h +--- linux-3.0.9/include/asm-generic/cache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/cache.h 2011-11-12 12:47:14.000000000 -0500 @@ -6,7 +6,7 @@ * cache lines need to provide their own cache.h. */ @@ -57376,9 +57376,9 @@ diff -urNp linux-3.0.8/include/asm-generic/cache.h linux-3.0.8/include/asm-gener +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT) #endif /* __ASM_GENERIC_CACHE_H */ -diff -urNp linux-3.0.8/include/asm-generic/int-l64.h linux-3.0.8/include/asm-generic/int-l64.h ---- linux-3.0.8/include/asm-generic/int-l64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/int-l64.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/int-l64.h linux-3.0.9/include/asm-generic/int-l64.h +--- linux-3.0.9/include/asm-generic/int-l64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/int-l64.h 2011-11-12 12:47:14.000000000 -0500 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -57388,9 +57388,9 @@ diff -urNp linux-3.0.8/include/asm-generic/int-l64.h linux-3.0.8/include/asm-gen #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-3.0.8/include/asm-generic/int-ll64.h linux-3.0.8/include/asm-generic/int-ll64.h ---- linux-3.0.8/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/int-ll64.h linux-3.0.9/include/asm-generic/int-ll64.h +--- linux-3.0.9/include/asm-generic/int-ll64.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/int-ll64.h 2011-11-12 12:47:14.000000000 -0500 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -57400,9 +57400,9 @@ diff -urNp linux-3.0.8/include/asm-generic/int-ll64.h linux-3.0.8/include/asm-ge #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-3.0.8/include/asm-generic/kmap_types.h linux-3.0.8/include/asm-generic/kmap_types.h ---- linux-3.0.8/include/asm-generic/kmap_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/kmap_types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/kmap_types.h linux-3.0.9/include/asm-generic/kmap_types.h +--- linux-3.0.9/include/asm-generic/kmap_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/kmap_types.h 2011-11-12 12:47:14.000000000 -0500 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, KMAP_D(18) KM_NMI_PTE, @@ -57416,9 +57416,9 @@ diff -urNp linux-3.0.8/include/asm-generic/kmap_types.h linux-3.0.8/include/asm- }; #undef KMAP_D -diff -urNp linux-3.0.8/include/asm-generic/pgtable.h linux-3.0.8/include/asm-generic/pgtable.h ---- linux-3.0.8/include/asm-generic/pgtable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/pgtable.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/pgtable.h linux-3.0.9/include/asm-generic/pgtable.h +--- linux-3.0.9/include/asm-generic/pgtable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/pgtable.h 2011-11-12 12:47:14.000000000 -0500 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd) #endif /* __HAVE_ARCH_PMD_WRITE */ #endif @@ -57434,9 +57434,9 @@ diff -urNp linux-3.0.8/include/asm-generic/pgtable.h linux-3.0.8/include/asm-gen #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopmd.h linux-3.0.8/include/asm-generic/pgtable-nopmd.h ---- linux-3.0.8/include/asm-generic/pgtable-nopmd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/pgtable-nopmd.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopmd.h linux-3.0.9/include/asm-generic/pgtable-nopmd.h +--- linux-3.0.9/include/asm-generic/pgtable-nopmd.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/pgtable-nopmd.h 2011-11-12 12:47:14.000000000 -0500 @@ -1,14 +1,19 @@ #ifndef _PGTABLE_NOPMD_H #define _PGTABLE_NOPMD_H @@ -57473,9 +57473,9 @@ diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopmd.h linux-3.0.8/include/a /* * The "pud_xxx()" functions here are trivial for a folded two-level * setup: the pmd is never bad, and a pmd always exists (as it's folded -diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopud.h linux-3.0.8/include/asm-generic/pgtable-nopud.h ---- linux-3.0.8/include/asm-generic/pgtable-nopud.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/pgtable-nopud.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/pgtable-nopud.h linux-3.0.9/include/asm-generic/pgtable-nopud.h +--- linux-3.0.9/include/asm-generic/pgtable-nopud.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/pgtable-nopud.h 2011-11-12 12:47:14.000000000 -0500 @@ -1,10 +1,15 @@ #ifndef _PGTABLE_NOPUD_H #define _PGTABLE_NOPUD_H @@ -57506,9 +57506,9 @@ diff -urNp linux-3.0.8/include/asm-generic/pgtable-nopud.h linux-3.0.8/include/a /* * The "pgd_xxx()" functions here are trivial for a folded two-level * setup: the pud is never bad, and a pud always exists (as it's folded -diff -urNp linux-3.0.8/include/asm-generic/vmlinux.lds.h linux-3.0.8/include/asm-generic/vmlinux.lds.h ---- linux-3.0.8/include/asm-generic/vmlinux.lds.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/asm-generic/vmlinux.lds.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/asm-generic/vmlinux.lds.h linux-3.0.9/include/asm-generic/vmlinux.lds.h +--- linux-3.0.9/include/asm-generic/vmlinux.lds.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/asm-generic/vmlinux.lds.h 2011-11-12 12:47:14.000000000 -0500 @@ -217,6 +217,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -57540,9 +57540,9 @@ diff -urNp linux-3.0.8/include/asm-generic/vmlinux.lds.h linux-3.0.8/include/asm /** * PERCPU_SECTION - define output section for percpu area, simple version -diff -urNp linux-3.0.8/include/drm/drm_crtc_helper.h linux-3.0.8/include/drm/drm_crtc_helper.h ---- linux-3.0.8/include/drm/drm_crtc_helper.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/drm/drm_crtc_helper.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/drm/drm_crtc_helper.h linux-3.0.9/include/drm/drm_crtc_helper.h +--- linux-3.0.9/include/drm/drm_crtc_helper.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/drm/drm_crtc_helper.h 2011-11-12 12:47:14.000000000 -0500 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs { /* disable crtc when not in use - more explicit than dpms off */ @@ -57561,9 +57561,9 @@ diff -urNp linux-3.0.8/include/drm/drm_crtc_helper.h linux-3.0.8/include/drm/drm struct drm_connector_helper_funcs { int (*get_modes)(struct drm_connector *connector); -diff -urNp linux-3.0.8/include/drm/drmP.h linux-3.0.8/include/drm/drmP.h ---- linux-3.0.8/include/drm/drmP.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/drm/drmP.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/drm/drmP.h linux-3.0.9/include/drm/drmP.h +--- linux-3.0.9/include/drm/drmP.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/drm/drmP.h 2011-11-12 12:47:14.000000000 -0500 @@ -73,6 +73,7 @@ #include <linux/workqueue.h> #include <linux/poll.h> @@ -57590,9 +57590,9 @@ diff -urNp linux-3.0.8/include/drm/drmP.h linux-3.0.8/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-3.0.8/include/drm/ttm/ttm_memory.h linux-3.0.8/include/drm/ttm/ttm_memory.h ---- linux-3.0.8/include/drm/ttm/ttm_memory.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/drm/ttm/ttm_memory.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/drm/ttm/ttm_memory.h linux-3.0.9/include/drm/ttm/ttm_memory.h +--- linux-3.0.9/include/drm/ttm/ttm_memory.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/drm/ttm/ttm_memory.h 2011-11-12 12:47:14.000000000 -0500 @@ -47,7 +47,7 @@ struct ttm_mem_shrink { @@ -57602,9 +57602,9 @@ diff -urNp linux-3.0.8/include/drm/ttm/ttm_memory.h linux-3.0.8/include/drm/ttm/ /** * struct ttm_mem_global - Global memory accounting structure. -diff -urNp linux-3.0.8/include/linux/a.out.h linux-3.0.8/include/linux/a.out.h ---- linux-3.0.8/include/linux/a.out.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/a.out.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/a.out.h linux-3.0.9/include/linux/a.out.h +--- linux-3.0.9/include/linux/a.out.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/a.out.h 2011-11-12 12:47:14.000000000 -0500 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -57620,9 +57620,9 @@ diff -urNp linux-3.0.8/include/linux/a.out.h linux-3.0.8/include/linux/a.out.h #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-3.0.8/include/linux/atmdev.h linux-3.0.8/include/linux/atmdev.h ---- linux-3.0.8/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/atmdev.h linux-3.0.9/include/linux/atmdev.h +--- linux-3.0.9/include/linux/atmdev.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/atmdev.h 2011-11-12 12:47:14.000000000 -0500 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -57632,9 +57632,9 @@ diff -urNp linux-3.0.8/include/linux/atmdev.h linux-3.0.8/include/linux/atmdev.h __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-3.0.8/include/linux/binfmts.h linux-3.0.8/include/linux/binfmts.h ---- linux-3.0.8/include/linux/binfmts.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/binfmts.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/binfmts.h linux-3.0.9/include/linux/binfmts.h +--- linux-3.0.9/include/linux/binfmts.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/binfmts.h 2011-11-12 12:47:14.000000000 -0500 @@ -88,6 +88,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -57643,9 +57643,9 @@ diff -urNp linux-3.0.8/include/linux/binfmts.h linux-3.0.8/include/linux/binfmts unsigned long min_coredump; /* minimal dump size */ }; -diff -urNp linux-3.0.8/include/linux/blkdev.h linux-3.0.8/include/linux/blkdev.h ---- linux-3.0.8/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/blkdev.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/blkdev.h linux-3.0.9/include/linux/blkdev.h +--- linux-3.0.9/include/linux/blkdev.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/blkdev.h 2011-11-12 12:47:14.000000000 -0500 @@ -1308,7 +1308,7 @@ struct block_device_operations { /* this callback is with swap_lock and sometimes page table lock held */ void (*swap_slot_free_notify) (struct block_device *, unsigned long); @@ -57655,9 +57655,9 @@ diff -urNp linux-3.0.8/include/linux/blkdev.h linux-3.0.8/include/linux/blkdev.h extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long); -diff -urNp linux-3.0.8/include/linux/blktrace_api.h linux-3.0.8/include/linux/blktrace_api.h ---- linux-3.0.8/include/linux/blktrace_api.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/blktrace_api.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/blktrace_api.h linux-3.0.9/include/linux/blktrace_api.h +--- linux-3.0.9/include/linux/blktrace_api.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/blktrace_api.h 2011-11-12 12:47:14.000000000 -0500 @@ -161,7 +161,7 @@ struct blk_trace { struct dentry *dir; struct dentry *dropped_file; @@ -57667,9 +57667,9 @@ diff -urNp linux-3.0.8/include/linux/blktrace_api.h linux-3.0.8/include/linux/bl }; extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); -diff -urNp linux-3.0.8/include/linux/byteorder/little_endian.h linux-3.0.8/include/linux/byteorder/little_endian.h ---- linux-3.0.8/include/linux/byteorder/little_endian.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/byteorder/little_endian.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/byteorder/little_endian.h linux-3.0.9/include/linux/byteorder/little_endian.h +--- linux-3.0.9/include/linux/byteorder/little_endian.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/byteorder/little_endian.h 2011-11-12 12:47:14.000000000 -0500 @@ -42,51 +42,51 @@ static inline __le64 __cpu_to_le64p(const __u64 *p) @@ -57734,9 +57734,9 @@ diff -urNp linux-3.0.8/include/linux/byteorder/little_endian.h linux-3.0.8/inclu } #define __cpu_to_le64s(x) do { (void)(x); } while (0) #define __le64_to_cpus(x) do { (void)(x); } while (0) -diff -urNp linux-3.0.8/include/linux/cache.h linux-3.0.8/include/linux/cache.h ---- linux-3.0.8/include/linux/cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/cache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/cache.h linux-3.0.9/include/linux/cache.h +--- linux-3.0.9/include/linux/cache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/cache.h 2011-11-12 12:47:14.000000000 -0500 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -57748,9 +57748,9 @@ diff -urNp linux-3.0.8/include/linux/cache.h linux-3.0.8/include/linux/cache.h #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-3.0.8/include/linux/capability.h linux-3.0.8/include/linux/capability.h ---- linux-3.0.8/include/linux/capability.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/capability.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/capability.h linux-3.0.9/include/linux/capability.h +--- linux-3.0.9/include/linux/capability.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/capability.h 2011-11-12 12:47:14.000000000 -0500 @@ -547,6 +547,9 @@ extern bool capable(int cap); extern bool ns_capable(struct user_namespace *ns, int cap); extern bool task_ns_capable(struct task_struct *t, int cap); @@ -57761,9 +57761,9 @@ diff -urNp linux-3.0.8/include/linux/capability.h linux-3.0.8/include/linux/capa /* audit system wants to get cap info from files as well */ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps); -diff -urNp linux-3.0.8/include/linux/cleancache.h linux-3.0.8/include/linux/cleancache.h ---- linux-3.0.8/include/linux/cleancache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/cleancache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/cleancache.h linux-3.0.9/include/linux/cleancache.h +--- linux-3.0.9/include/linux/cleancache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/cleancache.h 2011-11-12 12:47:14.000000000 -0500 @@ -31,7 +31,7 @@ struct cleancache_ops { void (*flush_page)(int, struct cleancache_filekey, pgoff_t); void (*flush_inode)(int, struct cleancache_filekey); @@ -57773,9 +57773,9 @@ diff -urNp linux-3.0.8/include/linux/cleancache.h linux-3.0.8/include/linux/clea extern struct cleancache_ops cleancache_register_ops(struct cleancache_ops *ops); -diff -urNp linux-3.0.8/include/linux/compiler-gcc4.h linux-3.0.8/include/linux/compiler-gcc4.h ---- linux-3.0.8/include/linux/compiler-gcc4.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/compiler-gcc4.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/compiler-gcc4.h linux-3.0.9/include/linux/compiler-gcc4.h +--- linux-3.0.9/include/linux/compiler-gcc4.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/compiler-gcc4.h 2011-11-12 12:47:14.000000000 -0500 @@ -31,6 +31,12 @@ @@ -57801,9 +57801,9 @@ diff -urNp linux-3.0.8/include/linux/compiler-gcc4.h linux-3.0.8/include/linux/c #endif #if __GNUC_MINOR__ > 0 -diff -urNp linux-3.0.8/include/linux/compiler.h linux-3.0.8/include/linux/compiler.h ---- linux-3.0.8/include/linux/compiler.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/compiler.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compiler.h +--- linux-3.0.9/include/linux/compiler.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/compiler.h 2011-11-12 12:47:14.000000000 -0500 @@ -5,31 +5,62 @@ #ifdef __CHECKER__ @@ -57924,9 +57924,9 @@ diff -urNp linux-3.0.8/include/linux/compiler.h linux-3.0.8/include/linux/compil +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x)) #endif /* __LINUX_COMPILER_H */ -diff -urNp linux-3.0.8/include/linux/cpuset.h linux-3.0.8/include/linux/cpuset.h ---- linux-3.0.8/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h +--- linux-3.0.9/include/linux/cpuset.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/cpuset.h 2011-11-12 12:47:14.000000000 -0500 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void * nodemask. */ @@ -57936,9 +57936,9 @@ diff -urNp linux-3.0.8/include/linux/cpuset.h linux-3.0.8/include/linux/cpuset.h } static inline void set_mems_allowed(nodemask_t nodemask) -diff -urNp linux-3.0.8/include/linux/crypto.h linux-3.0.8/include/linux/crypto.h ---- linux-3.0.8/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h +--- linux-3.0.9/include/linux/crypto.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/crypto.h 2011-11-12 12:47:14.000000000 -0500 @@ -361,7 +361,7 @@ struct cipher_tfm { const u8 *key, unsigned int keylen); void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src); @@ -57964,9 +57964,9 @@ diff -urNp linux-3.0.8/include/linux/crypto.h linux-3.0.8/include/linux/crypto.h #define crt_ablkcipher crt_u.ablkcipher #define crt_aead crt_u.aead -diff -urNp linux-3.0.8/include/linux/decompress/mm.h linux-3.0.8/include/linux/decompress/mm.h ---- linux-3.0.8/include/linux/decompress/mm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/decompress/mm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/decompress/mm.h linux-3.0.9/include/linux/decompress/mm.h +--- linux-3.0.9/include/linux/decompress/mm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/decompress/mm.h 2011-11-12 12:47:14.000000000 -0500 @@ -77,7 +77,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -57976,9 +57976,9 @@ diff -urNp linux-3.0.8/include/linux/decompress/mm.h linux-3.0.8/include/linux/d #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-3.0.8/include/linux/dma-mapping.h linux-3.0.8/include/linux/dma-mapping.h ---- linux-3.0.8/include/linux/dma-mapping.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/dma-mapping.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/dma-mapping.h linux-3.0.9/include/linux/dma-mapping.h +--- linux-3.0.9/include/linux/dma-mapping.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/dma-mapping.h 2011-11-12 12:47:14.000000000 -0500 @@ -50,7 +50,7 @@ struct dma_map_ops { int (*dma_supported)(struct device *dev, u64 mask); int (*set_dma_mask)(struct device *dev, u64 mask); @@ -57988,9 +57988,9 @@ diff -urNp linux-3.0.8/include/linux/dma-mapping.h linux-3.0.8/include/linux/dma #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-3.0.8/include/linux/efi.h linux-3.0.8/include/linux/efi.h ---- linux-3.0.8/include/linux/efi.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/efi.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/efi.h linux-3.0.9/include/linux/efi.h +--- linux-3.0.9/include/linux/efi.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/efi.h 2011-11-12 12:47:14.000000000 -0500 @@ -410,7 +410,7 @@ struct efivar_operations { efi_get_variable_t *get_variable; efi_get_next_variable_t *get_next_variable; @@ -58000,9 +58000,9 @@ diff -urNp linux-3.0.8/include/linux/efi.h linux-3.0.8/include/linux/efi.h struct efivars { /* -diff -urNp linux-3.0.8/include/linux/elf.h linux-3.0.8/include/linux/elf.h ---- linux-3.0.8/include/linux/elf.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/elf.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/elf.h linux-3.0.9/include/linux/elf.h +--- linux-3.0.9/include/linux/elf.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/elf.h 2011-11-12 12:47:14.000000000 -0500 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -58075,9 +58075,9 @@ diff -urNp linux-3.0.8/include/linux/elf.h linux-3.0.8/include/linux/elf.h #endif -diff -urNp linux-3.0.8/include/linux/firewire.h linux-3.0.8/include/linux/firewire.h ---- linux-3.0.8/include/linux/firewire.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/firewire.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/firewire.h linux-3.0.9/include/linux/firewire.h +--- linux-3.0.9/include/linux/firewire.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/firewire.h 2011-11-12 12:47:14.000000000 -0500 @@ -428,7 +428,7 @@ struct fw_iso_context { union { fw_iso_callback_t sc; @@ -58087,9 +58087,9 @@ diff -urNp linux-3.0.8/include/linux/firewire.h linux-3.0.8/include/linux/firewi void *callback_data; }; -diff -urNp linux-3.0.8/include/linux/fscache-cache.h linux-3.0.8/include/linux/fscache-cache.h ---- linux-3.0.8/include/linux/fscache-cache.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/fscache-cache.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/fscache-cache.h linux-3.0.9/include/linux/fscache-cache.h +--- linux-3.0.9/include/linux/fscache-cache.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/fscache-cache.h 2011-11-12 12:47:14.000000000 -0500 @@ -102,7 +102,7 @@ struct fscache_operation { fscache_operation_release_t release; }; @@ -58108,9 +58108,9 @@ diff -urNp linux-3.0.8/include/linux/fscache-cache.h linux-3.0.8/include/linux/f op->processor = processor; op->release = release; INIT_LIST_HEAD(&op->pend_link); -diff -urNp linux-3.0.8/include/linux/fs.h linux-3.0.8/include/linux/fs.h ---- linux-3.0.8/include/linux/fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/fs.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/fs.h linux-3.0.9/include/linux/fs.h +--- linux-3.0.9/include/linux/fs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/fs.h 2011-11-12 12:47:14.000000000 -0500 @@ -109,6 +109,11 @@ struct inodes_stat_t { /* File was opened by fanotify and shouldn't generate fanotify events */ #define FMODE_NONOTIFY ((__force fmode_t)0x1000000) @@ -58133,9 +58133,9 @@ diff -urNp linux-3.0.8/include/linux/fs.h linux-3.0.8/include/linux/fs.h #define IPERM_FLAG_RCU 0x0001 -diff -urNp linux-3.0.8/include/linux/fsnotify.h linux-3.0.8/include/linux/fsnotify.h ---- linux-3.0.8/include/linux/fsnotify.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/fsnotify.h 2011-08-24 18:10:29.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/fsnotify.h linux-3.0.9/include/linux/fsnotify.h +--- linux-3.0.9/include/linux/fsnotify.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/fsnotify.h 2011-11-12 12:47:14.000000000 -0500 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc */ static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name) @@ -58145,9 +58145,9 @@ diff -urNp linux-3.0.8/include/linux/fsnotify.h linux-3.0.8/include/linux/fsnoti } /* -diff -urNp linux-3.0.8/include/linux/fs_struct.h linux-3.0.8/include/linux/fs_struct.h ---- linux-3.0.8/include/linux/fs_struct.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/fs_struct.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/fs_struct.h linux-3.0.9/include/linux/fs_struct.h +--- linux-3.0.9/include/linux/fs_struct.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/fs_struct.h 2011-11-12 12:47:14.000000000 -0500 @@ -6,7 +6,7 @@ #include <linux/seqlock.h> @@ -58157,9 +58157,9 @@ diff -urNp linux-3.0.8/include/linux/fs_struct.h linux-3.0.8/include/linux/fs_st spinlock_t lock; seqcount_t seq; int umask; -diff -urNp linux-3.0.8/include/linux/ftrace_event.h linux-3.0.8/include/linux/ftrace_event.h ---- linux-3.0.8/include/linux/ftrace_event.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/ftrace_event.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/ftrace_event.h linux-3.0.9/include/linux/ftrace_event.h +--- linux-3.0.9/include/linux/ftrace_event.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/ftrace_event.h 2011-11-12 12:47:14.000000000 -0500 @@ -96,7 +96,7 @@ struct trace_event_functions { trace_print_func raw; trace_print_func hex; @@ -58178,9 +58178,9 @@ diff -urNp linux-3.0.8/include/linux/ftrace_event.h linux-3.0.8/include/linux/ft int trace_set_clr_event(const char *system, const char *event, int set); -diff -urNp linux-3.0.8/include/linux/genhd.h linux-3.0.8/include/linux/genhd.h ---- linux-3.0.8/include/linux/genhd.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/genhd.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/genhd.h linux-3.0.9/include/linux/genhd.h +--- linux-3.0.9/include/linux/genhd.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/genhd.h 2011-11-12 12:47:14.000000000 -0500 @@ -184,7 +184,7 @@ struct gendisk { struct kobject *slave_dir; @@ -58190,9 +58190,9 @@ diff -urNp linux-3.0.8/include/linux/genhd.h linux-3.0.8/include/linux/genhd.h struct disk_events *ev; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-3.0.8/include/linux/gracl.h linux-3.0.8/include/linux/gracl.h ---- linux-3.0.8/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/gracl.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/gracl.h linux-3.0.9/include/linux/gracl.h +--- linux-3.0.9/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/gracl.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,317 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -58511,9 +58511,9 @@ diff -urNp linux-3.0.8/include/linux/gracl.h linux-3.0.8/include/linux/gracl.h + +#endif + -diff -urNp linux-3.0.8/include/linux/gralloc.h linux-3.0.8/include/linux/gralloc.h ---- linux-3.0.8/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/gralloc.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/gralloc.h linux-3.0.9/include/linux/gralloc.h +--- linux-3.0.9/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/gralloc.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -58524,9 +58524,9 @@ diff -urNp linux-3.0.8/include/linux/gralloc.h linux-3.0.8/include/linux/gralloc +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-3.0.8/include/linux/grdefs.h linux-3.0.8/include/linux/grdefs.h ---- linux-3.0.8/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/grdefs.h linux-3.0.9/include/linux/grdefs.h +--- linux-3.0.9/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/grdefs.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,140 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -58668,9 +58668,9 @@ diff -urNp linux-3.0.8/include/linux/grdefs.h linux-3.0.8/include/linux/grdefs.h +}; + +#endif -diff -urNp linux-3.0.8/include/linux/grinternal.h linux-3.0.8/include/linux/grinternal.h ---- linux-3.0.8/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/grinternal.h 2011-10-20 00:47:28.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/grinternal.h linux-3.0.9/include/linux/grinternal.h +--- linux-3.0.9/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/grinternal.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,220 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -58892,9 +58892,9 @@ diff -urNp linux-3.0.8/include/linux/grinternal.h linux-3.0.8/include/linux/grin +#endif + +#endif -diff -urNp linux-3.0.8/include/linux/grmsg.h linux-3.0.8/include/linux/grmsg.h ---- linux-3.0.8/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/grmsg.h 2011-09-14 09:16:54.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/grmsg.h linux-3.0.9/include/linux/grmsg.h +--- linux-3.0.9/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/grmsg.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%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" @@ -59004,9 +59004,9 @@ diff -urNp linux-3.0.8/include/linux/grmsg.h linux-3.0.8/include/linux/grmsg.h +#define GR_VM86_MSG "denied use of vm86 by " +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by " -diff -urNp linux-3.0.8/include/linux/grsecurity.h linux-3.0.8/include/linux/grsecurity.h ---- linux-3.0.8/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/grsecurity.h 2011-10-17 06:35:30.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/grsecurity.h linux-3.0.9/include/linux/grsecurity.h +--- linux-3.0.9/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/grsecurity.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,228 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -59236,9 +59236,9 @@ diff -urNp linux-3.0.8/include/linux/grsecurity.h linux-3.0.8/include/linux/grse +#endif + +#endif -diff -urNp linux-3.0.8/include/linux/grsock.h linux-3.0.8/include/linux/grsock.h ---- linux-3.0.8/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/grsock.h linux-3.0.9/include/linux/grsock.h +--- linux-3.0.9/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/grsock.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,19 @@ +#ifndef __GRSOCK_H +#define __GRSOCK_H @@ -59259,9 +59259,9 @@ diff -urNp linux-3.0.8/include/linux/grsock.h linux-3.0.8/include/linux/grsock.h + const int protocol); + +#endif -diff -urNp linux-3.0.8/include/linux/hid.h linux-3.0.8/include/linux/hid.h ---- linux-3.0.8/include/linux/hid.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/hid.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/hid.h linux-3.0.9/include/linux/hid.h +--- linux-3.0.9/include/linux/hid.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/hid.h 2011-11-12 12:47:14.000000000 -0500 @@ -675,7 +675,7 @@ struct hid_ll_driver { unsigned int code, int value); @@ -59271,9 +59271,9 @@ diff -urNp linux-3.0.8/include/linux/hid.h linux-3.0.8/include/linux/hid.h #define PM_HINT_FULLON 1<<5 #define PM_HINT_NORMAL 1<<1 -diff -urNp linux-3.0.8/include/linux/highmem.h linux-3.0.8/include/linux/highmem.h ---- linux-3.0.8/include/linux/highmem.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/highmem.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/highmem.h linux-3.0.9/include/linux/highmem.h +--- linux-3.0.9/include/linux/highmem.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/highmem.h 2011-11-12 12:47:14.000000000 -0500 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -59293,9 +59293,9 @@ diff -urNp linux-3.0.8/include/linux/highmem.h linux-3.0.8/include/linux/highmem static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-3.0.8/include/linux/i2c.h linux-3.0.8/include/linux/i2c.h ---- linux-3.0.8/include/linux/i2c.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/i2c.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/i2c.h linux-3.0.9/include/linux/i2c.h +--- linux-3.0.9/include/linux/i2c.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/i2c.h 2011-11-12 12:47:14.000000000 -0500 @@ -346,6 +346,7 @@ struct i2c_algorithm { /* To determine what the adapter supports */ u32 (*functionality) (struct i2c_adapter *); @@ -59304,9 +59304,9 @@ diff -urNp linux-3.0.8/include/linux/i2c.h linux-3.0.8/include/linux/i2c.h /* * i2c_adapter is the structure used to identify a physical i2c bus along -diff -urNp linux-3.0.8/include/linux/i2o.h linux-3.0.8/include/linux/i2o.h ---- linux-3.0.8/include/linux/i2o.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/i2o.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/i2o.h linux-3.0.9/include/linux/i2o.h +--- linux-3.0.9/include/linux/i2o.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/i2o.h 2011-11-12 12:47:14.000000000 -0500 @@ -564,7 +564,7 @@ struct i2o_controller { struct i2o_device *exec; /* Executive */ #if BITS_PER_LONG == 64 @@ -59316,9 +59316,9 @@ diff -urNp linux-3.0.8/include/linux/i2o.h linux-3.0.8/include/linux/i2o.h struct list_head context_list; /* list of context id's and pointers */ #endif -diff -urNp linux-3.0.8/include/linux/init.h linux-3.0.8/include/linux/init.h ---- linux-3.0.8/include/linux/init.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/init.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/init.h linux-3.0.9/include/linux/init.h +--- linux-3.0.9/include/linux/init.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/init.h 2011-11-12 12:47:14.000000000 -0500 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm /* Each module must use one module_init(). */ @@ -59335,9 +59335,9 @@ diff -urNp linux-3.0.8/include/linux/init.h linux-3.0.8/include/linux/init.h { return exitfn; } \ void cleanup_module(void) __attribute__((alias(#exitfn))); -diff -urNp linux-3.0.8/include/linux/init_task.h linux-3.0.8/include/linux/init_task.h ---- linux-3.0.8/include/linux/init_task.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/init_task.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/init_task.h linux-3.0.9/include/linux/init_task.h +--- linux-3.0.9/include/linux/init_task.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/init_task.h 2011-11-12 12:47:14.000000000 -0500 @@ -126,6 +126,12 @@ extern struct cred init_cred; # define INIT_PERF_EVENTS(tsk) #endif @@ -59359,9 +59359,9 @@ diff -urNp linux-3.0.8/include/linux/init_task.h linux-3.0.8/include/linux/init_ .fs = &init_fs, \ .files = &init_files, \ .signal = &init_signals, \ -diff -urNp linux-3.0.8/include/linux/intel-iommu.h linux-3.0.8/include/linux/intel-iommu.h ---- linux-3.0.8/include/linux/intel-iommu.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/intel-iommu.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/intel-iommu.h linux-3.0.9/include/linux/intel-iommu.h +--- linux-3.0.9/include/linux/intel-iommu.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/intel-iommu.h 2011-11-12 12:47:14.000000000 -0500 @@ -296,7 +296,7 @@ struct iommu_flush { u8 fm, u64 type); void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr, @@ -59371,10 +59371,10 @@ diff -urNp linux-3.0.8/include/linux/intel-iommu.h linux-3.0.8/include/linux/int enum { SR_DMAR_FECTL_REG, -diff -urNp linux-3.0.8/include/linux/interrupt.h linux-3.0.8/include/linux/interrupt.h ---- linux-3.0.8/include/linux/interrupt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/interrupt.h 2011-08-23 21:47:56.000000000 -0400 -@@ -422,7 +422,7 @@ enum +diff -urNp linux-3.0.9/include/linux/interrupt.h linux-3.0.9/include/linux/interrupt.h +--- linux-3.0.9/include/linux/interrupt.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/interrupt.h 2011-11-12 12:47:14.000000000 -0500 +@@ -425,7 +425,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. */ @@ -59383,7 +59383,7 @@ diff -urNp linux-3.0.8/include/linux/interrupt.h linux-3.0.8/include/linux/inter /* softirq mask and active fields moved to irq_cpustat_t in * asm/hardirq.h to get better cache usage. KAO -@@ -430,12 +430,12 @@ extern char *softirq_to_name[NR_SOFTIRQS +@@ -433,12 +433,12 @@ extern char *softirq_to_name[NR_SOFTIRQS struct softirq_action { @@ -59398,9 +59398,9 @@ diff -urNp linux-3.0.8/include/linux/interrupt.h linux-3.0.8/include/linux/inter extern void softirq_init(void); static inline void __raise_softirq_irqoff(unsigned int nr) { -diff -urNp linux-3.0.8/include/linux/kallsyms.h linux-3.0.8/include/linux/kallsyms.h ---- linux-3.0.8/include/linux/kallsyms.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/kallsyms.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/kallsyms.h linux-3.0.9/include/linux/kallsyms.h +--- linux-3.0.9/include/linux/kallsyms.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/kallsyms.h 2011-11-12 12:47:14.000000000 -0500 @@ -15,7 +15,8 @@ struct module; @@ -59428,9 +59428,9 @@ diff -urNp linux-3.0.8/include/linux/kallsyms.h linux-3.0.8/include/linux/kallsy /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-3.0.8/include/linux/kgdb.h linux-3.0.8/include/linux/kgdb.h ---- linux-3.0.8/include/linux/kgdb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/kgdb.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/kgdb.h linux-3.0.9/include/linux/kgdb.h +--- linux-3.0.9/include/linux/kgdb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/kgdb.h 2011-11-12 12:47:14.000000000 -0500 @@ -53,7 +53,7 @@ extern int kgdb_connected; extern int kgdb_io_module_registered; @@ -59458,9 +59458,9 @@ diff -urNp linux-3.0.8/include/linux/kgdb.h linux-3.0.8/include/linux/kgdb.h extern struct kgdb_arch arch_kgdb_ops; -diff -urNp linux-3.0.8/include/linux/kmod.h linux-3.0.8/include/linux/kmod.h ---- linux-3.0.8/include/linux/kmod.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/kmod.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/kmod.h linux-3.0.9/include/linux/kmod.h +--- linux-3.0.9/include/linux/kmod.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/kmod.h 2011-11-12 12:47:14.000000000 -0500 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc * usually useless though. */ extern int __request_module(bool wait, const char *name, ...) \ @@ -59470,9 +59470,9 @@ diff -urNp linux-3.0.8/include/linux/kmod.h linux-3.0.8/include/linux/kmod.h #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ -diff -urNp linux-3.0.8/include/linux/kvm_host.h linux-3.0.8/include/linux/kvm_host.h ---- linux-3.0.8/include/linux/kvm_host.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/kvm_host.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/kvm_host.h linux-3.0.9/include/linux/kvm_host.h +--- linux-3.0.9/include/linux/kvm_host.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/kvm_host.h 2011-11-12 12:47:14.000000000 -0500 @@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -59491,9 +59491,9 @@ diff -urNp linux-3.0.8/include/linux/kvm_host.h linux-3.0.8/include/linux/kvm_ho void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-3.0.8/include/linux/libata.h linux-3.0.8/include/linux/libata.h ---- linux-3.0.8/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/libata.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/libata.h linux-3.0.9/include/linux/libata.h +--- linux-3.0.9/include/linux/libata.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/libata.h 2011-11-12 12:47:14.000000000 -0500 @@ -899,7 +899,7 @@ struct ata_port_operations { * fields must be pointers. */ @@ -59503,9 +59503,9 @@ diff -urNp linux-3.0.8/include/linux/libata.h linux-3.0.8/include/linux/libata.h struct ata_port_info { unsigned long flags; -diff -urNp linux-3.0.8/include/linux/mca.h linux-3.0.8/include/linux/mca.h ---- linux-3.0.8/include/linux/mca.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mca.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mca.h linux-3.0.9/include/linux/mca.h +--- linux-3.0.9/include/linux/mca.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mca.h 2011-11-12 12:47:14.000000000 -0500 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions { int region); void * (*mca_transform_memory)(struct mca_device *, @@ -59515,9 +59515,9 @@ diff -urNp linux-3.0.8/include/linux/mca.h linux-3.0.8/include/linux/mca.h struct mca_bus { u64 default_dma_mask; -diff -urNp linux-3.0.8/include/linux/memory.h linux-3.0.8/include/linux/memory.h ---- linux-3.0.8/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/memory.h linux-3.0.9/include/linux/memory.h +--- linux-3.0.9/include/linux/memory.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/memory.h 2011-11-12 12:47:14.000000000 -0500 @@ -144,7 +144,7 @@ struct memory_accessor { size_t count); ssize_t (*write)(struct memory_accessor *, const char *buf, @@ -59527,9 +59527,9 @@ diff -urNp linux-3.0.8/include/linux/memory.h linux-3.0.8/include/linux/memory.h /* * Kernel text modification mutex, used for code patching. Users of this lock -diff -urNp linux-3.0.8/include/linux/mfd/abx500.h linux-3.0.8/include/linux/mfd/abx500.h ---- linux-3.0.8/include/linux/mfd/abx500.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mfd/abx500.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mfd/abx500.h linux-3.0.9/include/linux/mfd/abx500.h +--- linux-3.0.9/include/linux/mfd/abx500.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mfd/abx500.h 2011-11-12 12:47:14.000000000 -0500 @@ -234,6 +234,7 @@ struct abx500_ops { int (*event_registers_startup_state_get) (struct device *, u8 *); int (*startup_irq_enabled) (struct device *, unsigned int); @@ -59538,9 +59538,9 @@ diff -urNp linux-3.0.8/include/linux/mfd/abx500.h linux-3.0.8/include/linux/mfd/ int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops); void abx500_remove_ops(struct device *dev); -diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h ---- linux-3.0.8/include/linux/mm.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/include/linux/mm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mm.h linux-3.0.9/include/linux/mm.h +--- linux-3.0.9/include/linux/mm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mm.h 2011-11-12 12:47:14.000000000 -0500 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ @@ -59556,7 +59556,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ -@@ -1009,34 +1016,6 @@ int set_page_dirty(struct page *page); +@@ -1008,34 +1015,6 @@ int set_page_dirty(struct page *page); int set_page_dirty_lock(struct page *page); int clear_page_dirty_for_io(struct page *page); @@ -59591,7 +59591,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h extern unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len); -@@ -1169,6 +1148,15 @@ struct shrinker { +@@ -1168,6 +1147,15 @@ struct shrinker { extern void register_shrinker(struct shrinker *); extern void unregister_shrinker(struct shrinker *); @@ -59607,7 +59607,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, -@@ -1452,6 +1440,7 @@ out: +@@ -1451,6 +1439,7 @@ out: } extern int do_munmap(struct mm_struct *, unsigned long, size_t); @@ -59615,7 +59615,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h extern unsigned long do_brk(unsigned long, unsigned long); -@@ -1510,6 +1499,10 @@ extern struct vm_area_struct * find_vma( +@@ -1509,6 +1498,10 @@ extern struct vm_area_struct * find_vma( extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -59626,7 +59626,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1526,15 +1519,6 @@ static inline unsigned long vma_pages(st +@@ -1525,15 +1518,6 @@ static inline unsigned long vma_pages(st return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; } @@ -59642,7 +59642,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); -@@ -1647,7 +1631,7 @@ extern int unpoison_memory(unsigned long +@@ -1646,7 +1630,7 @@ extern int unpoison_memory(unsigned long extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; extern void shake_page(struct page *p, int access); @@ -59651,7 +59651,7 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h extern int soft_offline_page(struct page *page, int flags); extern void dump_page(struct page *page); -@@ -1661,5 +1645,11 @@ extern void copy_user_huge_page(struct p +@@ -1660,5 +1644,11 @@ extern void copy_user_huge_page(struct p unsigned int pages_per_huge_page); #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */ @@ -59663,10 +59663,10 @@ diff -urNp linux-3.0.8/include/linux/mm.h linux-3.0.8/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-3.0.8/include/linux/mm_types.h linux-3.0.8/include/linux/mm_types.h ---- linux-3.0.8/include/linux/mm_types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mm_types.h 2011-08-23 21:47:56.000000000 -0400 -@@ -184,6 +184,8 @@ struct vm_area_struct { +diff -urNp linux-3.0.9/include/linux/mm_types.h linux-3.0.9/include/linux/mm_types.h +--- linux-3.0.9/include/linux/mm_types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mm_types.h 2011-11-12 12:47:14.000000000 -0500 +@@ -198,6 +198,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ #endif @@ -59675,7 +59675,7 @@ diff -urNp linux-3.0.8/include/linux/mm_types.h linux-3.0.8/include/linux/mm_typ }; struct core_thread { -@@ -316,6 +318,24 @@ struct mm_struct { +@@ -330,6 +332,24 @@ struct mm_struct { #ifdef CONFIG_CPUMASK_OFFSTACK struct cpumask cpumask_allocation; #endif @@ -59700,9 +59700,9 @@ diff -urNp linux-3.0.8/include/linux/mm_types.h linux-3.0.8/include/linux/mm_typ }; static inline void mm_init_cpumask(struct mm_struct *mm) -diff -urNp linux-3.0.8/include/linux/mmu_notifier.h linux-3.0.8/include/linux/mmu_notifier.h ---- linux-3.0.8/include/linux/mmu_notifier.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mmu_notifier.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mmu_notifier.h linux-3.0.9/include/linux/mmu_notifier.h +--- linux-3.0.9/include/linux/mmu_notifier.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mmu_notifier.h 2011-11-12 12:47:14.000000000 -0500 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -59719,9 +59719,9 @@ diff -urNp linux-3.0.8/include/linux/mmu_notifier.h linux-3.0.8/include/linux/mm }) #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \ -diff -urNp linux-3.0.8/include/linux/mmzone.h linux-3.0.8/include/linux/mmzone.h ---- linux-3.0.8/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mmzone.h linux-3.0.9/include/linux/mmzone.h +--- linux-3.0.9/include/linux/mmzone.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mmzone.h 2011-11-12 12:47:14.000000000 -0500 @@ -350,7 +350,7 @@ struct zone { unsigned long flags; /* zone flags, see below */ @@ -59731,9 +59731,9 @@ diff -urNp linux-3.0.8/include/linux/mmzone.h linux-3.0.8/include/linux/mmzone.h /* * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on -diff -urNp linux-3.0.8/include/linux/mod_devicetable.h linux-3.0.8/include/linux/mod_devicetable.h ---- linux-3.0.8/include/linux/mod_devicetable.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/mod_devicetable.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/mod_devicetable.h linux-3.0.9/include/linux/mod_devicetable.h +--- linux-3.0.9/include/linux/mod_devicetable.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/mod_devicetable.h 2011-11-12 12:47:14.000000000 -0500 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -59752,9 +59752,9 @@ diff -urNp linux-3.0.8/include/linux/mod_devicetable.h linux-3.0.8/include/linux struct hid_device_id { __u16 bus; -diff -urNp linux-3.0.8/include/linux/module.h linux-3.0.8/include/linux/module.h ---- linux-3.0.8/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/module.h linux-3.0.9/include/linux/module.h +--- linux-3.0.9/include/linux/module.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/module.h 2011-11-12 12:47:14.000000000 -0500 @@ -16,6 +16,7 @@ #include <linux/kobject.h> #include <linux/moduleparam.h> @@ -59849,9 +59849,9 @@ diff -urNp linux-3.0.8/include/linux/module.h linux-3.0.8/include/linux/module.h } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-3.0.8/include/linux/moduleloader.h linux-3.0.8/include/linux/moduleloader.h ---- linux-3.0.8/include/linux/moduleloader.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/moduleloader.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/moduleloader.h linux-3.0.9/include/linux/moduleloader.h +--- linux-3.0.9/include/linux/moduleloader.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/moduleloader.h 2011-11-12 12:47:14.000000000 -0500 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -59874,9 +59874,9 @@ diff -urNp linux-3.0.8/include/linux/moduleloader.h linux-3.0.8/include/linux/mo /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-3.0.8/include/linux/moduleparam.h linux-3.0.8/include/linux/moduleparam.h ---- linux-3.0.8/include/linux/moduleparam.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/moduleparam.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/moduleparam.h linux-3.0.9/include/linux/moduleparam.h +--- linux-3.0.9/include/linux/moduleparam.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/moduleparam.h 2011-11-12 12:47:14.000000000 -0500 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock * @len is usually just sizeof(string). */ @@ -59895,9 +59895,9 @@ diff -urNp linux-3.0.8/include/linux/moduleparam.h linux-3.0.8/include/linux/mod = { .max = ARRAY_SIZE(array), .num = nump, \ .ops = ¶m_ops_##type, \ .elemsize = sizeof(array[0]), .elem = array }; \ -diff -urNp linux-3.0.8/include/linux/namei.h linux-3.0.8/include/linux/namei.h ---- linux-3.0.8/include/linux/namei.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/namei.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/namei.h linux-3.0.9/include/linux/namei.h +--- linux-3.0.9/include/linux/namei.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/namei.h 2011-11-12 12:47:14.000000000 -0500 @@ -24,7 +24,7 @@ struct nameidata { unsigned seq; int last_type; @@ -59907,7 +59907,7 @@ diff -urNp linux-3.0.8/include/linux/namei.h linux-3.0.8/include/linux/namei.h /* Intent data */ union { -@@ -91,12 +91,12 @@ extern int follow_up(struct path *); +@@ -93,12 +93,12 @@ extern int follow_up(struct path *); extern struct dentry *lock_rename(struct dentry *, struct dentry *); extern void unlock_rename(struct dentry *, struct dentry *); @@ -59922,9 +59922,9 @@ diff -urNp linux-3.0.8/include/linux/namei.h linux-3.0.8/include/linux/namei.h { return nd->saved_names[nd->depth]; } -diff -urNp linux-3.0.8/include/linux/netdevice.h linux-3.0.8/include/linux/netdevice.h ---- linux-3.0.8/include/linux/netdevice.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/include/linux/netdevice.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/netdevice.h linux-3.0.9/include/linux/netdevice.h +--- linux-3.0.9/include/linux/netdevice.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/netdevice.h 2011-11-12 12:47:14.000000000 -0500 @@ -979,6 +979,7 @@ struct net_device_ops { int (*ndo_set_features)(struct net_device *dev, u32 features); @@ -59933,9 +59933,9 @@ diff -urNp linux-3.0.8/include/linux/netdevice.h linux-3.0.8/include/linux/netde /* * The DEVICE structure. -diff -urNp linux-3.0.8/include/linux/netfilter/xt_gradm.h linux-3.0.8/include/linux/netfilter/xt_gradm.h ---- linux-3.0.8/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/include/linux/netfilter/xt_gradm.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/netfilter/xt_gradm.h linux-3.0.9/include/linux/netfilter/xt_gradm.h +--- linux-3.0.9/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/include/linux/netfilter/xt_gradm.h 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef _LINUX_NETFILTER_XT_GRADM_H +#define _LINUX_NETFILTER_XT_GRADM_H 1 @@ -59946,9 +59946,9 @@ diff -urNp linux-3.0.8/include/linux/netfilter/xt_gradm.h linux-3.0.8/include/li +}; + +#endif -diff -urNp linux-3.0.8/include/linux/of_pdt.h linux-3.0.8/include/linux/of_pdt.h ---- linux-3.0.8/include/linux/of_pdt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/of_pdt.h 2011-08-30 06:20:11.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/of_pdt.h linux-3.0.9/include/linux/of_pdt.h +--- linux-3.0.9/include/linux/of_pdt.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/of_pdt.h 2011-11-12 12:47:14.000000000 -0500 @@ -32,7 +32,7 @@ struct of_pdt_ops { /* return 0 on success; fill in 'len' with number of bytes in path */ @@ -59958,9 +59958,9 @@ diff -urNp linux-3.0.8/include/linux/of_pdt.h linux-3.0.8/include/linux/of_pdt.h extern void *prom_early_alloc(unsigned long size); -diff -urNp linux-3.0.8/include/linux/oprofile.h linux-3.0.8/include/linux/oprofile.h ---- linux-3.0.8/include/linux/oprofile.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/oprofile.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/oprofile.h linux-3.0.9/include/linux/oprofile.h +--- linux-3.0.9/include/linux/oprofile.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/oprofile.h 2011-11-12 12:47:14.000000000 -0500 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, char const * name, ulong * val); @@ -59973,9 +59973,9 @@ diff -urNp linux-3.0.8/include/linux/oprofile.h linux-3.0.8/include/linux/oprofi /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-3.0.8/include/linux/padata.h linux-3.0.8/include/linux/padata.h ---- linux-3.0.8/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/padata.h linux-3.0.9/include/linux/padata.h +--- linux-3.0.9/include/linux/padata.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/padata.h 2011-11-12 12:47:14.000000000 -0500 @@ -129,7 +129,7 @@ struct parallel_data { struct padata_instance *pinst; struct padata_parallel_queue __percpu *pqueue; @@ -59985,9 +59985,9 @@ diff -urNp linux-3.0.8/include/linux/padata.h linux-3.0.8/include/linux/padata.h atomic_t reorder_objects; atomic_t refcnt; unsigned int max_seq_nr; -diff -urNp linux-3.0.8/include/linux/perf_event.h linux-3.0.8/include/linux/perf_event.h ---- linux-3.0.8/include/linux/perf_event.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/perf_event.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/perf_event.h linux-3.0.9/include/linux/perf_event.h +--- linux-3.0.9/include/linux/perf_event.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/perf_event.h 2011-11-12 12:47:14.000000000 -0500 @@ -761,8 +761,8 @@ struct perf_event { enum perf_event_active_state state; @@ -60010,9 +60010,9 @@ diff -urNp linux-3.0.8/include/linux/perf_event.h linux-3.0.8/include/linux/perf /* * Protect attach/detach and child_list: -diff -urNp linux-3.0.8/include/linux/pipe_fs_i.h linux-3.0.8/include/linux/pipe_fs_i.h ---- linux-3.0.8/include/linux/pipe_fs_i.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/pipe_fs_i.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/pipe_fs_i.h linux-3.0.9/include/linux/pipe_fs_i.h +--- linux-3.0.9/include/linux/pipe_fs_i.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/pipe_fs_i.h 2011-11-12 12:47:14.000000000 -0500 @@ -46,9 +46,9 @@ struct pipe_buffer { struct pipe_inode_info { wait_queue_head_t wait; @@ -60026,9 +60026,9 @@ diff -urNp linux-3.0.8/include/linux/pipe_fs_i.h linux-3.0.8/include/linux/pipe_ unsigned int r_counter; unsigned int w_counter; struct page *tmp_page; -diff -urNp linux-3.0.8/include/linux/pm_runtime.h linux-3.0.8/include/linux/pm_runtime.h ---- linux-3.0.8/include/linux/pm_runtime.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/pm_runtime.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/pm_runtime.h linux-3.0.9/include/linux/pm_runtime.h +--- linux-3.0.9/include/linux/pm_runtime.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/pm_runtime.h 2011-11-12 12:47:14.000000000 -0500 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_ static inline void pm_runtime_mark_last_busy(struct device *dev) @@ -60038,9 +60038,9 @@ diff -urNp linux-3.0.8/include/linux/pm_runtime.h linux-3.0.8/include/linux/pm_r } #else /* !CONFIG_PM_RUNTIME */ -diff -urNp linux-3.0.8/include/linux/poison.h linux-3.0.8/include/linux/poison.h ---- linux-3.0.8/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/poison.h linux-3.0.9/include/linux/poison.h +--- linux-3.0.9/include/linux/poison.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/poison.h 2011-11-12 12:47:14.000000000 -0500 @@ -19,8 +19,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -60052,9 +60052,9 @@ diff -urNp linux-3.0.8/include/linux/poison.h linux-3.0.8/include/linux/poison.h /********** include/linux/timer.h **********/ /* -diff -urNp linux-3.0.8/include/linux/preempt.h linux-3.0.8/include/linux/preempt.h ---- linux-3.0.8/include/linux/preempt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/preempt.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/preempt.h linux-3.0.9/include/linux/preempt.h +--- linux-3.0.9/include/linux/preempt.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/preempt.h 2011-11-12 12:47:14.000000000 -0500 @@ -115,7 +115,7 @@ struct preempt_ops { void (*sched_in)(struct preempt_notifier *notifier, int cpu); void (*sched_out)(struct preempt_notifier *notifier, @@ -60064,9 +60064,9 @@ diff -urNp linux-3.0.8/include/linux/preempt.h linux-3.0.8/include/linux/preempt /** * preempt_notifier - key for installing preemption notifiers -diff -urNp linux-3.0.8/include/linux/proc_fs.h linux-3.0.8/include/linux/proc_fs.h ---- linux-3.0.8/include/linux/proc_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/proc_fs.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/proc_fs.h linux-3.0.9/include/linux/proc_fs.h +--- linux-3.0.9/include/linux/proc_fs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/proc_fs.h 2011-11-12 12:47:14.000000000 -0500 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -60096,9 +60096,9 @@ diff -urNp linux-3.0.8/include/linux/proc_fs.h linux-3.0.8/include/linux/proc_fs struct ctl_table_header; struct ctl_table; -diff -urNp linux-3.0.8/include/linux/ptrace.h linux-3.0.8/include/linux/ptrace.h ---- linux-3.0.8/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/ptrace.h linux-3.0.9/include/linux/ptrace.h +--- linux-3.0.9/include/linux/ptrace.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/ptrace.h 2011-11-12 12:47:14.000000000 -0500 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 1 @@ -60112,9 +60112,9 @@ diff -urNp linux-3.0.8/include/linux/ptrace.h linux-3.0.8/include/linux/ptrace.h static inline int ptrace_reparented(struct task_struct *child) { -diff -urNp linux-3.0.8/include/linux/random.h linux-3.0.8/include/linux/random.h ---- linux-3.0.8/include/linux/random.h 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/random.h linux-3.0.9/include/linux/random.h +--- linux-3.0.9/include/linux/random.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/random.h 2011-11-12 12:47:14.000000000 -0500 @@ -69,12 +69,17 @@ void srandom32(u32 seed); u32 prandom32(struct rnd_state *); @@ -60134,9 +60134,9 @@ diff -urNp linux-3.0.8/include/linux/random.h linux-3.0.8/include/linux/random.h } /** -diff -urNp linux-3.0.8/include/linux/reboot.h linux-3.0.8/include/linux/reboot.h ---- linux-3.0.8/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/reboot.h linux-3.0.9/include/linux/reboot.h +--- linux-3.0.9/include/linux/reboot.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/reboot.h 2011-11-12 12:47:14.000000000 -0500 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st * Architecture-specific implementations of sys_reboot commands. */ @@ -60172,9 +60172,9 @@ diff -urNp linux-3.0.8/include/linux/reboot.h linux-3.0.8/include/linux/reboot.h #include <asm/emergency-restart.h> #endif -diff -urNp linux-3.0.8/include/linux/reiserfs_fs.h linux-3.0.8/include/linux/reiserfs_fs.h ---- linux-3.0.8/include/linux/reiserfs_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/reiserfs_fs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/reiserfs_fs.h linux-3.0.9/include/linux/reiserfs_fs.h +--- linux-3.0.9/include/linux/reiserfs_fs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/reiserfs_fs.h 2011-11-12 12:47:14.000000000 -0500 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -60184,9 +60184,9 @@ diff -urNp linux-3.0.8/include/linux/reiserfs_fs.h linux-3.0.8/include/linux/rei #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen) #define __fs_changed(gen,s) (gen != get_generation (s)) #define fs_changed(gen,s) \ -diff -urNp linux-3.0.8/include/linux/reiserfs_fs_sb.h linux-3.0.8/include/linux/reiserfs_fs_sb.h ---- linux-3.0.8/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/reiserfs_fs_sb.h linux-3.0.9/include/linux/reiserfs_fs_sb.h +--- linux-3.0.9/include/linux/reiserfs_fs_sb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/reiserfs_fs_sb.h 2011-11-12 12:47:14.000000000 -0500 @@ -386,7 +386,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -60196,9 +60196,9 @@ diff -urNp linux-3.0.8/include/linux/reiserfs_fs_sb.h linux-3.0.8/include/linux/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-3.0.8/include/linux/relay.h linux-3.0.8/include/linux/relay.h ---- linux-3.0.8/include/linux/relay.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/relay.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/relay.h linux-3.0.9/include/linux/relay.h +--- linux-3.0.9/include/linux/relay.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/relay.h 2011-11-12 12:47:14.000000000 -0500 @@ -159,7 +159,7 @@ struct rchan_callbacks * The callback should return 0 if successful, negative if not. */ @@ -60208,9 +60208,9 @@ diff -urNp linux-3.0.8/include/linux/relay.h linux-3.0.8/include/linux/relay.h /* * CONFIG_RELAY kernel API, kernel/relay.c -diff -urNp linux-3.0.8/include/linux/rfkill.h linux-3.0.8/include/linux/rfkill.h ---- linux-3.0.8/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/rfkill.h linux-3.0.9/include/linux/rfkill.h +--- linux-3.0.9/include/linux/rfkill.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/rfkill.h 2011-11-12 12:47:14.000000000 -0500 @@ -147,6 +147,7 @@ struct rfkill_ops { void (*query)(struct rfkill *rfkill, void *data); int (*set_block)(void *data, bool blocked); @@ -60219,9 +60219,9 @@ diff -urNp linux-3.0.8/include/linux/rfkill.h linux-3.0.8/include/linux/rfkill.h #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE) /** -diff -urNp linux-3.0.8/include/linux/rmap.h linux-3.0.8/include/linux/rmap.h ---- linux-3.0.8/include/linux/rmap.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/rmap.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/rmap.h linux-3.0.9/include/linux/rmap.h +--- linux-3.0.9/include/linux/rmap.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/rmap.h 2011-11-12 12:47:14.000000000 -0500 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc void anon_vma_init(void); /* create anon_vma_cachep */ int anon_vma_prepare(struct vm_area_struct *); @@ -60233,9 +60233,9 @@ diff -urNp linux-3.0.8/include/linux/rmap.h linux-3.0.8/include/linux/rmap.h void __anon_vma_link(struct vm_area_struct *); static inline void anon_vma_merge(struct vm_area_struct *vma, -diff -urNp linux-3.0.8/include/linux/sched.h linux-3.0.8/include/linux/sched.h ---- linux-3.0.8/include/linux/sched.h 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/include/linux/sched.h 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/sched.h linux-3.0.9/include/linux/sched.h +--- linux-3.0.9/include/linux/sched.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/sched.h 2011-11-12 12:47:14.000000000 -0500 @@ -100,6 +100,7 @@ struct bio_list; struct fs_struct; struct perf_event_context; @@ -60477,9 +60477,9 @@ diff -urNp linux-3.0.8/include/linux/sched.h linux-3.0.8/include/linux/sched.h extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-3.0.8/include/linux/screen_info.h linux-3.0.8/include/linux/screen_info.h ---- linux-3.0.8/include/linux/screen_info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/screen_info.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/screen_info.h linux-3.0.9/include/linux/screen_info.h +--- linux-3.0.9/include/linux/screen_info.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/screen_info.h 2011-11-12 12:47:14.000000000 -0500 @@ -43,7 +43,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -60490,9 +60490,9 @@ diff -urNp linux-3.0.8/include/linux/screen_info.h linux-3.0.8/include/linux/scr } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-3.0.8/include/linux/security.h linux-3.0.8/include/linux/security.h ---- linux-3.0.8/include/linux/security.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/security.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/security.h linux-3.0.9/include/linux/security.h +--- linux-3.0.9/include/linux/security.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/security.h 2011-11-12 12:47:14.000000000 -0500 @@ -36,6 +36,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -60501,9 +60501,9 @@ diff -urNp linux-3.0.8/include/linux/security.h linux-3.0.8/include/linux/securi #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-3.0.8/include/linux/seq_file.h linux-3.0.8/include/linux/seq_file.h ---- linux-3.0.8/include/linux/seq_file.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/seq_file.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/seq_file.h linux-3.0.9/include/linux/seq_file.h +--- linux-3.0.9/include/linux/seq_file.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/seq_file.h 2011-11-12 12:47:14.000000000 -0500 @@ -32,6 +32,7 @@ struct seq_operations { void * (*next) (struct seq_file *m, void *v, loff_t *pos); int (*show) (struct seq_file *m, void *v); @@ -60512,9 +60512,9 @@ diff -urNp linux-3.0.8/include/linux/seq_file.h linux-3.0.8/include/linux/seq_fi #define SEQ_SKIP 1 -diff -urNp linux-3.0.8/include/linux/shmem_fs.h linux-3.0.8/include/linux/shmem_fs.h ---- linux-3.0.8/include/linux/shmem_fs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/shmem_fs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/shmem_fs.h linux-3.0.9/include/linux/shmem_fs.h +--- linux-3.0.9/include/linux/shmem_fs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/shmem_fs.h 2011-11-12 12:47:14.000000000 -0500 @@ -10,7 +10,7 @@ #define SHMEM_NR_DIRECT 16 @@ -60524,9 +60524,9 @@ diff -urNp linux-3.0.8/include/linux/shmem_fs.h linux-3.0.8/include/linux/shmem_ struct shmem_inode_info { spinlock_t lock; -diff -urNp linux-3.0.8/include/linux/shm.h linux-3.0.8/include/linux/shm.h ---- linux-3.0.8/include/linux/shm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/shm.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/shm.h linux-3.0.9/include/linux/shm.h +--- linux-3.0.9/include/linux/shm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/shm.h 2011-11-12 12:47:14.000000000 -0500 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -60538,9 +60538,9 @@ diff -urNp linux-3.0.8/include/linux/shm.h linux-3.0.8/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-3.0.8/include/linux/skbuff.h linux-3.0.8/include/linux/skbuff.h ---- linux-3.0.8/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/skbuff.h linux-3.0.9/include/linux/skbuff.h +--- linux-3.0.9/include/linux/skbuff.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/skbuff.h 2011-11-12 12:47:14.000000000 -0500 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp */ static inline int skb_queue_empty(const struct sk_buff_head *list) @@ -60577,9 +60577,9 @@ diff -urNp linux-3.0.8/include/linux/skbuff.h linux-3.0.8/include/linux/skbuff.h #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -diff -urNp linux-3.0.8/include/linux/slab_def.h linux-3.0.8/include/linux/slab_def.h ---- linux-3.0.8/include/linux/slab_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/slab_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/slab_def.h linux-3.0.9/include/linux/slab_def.h +--- linux-3.0.9/include/linux/slab_def.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/slab_def.h 2011-11-12 12:47:14.000000000 -0500 @@ -96,10 +96,10 @@ struct kmem_cache { unsigned long node_allocs; unsigned long node_frees; @@ -60595,9 +60595,9 @@ diff -urNp linux-3.0.8/include/linux/slab_def.h linux-3.0.8/include/linux/slab_d /* * If debugging is enabled, then the allocator can add additional -diff -urNp linux-3.0.8/include/linux/slab.h linux-3.0.8/include/linux/slab.h ---- linux-3.0.8/include/linux/slab.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/slab.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/slab.h linux-3.0.9/include/linux/slab.h +--- linux-3.0.9/include/linux/slab.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/slab.h 2011-11-12 12:47:14.000000000 -0500 @@ -11,12 +11,20 @@ #include <linux/gfp.h> @@ -60704,9 +60704,9 @@ diff -urNp linux-3.0.8/include/linux/slab.h linux-3.0.8/include/linux/slab.h +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-3.0.8/include/linux/slub_def.h linux-3.0.8/include/linux/slub_def.h ---- linux-3.0.8/include/linux/slub_def.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/slub_def.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/slub_def.h linux-3.0.9/include/linux/slub_def.h +--- linux-3.0.9/include/linux/slub_def.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/slub_def.h 2011-11-12 12:47:14.000000000 -0500 @@ -82,7 +82,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -60725,9 +60725,9 @@ diff -urNp linux-3.0.8/include/linux/slub_def.h linux-3.0.8/include/linux/slub_d static __always_inline void * kmalloc_order(size_t size, gfp_t flags, unsigned int order) -diff -urNp linux-3.0.8/include/linux/sonet.h linux-3.0.8/include/linux/sonet.h ---- linux-3.0.8/include/linux/sonet.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/sonet.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/sonet.h linux-3.0.9/include/linux/sonet.h +--- linux-3.0.9/include/linux/sonet.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/sonet.h 2011-11-12 12:47:14.000000000 -0500 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -60737,9 +60737,9 @@ diff -urNp linux-3.0.8/include/linux/sonet.h linux-3.0.8/include/linux/sonet.h __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-3.0.8/include/linux/sunrpc/clnt.h linux-3.0.8/include/linux/sunrpc/clnt.h ---- linux-3.0.8/include/linux/sunrpc/clnt.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/sunrpc/clnt.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/sunrpc/clnt.h linux-3.0.9/include/linux/sunrpc/clnt.h +--- linux-3.0.9/include/linux/sunrpc/clnt.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/sunrpc/clnt.h 2011-11-12 12:47:14.000000000 -0500 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por { switch (sap->sa_family) { @@ -60770,9 +60770,9 @@ diff -urNp linux-3.0.8/include/linux/sunrpc/clnt.h linux-3.0.8/include/linux/sun } #endif /* __KERNEL__ */ -diff -urNp linux-3.0.8/include/linux/sunrpc/svc_rdma.h linux-3.0.8/include/linux/sunrpc/svc_rdma.h ---- linux-3.0.8/include/linux/sunrpc/svc_rdma.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/sunrpc/svc_rdma.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/sunrpc/svc_rdma.h linux-3.0.9/include/linux/sunrpc/svc_rdma.h +--- linux-3.0.9/include/linux/sunrpc/svc_rdma.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/sunrpc/svc_rdma.h 2011-11-12 12:47:14.000000000 -0500 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord; extern unsigned int svcrdma_max_requests; extern unsigned int svcrdma_max_req_size; @@ -60798,9 +60798,9 @@ diff -urNp linux-3.0.8/include/linux/sunrpc/svc_rdma.h linux-3.0.8/include/linux #define RPCRDMA_VERSION 1 -diff -urNp linux-3.0.8/include/linux/sysctl.h linux-3.0.8/include/linux/sysctl.h ---- linux-3.0.8/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/sysctl.h linux-3.0.9/include/linux/sysctl.h +--- linux-3.0.9/include/linux/sysctl.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/sysctl.h 2011-11-12 12:47:14.000000000 -0500 @@ -155,7 +155,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -60823,9 +60823,9 @@ diff -urNp linux-3.0.8/include/linux/sysctl.h linux-3.0.8/include/linux/sysctl.h extern int proc_dointvec(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(struct ctl_table *, int, -diff -urNp linux-3.0.8/include/linux/tty_ldisc.h linux-3.0.8/include/linux/tty_ldisc.h ---- linux-3.0.8/include/linux/tty_ldisc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/tty_ldisc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/tty_ldisc.h linux-3.0.9/include/linux/tty_ldisc.h +--- linux-3.0.9/include/linux/tty_ldisc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/tty_ldisc.h 2011-11-12 12:47:14.000000000 -0500 @@ -148,7 +148,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -60835,9 +60835,9 @@ diff -urNp linux-3.0.8/include/linux/tty_ldisc.h linux-3.0.8/include/linux/tty_l }; struct tty_ldisc { -diff -urNp linux-3.0.8/include/linux/types.h linux-3.0.8/include/linux/types.h ---- linux-3.0.8/include/linux/types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/types.h linux-3.0.9/include/linux/types.h +--- linux-3.0.9/include/linux/types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/types.h 2011-11-12 12:47:14.000000000 -0500 @@ -213,10 +213,26 @@ typedef struct { int counter; } atomic_t; @@ -60865,9 +60865,9 @@ diff -urNp linux-3.0.8/include/linux/types.h linux-3.0.8/include/linux/types.h #endif struct list_head { -diff -urNp linux-3.0.8/include/linux/uaccess.h linux-3.0.8/include/linux/uaccess.h ---- linux-3.0.8/include/linux/uaccess.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/uaccess.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/uaccess.h linux-3.0.9/include/linux/uaccess.h +--- linux-3.0.9/include/linux/uaccess.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/uaccess.h 2011-11-12 12:47:14.000000000 -0500 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -60883,9 +60883,9 @@ diff -urNp linux-3.0.8/include/linux/uaccess.h linux-3.0.8/include/linux/uaccess ret; \ }) -diff -urNp linux-3.0.8/include/linux/unaligned/access_ok.h linux-3.0.8/include/linux/unaligned/access_ok.h ---- linux-3.0.8/include/linux/unaligned/access_ok.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/unaligned/access_ok.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/unaligned/access_ok.h linux-3.0.9/include/linux/unaligned/access_ok.h +--- linux-3.0.9/include/linux/unaligned/access_ok.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/unaligned/access_ok.h 2011-11-12 12:47:14.000000000 -0500 @@ -6,32 +6,32 @@ static inline u16 get_unaligned_le16(const void *p) @@ -60925,9 +60925,9 @@ diff -urNp linux-3.0.8/include/linux/unaligned/access_ok.h linux-3.0.8/include/l } static inline void put_unaligned_le16(u16 val, void *p) -diff -urNp linux-3.0.8/include/linux/vermagic.h linux-3.0.8/include/linux/vermagic.h ---- linux-3.0.8/include/linux/vermagic.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/vermagic.h 2011-10-07 19:25:35.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/vermagic.h linux-3.0.9/include/linux/vermagic.h +--- linux-3.0.9/include/linux/vermagic.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/vermagic.h 2011-11-12 12:47:14.000000000 -0500 @@ -26,9 +26,28 @@ #define MODULE_ARCH_VERMAGIC "" #endif @@ -60958,22 +60958,22 @@ diff -urNp linux-3.0.8/include/linux/vermagic.h linux-3.0.8/include/linux/vermag + MODULE_ARCH_VERMAGIC \ + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC -diff -urNp linux-3.0.8/include/linux/vmalloc.h linux-3.0.8/include/linux/vmalloc.h ---- linux-3.0.8/include/linux/vmalloc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/vmalloc.h 2011-08-23 21:47:56.000000000 -0400 -@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining - #define VM_MAP 0x00000004 /* vmap()ed pages */ +diff -urNp linux-3.0.9/include/linux/vmalloc.h linux-3.0.9/include/linux/vmalloc.h +--- linux-3.0.9/include/linux/vmalloc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/vmalloc.h 2011-11-12 13:08:20.000000000 -0500 +@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ + #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */ + +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC) -+#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel memory range */ ++#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */ +#endif + /* bits [20..32] reserved for arch specific ioremap internals */ /* -@@ -155,4 +160,103 @@ pcpu_free_vm_areas(struct vm_struct **vm +@@ -156,4 +161,103 @@ pcpu_free_vm_areas(struct vm_struct **vm # endif #endif @@ -61077,9 +61077,9 @@ diff -urNp linux-3.0.8/include/linux/vmalloc.h linux-3.0.8/include/linux/vmalloc +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-3.0.8/include/linux/vmstat.h linux-3.0.8/include/linux/vmstat.h ---- linux-3.0.8/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/linux/vmstat.h linux-3.0.9/include/linux/vmstat.h +--- linux-3.0.9/include/linux/vmstat.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/linux/vmstat.h 2011-11-12 12:47:14.000000000 -0500 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in /* * Zone based page accounting with per cpu differentials. @@ -61143,9 +61143,9 @@ diff -urNp linux-3.0.8/include/linux/vmstat.h linux-3.0.8/include/linux/vmstat.h } static inline void __dec_zone_page_state(struct page *page, -diff -urNp linux-3.0.8/include/media/saa7146_vv.h linux-3.0.8/include/media/saa7146_vv.h ---- linux-3.0.8/include/media/saa7146_vv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/media/saa7146_vv.h 2011-10-07 19:07:40.000000000 -0400 +diff -urNp linux-3.0.9/include/media/saa7146_vv.h linux-3.0.9/include/media/saa7146_vv.h +--- linux-3.0.9/include/media/saa7146_vv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/media/saa7146_vv.h 2011-11-12 12:47:14.000000000 -0500 @@ -163,7 +163,7 @@ struct saa7146_ext_vv int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *); @@ -61155,9 +61155,9 @@ diff -urNp linux-3.0.8/include/media/saa7146_vv.h linux-3.0.8/include/media/saa7 /* pointer to the saa7146 core ops */ const struct v4l2_ioctl_ops *core_ops; -diff -urNp linux-3.0.8/include/media/v4l2-dev.h linux-3.0.8/include/media/v4l2-dev.h ---- linux-3.0.8/include/media/v4l2-dev.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/media/v4l2-dev.h 2011-10-07 19:07:40.000000000 -0400 +diff -urNp linux-3.0.9/include/media/v4l2-dev.h linux-3.0.9/include/media/v4l2-dev.h +--- linux-3.0.9/include/media/v4l2-dev.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/media/v4l2-dev.h 2011-11-12 12:47:14.000000000 -0500 @@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta @@ -61175,9 +61175,9 @@ diff -urNp linux-3.0.8/include/media/v4l2-dev.h linux-3.0.8/include/media/v4l2-d /* * Newer version of video_device, handled by videodev2.c -diff -urNp linux-3.0.8/include/media/v4l2-ioctl.h linux-3.0.8/include/media/v4l2-ioctl.h ---- linux-3.0.8/include/media/v4l2-ioctl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/media/v4l2-ioctl.h 2011-08-24 18:25:45.000000000 -0400 +diff -urNp linux-3.0.9/include/media/v4l2-ioctl.h linux-3.0.9/include/media/v4l2-ioctl.h +--- linux-3.0.9/include/media/v4l2-ioctl.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/media/v4l2-ioctl.h 2011-11-12 12:47:14.000000000 -0500 @@ -272,6 +272,7 @@ struct v4l2_ioctl_ops { long (*vidioc_default) (struct file *file, void *fh, bool valid_prio, int cmd, void *arg); @@ -61186,9 +61186,9 @@ diff -urNp linux-3.0.8/include/media/v4l2-ioctl.h linux-3.0.8/include/media/v4l2 /* v4l debugging and diagnostics */ -diff -urNp linux-3.0.8/include/net/caif/cfctrl.h linux-3.0.8/include/net/caif/cfctrl.h ---- linux-3.0.8/include/net/caif/cfctrl.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/caif/cfctrl.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/caif/cfctrl.h linux-3.0.9/include/net/caif/cfctrl.h +--- linux-3.0.9/include/net/caif/cfctrl.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/caif/cfctrl.h 2011-11-12 12:47:14.000000000 -0500 @@ -52,7 +52,7 @@ struct cfctrl_rsp { void (*radioset_rsp)(void); void (*reject_rsp)(struct cflayer *layer, u8 linkid, @@ -61209,10 +61209,10 @@ diff -urNp linux-3.0.8/include/net/caif/cfctrl.h linux-3.0.8/include/net/caif/cf struct list_head list; /* Protects from simultaneous access to first_req list */ spinlock_t info_list_lock; -diff -urNp linux-3.0.8/include/net/flow.h linux-3.0.8/include/net/flow.h ---- linux-3.0.8/include/net/flow.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/flow.h 2011-08-23 21:47:56.000000000 -0400 -@@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca +diff -urNp linux-3.0.9/include/net/flow.h linux-3.0.9/include/net/flow.h +--- linux-3.0.9/include/net/flow.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/flow.h 2011-11-12 12:47:14.000000000 -0500 +@@ -207,6 +207,6 @@ extern struct flow_cache_object *flow_ca u8 dir, flow_resolve_t resolver, void *ctx); extern void flow_cache_flush(void); @@ -61220,9 +61220,9 @@ diff -urNp linux-3.0.8/include/net/flow.h linux-3.0.8/include/net/flow.h +extern atomic_unchecked_t flow_cache_genid; #endif -diff -urNp linux-3.0.8/include/net/inetpeer.h linux-3.0.8/include/net/inetpeer.h ---- linux-3.0.8/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/inetpeer.h linux-3.0.9/include/net/inetpeer.h +--- linux-3.0.9/include/net/inetpeer.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/inetpeer.h 2011-11-12 12:47:14.000000000 -0500 @@ -43,8 +43,8 @@ struct inet_peer { */ union { @@ -61243,9 +61243,9 @@ diff -urNp linux-3.0.8/include/net/inetpeer.h linux-3.0.8/include/net/inetpeer.h } #endif /* _NET_INETPEER_H */ -diff -urNp linux-3.0.8/include/net/ip_fib.h linux-3.0.8/include/net/ip_fib.h ---- linux-3.0.8/include/net/ip_fib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/ip_fib.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/ip_fib.h linux-3.0.9/include/net/ip_fib.h +--- linux-3.0.9/include/net/ip_fib.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/ip_fib.h 2011-11-12 12:47:14.000000000 -0500 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s #define FIB_RES_SADDR(net, res) \ @@ -61255,9 +61255,9 @@ diff -urNp linux-3.0.8/include/net/ip_fib.h linux-3.0.8/include/net/ip_fib.h FIB_RES_NH(res).nh_saddr : \ fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) -diff -urNp linux-3.0.8/include/net/ip_vs.h linux-3.0.8/include/net/ip_vs.h ---- linux-3.0.8/include/net/ip_vs.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/ip_vs.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/ip_vs.h linux-3.0.9/include/net/ip_vs.h +--- linux-3.0.9/include/net/ip_vs.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/ip_vs.h 2011-11-12 12:47:14.000000000 -0500 @@ -509,7 +509,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection */ atomic_t n_control; /* Number of controlled ones */ @@ -61276,9 +61276,9 @@ diff -urNp linux-3.0.8/include/net/ip_vs.h linux-3.0.8/include/net/ip_vs.h atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -diff -urNp linux-3.0.8/include/net/irda/ircomm_core.h linux-3.0.8/include/net/irda/ircomm_core.h ---- linux-3.0.8/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/irda/ircomm_core.h linux-3.0.9/include/net/irda/ircomm_core.h +--- linux-3.0.9/include/net/irda/ircomm_core.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/irda/ircomm_core.h 2011-11-12 12:47:14.000000000 -0500 @@ -51,7 +51,7 @@ typedef struct { int (*connect_response)(struct ircomm_cb *, struct sk_buff *); int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, @@ -61288,9 +61288,9 @@ diff -urNp linux-3.0.8/include/net/irda/ircomm_core.h linux-3.0.8/include/net/ir struct ircomm_cb { irda_queue_t queue; -diff -urNp linux-3.0.8/include/net/irda/ircomm_tty.h linux-3.0.8/include/net/irda/ircomm_tty.h ---- linux-3.0.8/include/net/irda/ircomm_tty.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/irda/ircomm_tty.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/irda/ircomm_tty.h linux-3.0.9/include/net/irda/ircomm_tty.h +--- linux-3.0.9/include/net/irda/ircomm_tty.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/irda/ircomm_tty.h 2011-11-12 12:47:14.000000000 -0500 @@ -35,6 +35,7 @@ #include <linux/termios.h> #include <linux/timer.h> @@ -61310,9 +61310,9 @@ diff -urNp linux-3.0.8/include/net/irda/ircomm_tty.h linux-3.0.8/include/net/ird /* Protect concurent access to : * o self->open_count -diff -urNp linux-3.0.8/include/net/iucv/af_iucv.h linux-3.0.8/include/net/iucv/af_iucv.h ---- linux-3.0.8/include/net/iucv/af_iucv.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/iucv/af_iucv.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/iucv/af_iucv.h linux-3.0.9/include/net/iucv/af_iucv.h +--- linux-3.0.9/include/net/iucv/af_iucv.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/iucv/af_iucv.h 2011-11-12 12:47:14.000000000 -0500 @@ -87,7 +87,7 @@ struct iucv_sock { struct iucv_sock_list { struct hlist_head head; @@ -61322,9 +61322,9 @@ diff -urNp linux-3.0.8/include/net/iucv/af_iucv.h linux-3.0.8/include/net/iucv/a }; unsigned int iucv_sock_poll(struct file *file, struct socket *sock, -diff -urNp linux-3.0.8/include/net/lapb.h linux-3.0.8/include/net/lapb.h ---- linux-3.0.8/include/net/lapb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/lapb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/lapb.h linux-3.0.9/include/net/lapb.h +--- linux-3.0.9/include/net/lapb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/lapb.h 2011-11-12 12:47:14.000000000 -0500 @@ -95,7 +95,7 @@ struct lapb_cb { struct sk_buff_head write_queue; struct sk_buff_head ack_queue; @@ -61334,9 +61334,9 @@ diff -urNp linux-3.0.8/include/net/lapb.h linux-3.0.8/include/net/lapb.h /* FRMR control information */ struct lapb_frame frmr_data; -diff -urNp linux-3.0.8/include/net/neighbour.h linux-3.0.8/include/net/neighbour.h ---- linux-3.0.8/include/net/neighbour.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/neighbour.h 2011-08-31 18:39:25.000000000 -0400 +diff -urNp linux-3.0.9/include/net/neighbour.h linux-3.0.9/include/net/neighbour.h +--- linux-3.0.9/include/net/neighbour.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/neighbour.h 2011-11-12 12:47:14.000000000 -0500 @@ -124,7 +124,7 @@ struct neigh_ops { int (*connected_output)(struct sk_buff*); int (*hh_output)(struct sk_buff*); @@ -61346,9 +61346,9 @@ diff -urNp linux-3.0.8/include/net/neighbour.h linux-3.0.8/include/net/neighbour struct pneigh_entry { struct pneigh_entry *next; -diff -urNp linux-3.0.8/include/net/netlink.h linux-3.0.8/include/net/netlink.h ---- linux-3.0.8/include/net/netlink.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/netlink.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/netlink.h linux-3.0.9/include/net/netlink.h +--- linux-3.0.9/include/net/netlink.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/netlink.h 2011-11-12 12:47:14.000000000 -0500 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct static inline void nlmsg_trim(struct sk_buff *skb, const void *mark) { @@ -61358,9 +61358,9 @@ diff -urNp linux-3.0.8/include/net/netlink.h linux-3.0.8/include/net/netlink.h } /** -diff -urNp linux-3.0.8/include/net/netns/ipv4.h linux-3.0.8/include/net/netns/ipv4.h ---- linux-3.0.8/include/net/netns/ipv4.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/netns/ipv4.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/netns/ipv4.h linux-3.0.9/include/net/netns/ipv4.h +--- linux-3.0.9/include/net/netns/ipv4.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/netns/ipv4.h 2011-11-12 12:47:14.000000000 -0500 @@ -56,8 +56,8 @@ struct netns_ipv4 { unsigned int sysctl_ping_group_range[2]; @@ -61372,9 +61372,9 @@ diff -urNp linux-3.0.8/include/net/netns/ipv4.h linux-3.0.8/include/net/netns/ip #ifdef CONFIG_IP_MROUTE #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES -diff -urNp linux-3.0.8/include/net/sctp/sctp.h linux-3.0.8/include/net/sctp/sctp.h ---- linux-3.0.8/include/net/sctp/sctp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/sctp/sctp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/sctp/sctp.h linux-3.0.9/include/net/sctp/sctp.h +--- linux-3.0.9/include/net/sctp/sctp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/sctp/sctp.h 2011-11-12 12:47:14.000000000 -0500 @@ -315,9 +315,9 @@ do { \ #else /* SCTP_DEBUG */ @@ -61388,9 +61388,9 @@ diff -urNp linux-3.0.8/include/net/sctp/sctp.h linux-3.0.8/include/net/sctp/sctp #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-3.0.8/include/net/sock.h linux-3.0.8/include/net/sock.h ---- linux-3.0.8/include/net/sock.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/sock.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/sock.h linux-3.0.9/include/net/sock.h +--- linux-3.0.9/include/net/sock.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/sock.h 2011-11-12 12:47:14.000000000 -0500 @@ -277,7 +277,7 @@ struct sock { #ifdef CONFIG_RPS __u32 sk_rxhash; @@ -61409,9 +61409,9 @@ diff -urNp linux-3.0.8/include/net/sock.h linux-3.0.8/include/net/sock.h int copy, int offset) { if (skb->ip_summed == CHECKSUM_NONE) { -diff -urNp linux-3.0.8/include/net/tcp.h linux-3.0.8/include/net/tcp.h ---- linux-3.0.8/include/net/tcp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/tcp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/tcp.h linux-3.0.9/include/net/tcp.h +--- linux-3.0.9/include/net/tcp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/tcp.h 2011-11-12 12:47:14.000000000 -0500 @@ -1374,8 +1374,8 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -61423,9 +61423,9 @@ diff -urNp linux-3.0.8/include/net/tcp.h linux-3.0.8/include/net/tcp.h }; struct tcp_iter_state { -diff -urNp linux-3.0.8/include/net/udp.h linux-3.0.8/include/net/udp.h ---- linux-3.0.8/include/net/udp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/udp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/udp.h linux-3.0.9/include/net/udp.h +--- linux-3.0.9/include/net/udp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/udp.h 2011-11-12 12:47:14.000000000 -0500 @@ -234,8 +234,8 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -61437,9 +61437,9 @@ diff -urNp linux-3.0.8/include/net/udp.h linux-3.0.8/include/net/udp.h }; struct udp_iter_state { -diff -urNp linux-3.0.8/include/net/xfrm.h linux-3.0.8/include/net/xfrm.h ---- linux-3.0.8/include/net/xfrm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/net/xfrm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/net/xfrm.h linux-3.0.9/include/net/xfrm.h +--- linux-3.0.9/include/net/xfrm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/net/xfrm.h 2011-11-12 12:47:14.000000000 -0500 @@ -505,7 +505,7 @@ struct xfrm_policy { struct timer_list timer; @@ -61449,9 +61449,9 @@ diff -urNp linux-3.0.8/include/net/xfrm.h linux-3.0.8/include/net/xfrm.h u32 priority; u32 index; struct xfrm_mark mark; -diff -urNp linux-3.0.8/include/rdma/iw_cm.h linux-3.0.8/include/rdma/iw_cm.h ---- linux-3.0.8/include/rdma/iw_cm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/rdma/iw_cm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/rdma/iw_cm.h linux-3.0.9/include/rdma/iw_cm.h +--- linux-3.0.9/include/rdma/iw_cm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/rdma/iw_cm.h 2011-11-12 12:47:14.000000000 -0500 @@ -120,7 +120,7 @@ struct iw_cm_verbs { int backlog); @@ -61461,9 +61461,9 @@ diff -urNp linux-3.0.8/include/rdma/iw_cm.h linux-3.0.8/include/rdma/iw_cm.h /** * iw_create_cm_id - Create an IW CM identifier. -diff -urNp linux-3.0.8/include/scsi/libfc.h linux-3.0.8/include/scsi/libfc.h ---- linux-3.0.8/include/scsi/libfc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/scsi/libfc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/scsi/libfc.h linux-3.0.9/include/scsi/libfc.h +--- linux-3.0.9/include/scsi/libfc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/scsi/libfc.h 2011-11-12 12:47:14.000000000 -0500 @@ -750,6 +750,7 @@ struct libfc_function_template { */ void (*disc_stop_final) (struct fc_lport *); @@ -61481,9 +61481,9 @@ diff -urNp linux-3.0.8/include/scsi/libfc.h linux-3.0.8/include/scsi/libfc.h u8 link_up; u8 qfull; enum fc_lport_state state; -diff -urNp linux-3.0.8/include/scsi/scsi_device.h linux-3.0.8/include/scsi/scsi_device.h ---- linux-3.0.8/include/scsi/scsi_device.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/scsi/scsi_device.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/scsi/scsi_device.h linux-3.0.9/include/scsi/scsi_device.h +--- linux-3.0.9/include/scsi/scsi_device.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/scsi/scsi_device.h 2011-11-12 12:47:14.000000000 -0500 @@ -161,9 +161,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -61497,9 +61497,9 @@ diff -urNp linux-3.0.8/include/scsi/scsi_device.h linux-3.0.8/include/scsi/scsi_ struct device sdev_gendev, sdev_dev; -diff -urNp linux-3.0.8/include/scsi/scsi_transport_fc.h linux-3.0.8/include/scsi/scsi_transport_fc.h ---- linux-3.0.8/include/scsi/scsi_transport_fc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/scsi/scsi_transport_fc.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/scsi/scsi_transport_fc.h linux-3.0.9/include/scsi/scsi_transport_fc.h +--- linux-3.0.9/include/scsi/scsi_transport_fc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/scsi/scsi_transport_fc.h 2011-11-12 12:47:14.000000000 -0500 @@ -711,7 +711,7 @@ struct fc_function_template { unsigned long show_host_system_hostname:1; @@ -61509,9 +61509,9 @@ diff -urNp linux-3.0.8/include/scsi/scsi_transport_fc.h linux-3.0.8/include/scsi /** -diff -urNp linux-3.0.8/include/sound/ak4xxx-adda.h linux-3.0.8/include/sound/ak4xxx-adda.h ---- linux-3.0.8/include/sound/ak4xxx-adda.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/ak4xxx-adda.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/ak4xxx-adda.h linux-3.0.9/include/sound/ak4xxx-adda.h +--- linux-3.0.9/include/sound/ak4xxx-adda.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/ak4xxx-adda.h 2011-11-12 12:47:14.000000000 -0500 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops { void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg, unsigned char val); @@ -61521,9 +61521,9 @@ diff -urNp linux-3.0.8/include/sound/ak4xxx-adda.h linux-3.0.8/include/sound/ak4 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */ -diff -urNp linux-3.0.8/include/sound/hwdep.h linux-3.0.8/include/sound/hwdep.h ---- linux-3.0.8/include/sound/hwdep.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/hwdep.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/hwdep.h linux-3.0.9/include/sound/hwdep.h +--- linux-3.0.9/include/sound/hwdep.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/hwdep.h 2011-11-12 12:47:14.000000000 -0500 @@ -49,7 +49,7 @@ struct snd_hwdep_ops { struct snd_hwdep_dsp_status *status); int (*dsp_load)(struct snd_hwdep *hw, @@ -61533,9 +61533,9 @@ diff -urNp linux-3.0.8/include/sound/hwdep.h linux-3.0.8/include/sound/hwdep.h struct snd_hwdep { struct snd_card *card; -diff -urNp linux-3.0.8/include/sound/info.h linux-3.0.8/include/sound/info.h ---- linux-3.0.8/include/sound/info.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/info.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/info.h linux-3.0.9/include/sound/info.h +--- linux-3.0.9/include/sound/info.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/info.h 2011-11-12 12:47:14.000000000 -0500 @@ -44,7 +44,7 @@ struct snd_info_entry_text { struct snd_info_buffer *buffer); void (*write)(struct snd_info_entry *entry, @@ -61545,9 +61545,9 @@ diff -urNp linux-3.0.8/include/sound/info.h linux-3.0.8/include/sound/info.h struct snd_info_entry_ops { int (*open)(struct snd_info_entry *entry, -diff -urNp linux-3.0.8/include/sound/pcm.h linux-3.0.8/include/sound/pcm.h ---- linux-3.0.8/include/sound/pcm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/pcm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/pcm.h linux-3.0.9/include/sound/pcm.h +--- linux-3.0.9/include/sound/pcm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/pcm.h 2011-11-12 12:47:14.000000000 -0500 @@ -81,6 +81,7 @@ struct snd_pcm_ops { int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma); int (*ack)(struct snd_pcm_substream *substream); @@ -61556,9 +61556,9 @@ diff -urNp linux-3.0.8/include/sound/pcm.h linux-3.0.8/include/sound/pcm.h /* * -diff -urNp linux-3.0.8/include/sound/sb16_csp.h linux-3.0.8/include/sound/sb16_csp.h ---- linux-3.0.8/include/sound/sb16_csp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/sb16_csp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/sb16_csp.h linux-3.0.9/include/sound/sb16_csp.h +--- linux-3.0.9/include/sound/sb16_csp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/sb16_csp.h 2011-11-12 12:47:14.000000000 -0500 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops { int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels); int (*csp_stop) (struct snd_sb_csp * p); @@ -61568,9 +61568,9 @@ diff -urNp linux-3.0.8/include/sound/sb16_csp.h linux-3.0.8/include/sound/sb16_c /* * CSP private data -diff -urNp linux-3.0.8/include/sound/soc.h linux-3.0.8/include/sound/soc.h ---- linux-3.0.8/include/sound/soc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/soc.h 2011-08-26 19:49:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/soc.h linux-3.0.9/include/sound/soc.h +--- linux-3.0.9/include/sound/soc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/soc.h 2011-11-12 12:47:14.000000000 -0500 @@ -636,7 +636,7 @@ struct snd_soc_platform_driver { /* platform stream ops */ @@ -61580,9 +61580,9 @@ diff -urNp linux-3.0.8/include/sound/soc.h linux-3.0.8/include/sound/soc.h struct snd_soc_platform { const char *name; -diff -urNp linux-3.0.8/include/sound/ymfpci.h linux-3.0.8/include/sound/ymfpci.h ---- linux-3.0.8/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/sound/ymfpci.h linux-3.0.9/include/sound/ymfpci.h +--- linux-3.0.9/include/sound/ymfpci.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/sound/ymfpci.h 2011-11-12 12:47:14.000000000 -0500 @@ -358,7 +358,7 @@ struct snd_ymfpci { spinlock_t reg_lock; spinlock_t voice_lock; @@ -61592,9 +61592,9 @@ diff -urNp linux-3.0.8/include/sound/ymfpci.h linux-3.0.8/include/sound/ymfpci.h struct snd_info_entry *proc_entry; const struct firmware *dsp_microcode; const struct firmware *controller_microcode; -diff -urNp linux-3.0.8/include/target/target_core_base.h linux-3.0.8/include/target/target_core_base.h ---- linux-3.0.8/include/target/target_core_base.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/target/target_core_base.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/target/target_core_base.h linux-3.0.9/include/target/target_core_base.h +--- linux-3.0.9/include/target/target_core_base.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/target/target_core_base.h 2011-11-12 12:47:14.000000000 -0500 @@ -364,7 +364,7 @@ struct t10_reservation_ops { int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32); int (*t10_pr_register)(struct se_cmd *); @@ -61624,9 +61624,9 @@ diff -urNp linux-3.0.8/include/target/target_core_base.h linux-3.0.8/include/tar atomic_t dev_tur_active; atomic_t execute_tasks; atomic_t dev_status_thr_count; -diff -urNp linux-3.0.8/include/trace/events/irq.h linux-3.0.8/include/trace/events/irq.h ---- linux-3.0.8/include/trace/events/irq.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/trace/events/irq.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/trace/events/irq.h linux-3.0.9/include/trace/events/irq.h +--- linux-3.0.9/include/trace/events/irq.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/trace/events/irq.h 2011-11-12 12:47:14.000000000 -0500 @@ -36,7 +36,7 @@ struct softirq_action; */ TRACE_EVENT(irq_handler_entry, @@ -61645,9 +61645,9 @@ diff -urNp linux-3.0.8/include/trace/events/irq.h linux-3.0.8/include/trace/even TP_ARGS(irq, action, ret), -diff -urNp linux-3.0.8/include/video/udlfb.h linux-3.0.8/include/video/udlfb.h ---- linux-3.0.8/include/video/udlfb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/video/udlfb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/video/udlfb.h linux-3.0.9/include/video/udlfb.h +--- linux-3.0.9/include/video/udlfb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/video/udlfb.h 2011-11-12 12:47:14.000000000 -0500 @@ -51,10 +51,10 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; @@ -61663,9 +61663,9 @@ diff -urNp linux-3.0.8/include/video/udlfb.h linux-3.0.8/include/video/udlfb.h }; #define NR_USB_REQUEST_I2C_SUB_IO 0x02 -diff -urNp linux-3.0.8/include/video/uvesafb.h linux-3.0.8/include/video/uvesafb.h ---- linux-3.0.8/include/video/uvesafb.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/include/video/uvesafb.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/include/video/uvesafb.h linux-3.0.9/include/video/uvesafb.h +--- linux-3.0.9/include/video/uvesafb.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/include/video/uvesafb.h 2011-11-12 12:47:14.000000000 -0500 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -61674,9 +61674,9 @@ diff -urNp linux-3.0.8/include/video/uvesafb.h linux-3.0.8/include/video/uvesafb void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-3.0.8/init/do_mounts.c linux-3.0.8/init/do_mounts.c ---- linux-3.0.8/init/do_mounts.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/do_mounts.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/do_mounts.c linux-3.0.9/init/do_mounts.c +--- linux-3.0.9/init/do_mounts.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/do_mounts.c 2011-11-12 12:47:14.000000000 -0500 @@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) @@ -61722,9 +61722,9 @@ diff -urNp linux-3.0.8/init/do_mounts.c linux-3.0.8/init/do_mounts.c + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((const char __force_user *)"."); } -diff -urNp linux-3.0.8/init/do_mounts.h linux-3.0.8/init/do_mounts.h ---- linux-3.0.8/init/do_mounts.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/do_mounts.h 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/do_mounts.h linux-3.0.9/init/do_mounts.h +--- linux-3.0.9/init/do_mounts.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/do_mounts.h 2011-11-12 12:47:14.000000000 -0500 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -61753,9 +61753,9 @@ diff -urNp linux-3.0.8/init/do_mounts.h linux-3.0.8/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-3.0.8/init/do_mounts_initrd.c linux-3.0.8/init/do_mounts_initrd.c ---- linux-3.0.8/init/do_mounts_initrd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/do_mounts_initrd.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/do_mounts_initrd.c linux-3.0.9/init/do_mounts_initrd.c +--- linux-3.0.9/init/do_mounts_initrd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/do_mounts_initrd.c 2011-11-12 12:47:14.000000000 -0500 @@ -44,13 +44,13 @@ static void __init handle_initrd(void) create_dev("/dev/root.old", Root_RAM0); /* mount initrd on rootfs' /root */ @@ -61830,9 +61830,9 @@ diff -urNp linux-3.0.8/init/do_mounts_initrd.c linux-3.0.8/init/do_mounts_initrd + sys_unlink((const char __force_user *)"/initrd.image"); return 0; } -diff -urNp linux-3.0.8/init/do_mounts_md.c linux-3.0.8/init/do_mounts_md.c ---- linux-3.0.8/init/do_mounts_md.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/do_mounts_md.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/do_mounts_md.c linux-3.0.9/init/do_mounts_md.c +--- linux-3.0.9/init/do_mounts_md.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/do_mounts_md.c 2011-11-12 12:47:14.000000000 -0500 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -61860,9 +61860,9 @@ diff -urNp linux-3.0.8/init/do_mounts_md.c linux-3.0.8/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-3.0.8/init/initramfs.c linux-3.0.8/init/initramfs.c ---- linux-3.0.8/init/initramfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/initramfs.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/initramfs.c linux-3.0.9/init/initramfs.c +--- linux-3.0.9/init/initramfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/initramfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -61971,9 +61971,9 @@ diff -urNp linux-3.0.8/init/initramfs.c linux-3.0.8/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-3.0.8/init/Kconfig linux-3.0.8/init/Kconfig ---- linux-3.0.8/init/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/Kconfig 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/init/Kconfig linux-3.0.9/init/Kconfig +--- linux-3.0.9/init/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -1195,7 +1195,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -61983,9 +61983,9 @@ diff -urNp linux-3.0.8/init/Kconfig linux-3.0.8/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -diff -urNp linux-3.0.8/init/main.c linux-3.0.8/init/main.c ---- linux-3.0.8/init/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/init/main.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/init/main.c linux-3.0.9/init/main.c +--- linux-3.0.9/init/main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/init/main.c 2011-11-12 12:47:14.000000000 -0500 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) extern void tc_init(void); #endif @@ -62097,9 +62097,9 @@ diff -urNp linux-3.0.8/init/main.c linux-3.0.8/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-3.0.8/ipc/mqueue.c linux-3.0.8/ipc/mqueue.c ---- linux-3.0.8/ipc/mqueue.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/ipc/mqueue.c 2011-10-16 21:59:31.000000000 -0400 +diff -urNp linux-3.0.9/ipc/mqueue.c linux-3.0.9/ipc/mqueue.c +--- linux-3.0.9/ipc/mqueue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/ipc/mqueue.c 2011-11-12 12:47:14.000000000 -0500 @@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -62108,9 +62108,9 @@ diff -urNp linux-3.0.8/ipc/mqueue.c linux-3.0.8/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) { -diff -urNp linux-3.0.8/ipc/msg.c linux-3.0.8/ipc/msg.c ---- linux-3.0.8/ipc/msg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/ipc/msg.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/ipc/msg.c linux-3.0.9/ipc/msg.c +--- linux-3.0.9/ipc/msg.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/ipc/msg.c 2011-11-12 12:47:14.000000000 -0500 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke return security_msg_queue_associate(msq, msgflg); } @@ -62136,9 +62136,9 @@ diff -urNp linux-3.0.8/ipc/msg.c linux-3.0.8/ipc/msg.c msg_params.key = key; msg_params.flg = msgflg; -diff -urNp linux-3.0.8/ipc/sem.c linux-3.0.8/ipc/sem.c ---- linux-3.0.8/ipc/sem.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/ipc/sem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/ipc/sem.c linux-3.0.9/ipc/sem.c +--- linux-3.0.9/ipc/sem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/ipc/sem.c 2011-11-12 12:47:14.000000000 -0500 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct return 0; } @@ -62185,9 +62185,9 @@ diff -urNp linux-3.0.8/ipc/sem.c linux-3.0.8/ipc/sem.c ns = current->nsproxy->ipc_ns; if (nsops < 1 || semid < 0) -diff -urNp linux-3.0.8/ipc/shm.c linux-3.0.8/ipc/shm.c ---- linux-3.0.8/ipc/shm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/ipc/shm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/ipc/shm.c linux-3.0.9/ipc/shm.c +--- linux-3.0.9/ipc/shm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/ipc/shm.c 2011-11-12 12:47:14.000000000 -0500 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -62274,9 +62274,9 @@ diff -urNp linux-3.0.8/ipc/shm.c linux-3.0.8/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-3.0.8/kernel/acct.c linux-3.0.8/kernel/acct.c ---- linux-3.0.8/kernel/acct.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/acct.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/acct.c linux-3.0.9/kernel/acct.c +--- linux-3.0.9/kernel/acct.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/acct.c 2011-11-12 12:47:14.000000000 -0500 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -62286,9 +62286,9 @@ diff -urNp linux-3.0.8/kernel/acct.c linux-3.0.8/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-3.0.8/kernel/audit.c linux-3.0.8/kernel/audit.c ---- linux-3.0.8/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/audit.c linux-3.0.9/kernel/audit.c +--- linux-3.0.9/kernel/audit.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/audit.c 2011-11-12 12:47:14.000000000 -0500 @@ -112,7 +112,7 @@ u32 audit_sig_sid = 0; 3) suppressed due to audit_rate_limit 4) suppressed due to audit_backlog_limit @@ -62325,9 +62325,9 @@ diff -urNp linux-3.0.8/kernel/audit.c linux-3.0.8/kernel/audit.c status_set.backlog = skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); -diff -urNp linux-3.0.8/kernel/auditsc.c linux-3.0.8/kernel/auditsc.c ---- linux-3.0.8/kernel/auditsc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/auditsc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/auditsc.c linux-3.0.9/kernel/auditsc.c +--- linux-3.0.9/kernel/auditsc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/auditsc.c 2011-11-12 12:47:14.000000000 -0500 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte } @@ -62346,9 +62346,9 @@ diff -urNp linux-3.0.8/kernel/auditsc.c linux-3.0.8/kernel/auditsc.c struct audit_context *context = task->audit_context; if (context && context->in_syscall) { -diff -urNp linux-3.0.8/kernel/capability.c linux-3.0.8/kernel/capability.c ---- linux-3.0.8/kernel/capability.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/capability.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/capability.c linux-3.0.9/kernel/capability.c +--- linux-3.0.9/kernel/capability.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/capability.c 2011-11-12 12:47:14.000000000 -0500 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_ * before modification is attempted and the application * fails. @@ -62409,9 +62409,9 @@ diff -urNp linux-3.0.8/kernel/capability.c linux-3.0.8/kernel/capability.c /** * nsown_capable - Check superior capability to one's own user_ns * @cap: The capability in question -diff -urNp linux-3.0.8/kernel/cgroup.c linux-3.0.8/kernel/cgroup.c ---- linux-3.0.8/kernel/cgroup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/cgroup.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/cgroup.c linux-3.0.9/kernel/cgroup.c +--- linux-3.0.9/kernel/cgroup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/cgroup.c 2011-11-12 12:47:14.000000000 -0500 @@ -593,6 +593,8 @@ static struct css_set *find_css_set( struct hlist_head *hhead; struct cg_cgroup_link *link; @@ -62421,9 +62421,9 @@ diff -urNp linux-3.0.8/kernel/cgroup.c linux-3.0.8/kernel/cgroup.c /* First see if we already have a cgroup group that matches * the desired set */ read_lock(&css_set_lock); -diff -urNp linux-3.0.8/kernel/compat.c linux-3.0.8/kernel/compat.c ---- linux-3.0.8/kernel/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/compat.c linux-3.0.9/kernel/compat.c +--- linux-3.0.9/kernel/compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -13,6 +13,7 @@ #include <linux/linkage.h> @@ -62589,9 +62589,9 @@ diff -urNp linux-3.0.8/kernel/compat.c linux-3.0.8/kernel/compat.c set_fs(oldfs); if ((err == -ERESTART_RESTARTBLOCK) && rmtp && -diff -urNp linux-3.0.8/kernel/configs.c linux-3.0.8/kernel/configs.c ---- linux-3.0.8/kernel/configs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/configs.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/configs.c linux-3.0.9/kernel/configs.c +--- linux-3.0.9/kernel/configs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/configs.c 2011-11-12 12:47:14.000000000 -0500 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -62612,9 +62612,9 @@ diff -urNp linux-3.0.8/kernel/configs.c linux-3.0.8/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-3.0.8/kernel/cred.c linux-3.0.8/kernel/cred.c ---- linux-3.0.8/kernel/cred.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/cred.c 2011-08-25 17:23:03.000000000 -0400 +diff -urNp linux-3.0.9/kernel/cred.c linux-3.0.9/kernel/cred.c +--- linux-3.0.9/kernel/cred.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/cred.c 2011-11-12 12:47:14.000000000 -0500 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head */ void __put_cred(struct cred *cred) @@ -62763,9 +62763,9 @@ diff -urNp linux-3.0.8/kernel/cred.c linux-3.0.8/kernel/cred.c ret = security_secctx_to_secid(secctx, strlen(secctx), &secid); if (ret < 0) return ret; -diff -urNp linux-3.0.8/kernel/debug/debug_core.c linux-3.0.8/kernel/debug/debug_core.c ---- linux-3.0.8/kernel/debug/debug_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/debug/debug_core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/debug/debug_core.c linux-3.0.9/kernel/debug/debug_core.c +--- linux-3.0.9/kernel/debug/debug_core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/debug/debug_core.c 2011-11-12 12:47:14.000000000 -0500 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc */ static atomic_t masters_in_kgdb; @@ -62826,9 +62826,9 @@ diff -urNp linux-3.0.8/kernel/debug/debug_core.c linux-3.0.8/kernel/debug/debug_ tasklet_schedule(&kgdb_tasklet_breakpoint); } EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint); -diff -urNp linux-3.0.8/kernel/debug/kdb/kdb_main.c linux-3.0.8/kernel/debug/kdb/kdb_main.c ---- linux-3.0.8/kernel/debug/kdb/kdb_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/debug/kdb/kdb_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/debug/kdb/kdb_main.c linux-3.0.9/kernel/debug/kdb/kdb_main.c +--- linux-3.0.9/kernel/debug/kdb/kdb_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/debug/kdb/kdb_main.c 2011-11-12 12:47:14.000000000 -0500 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha list_for_each_entry(mod, kdb_modules, list) { @@ -62847,9 +62847,9 @@ diff -urNp linux-3.0.8/kernel/debug/kdb/kdb_main.c linux-3.0.8/kernel/debug/kdb/ #ifdef CONFIG_MODULE_UNLOAD { -diff -urNp linux-3.0.8/kernel/events/core.c linux-3.0.8/kernel/events/core.c ---- linux-3.0.8/kernel/events/core.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/kernel/events/core.c 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.9/kernel/events/core.c linux-3.0.9/kernel/events/core.c +--- linux-3.0.9/kernel/events/core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/events/core.c 2011-11-12 12:47:14.000000000 -0500 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_ return 0; } @@ -62945,9 +62945,9 @@ diff -urNp linux-3.0.8/kernel/events/core.c linux-3.0.8/kernel/events/core.c &parent_event->child_total_time_running); /* -diff -urNp linux-3.0.8/kernel/exit.c linux-3.0.8/kernel/exit.c ---- linux-3.0.8/kernel/exit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/exit.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/exit.c linux-3.0.9/kernel/exit.c +--- linux-3.0.9/kernel/exit.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/exit.c 2011-11-12 12:47:14.000000000 -0500 @@ -57,6 +57,10 @@ #include <asm/pgtable.h> #include <asm/mmu_context.h> @@ -63061,9 +63061,9 @@ diff -urNp linux-3.0.8/kernel/exit.c linux-3.0.8/kernel/exit.c exit_mm(tsk); if (group_dead) -diff -urNp linux-3.0.8/kernel/fork.c linux-3.0.8/kernel/fork.c ---- linux-3.0.8/kernel/fork.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/fork.c 2011-08-25 17:23:36.000000000 -0400 +diff -urNp linux-3.0.9/kernel/fork.c linux-3.0.9/kernel/fork.c +--- linux-3.0.9/kernel/fork.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/fork.c 2011-11-12 12:47:14.000000000 -0500 @@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -63361,9 +63361,9 @@ diff -urNp linux-3.0.8/kernel/fork.c linux-3.0.8/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-3.0.8/kernel/futex.c linux-3.0.8/kernel/futex.c ---- linux-3.0.8/kernel/futex.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/futex.c linux-3.0.9/kernel/futex.c +--- linux-3.0.9/kernel/futex.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/futex.c 2011-11-12 12:47:14.000000000 -0500 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -63451,9 +63451,9 @@ diff -urNp linux-3.0.8/kernel/futex.c linux-3.0.8/kernel/futex.c for (i = 0; i < ARRAY_SIZE(futex_queues); i++) { plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock); -diff -urNp linux-3.0.8/kernel/futex_compat.c linux-3.0.8/kernel/futex_compat.c ---- linux-3.0.8/kernel/futex_compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/futex_compat.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/futex_compat.c linux-3.0.9/kernel/futex_compat.c +--- linux-3.0.9/kernel/futex_compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/futex_compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -63493,9 +63493,9 @@ diff -urNp linux-3.0.8/kernel/futex_compat.c linux-3.0.8/kernel/futex_compat.c head = p->compat_robust_list; rcu_read_unlock(); } -diff -urNp linux-3.0.8/kernel/gcov/base.c linux-3.0.8/kernel/gcov/base.c ---- linux-3.0.8/kernel/gcov/base.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/gcov/base.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/gcov/base.c linux-3.0.9/kernel/gcov/base.c +--- linux-3.0.9/kernel/gcov/base.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/gcov/base.c 2011-11-12 12:47:14.000000000 -0500 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -63517,9 +63517,9 @@ diff -urNp linux-3.0.8/kernel/gcov/base.c linux-3.0.8/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-3.0.8/kernel/hrtimer.c linux-3.0.8/kernel/hrtimer.c ---- linux-3.0.8/kernel/hrtimer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/hrtimer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/hrtimer.c linux-3.0.9/kernel/hrtimer.c +--- linux-3.0.9/kernel/hrtimer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/hrtimer.c 2011-11-12 12:47:14.000000000 -0500 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void) local_irq_restore(flags); } @@ -63529,9 +63529,9 @@ diff -urNp linux-3.0.8/kernel/hrtimer.c linux-3.0.8/kernel/hrtimer.c { hrtimer_peek_ahead_timers(); } -diff -urNp linux-3.0.8/kernel/jump_label.c linux-3.0.8/kernel/jump_label.c ---- linux-3.0.8/kernel/jump_label.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/jump_label.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/jump_label.c linux-3.0.9/kernel/jump_label.c +--- linux-3.0.9/kernel/jump_label.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/jump_label.c 2011-11-12 12:47:14.000000000 -0500 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr size = (((unsigned long)stop - (unsigned long)start) @@ -63555,9 +63555,9 @@ diff -urNp linux-3.0.8/kernel/jump_label.c linux-3.0.8/kernel/jump_label.c } static int -diff -urNp linux-3.0.8/kernel/kallsyms.c linux-3.0.8/kernel/kallsyms.c ---- linux-3.0.8/kernel/kallsyms.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/kallsyms.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/kallsyms.c linux-3.0.9/kernel/kallsyms.c +--- linux-3.0.9/kernel/kallsyms.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/kallsyms.c 2011-11-12 12:47:14.000000000 -0500 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -63660,9 +63660,9 @@ diff -urNp linux-3.0.8/kernel/kallsyms.c linux-3.0.8/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-3.0.8/kernel/kexec.c linux-3.0.8/kernel/kexec.c ---- linux-3.0.8/kernel/kexec.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/kexec.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/kexec.c linux-3.0.9/kernel/kexec.c +--- linux-3.0.9/kernel/kexec.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/kexec.c 2011-11-12 12:47:14.000000000 -0500 @@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un unsigned long flags) { @@ -63673,9 +63673,9 @@ diff -urNp linux-3.0.8/kernel/kexec.c linux-3.0.8/kernel/kexec.c unsigned long i, result; /* Don't allow clients that don't understand the native -diff -urNp linux-3.0.8/kernel/kmod.c linux-3.0.8/kernel/kmod.c ---- linux-3.0.8/kernel/kmod.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/kmod.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/kmod.c linux-3.0.9/kernel/kmod.c +--- linux-3.0.9/kernel/kmod.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/kmod.c 2011-11-12 12:47:14.000000000 -0500 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb * If module auto-loading support is disabled then this function * becomes a no-operation. @@ -63724,7 +63724,7 @@ diff -urNp linux-3.0.8/kernel/kmod.c linux-3.0.8/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -@@ -131,6 +142,47 @@ int __request_module(bool wait, const ch +@@ -133,6 +144,47 @@ int __request_module(bool wait, const ch atomic_dec(&kmod_concurrent); return ret; } @@ -63772,7 +63772,7 @@ diff -urNp linux-3.0.8/kernel/kmod.c linux-3.0.8/kernel/kmod.c EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ -@@ -220,7 +272,7 @@ static int wait_for_helper(void *data) +@@ -222,7 +274,7 @@ static int wait_for_helper(void *data) * * Thus the __user pointer cast is valid here. */ @@ -63781,9 +63781,9 @@ diff -urNp linux-3.0.8/kernel/kmod.c linux-3.0.8/kernel/kmod.c /* * If ret is 0, either ____call_usermodehelper failed and the -diff -urNp linux-3.0.8/kernel/kprobes.c linux-3.0.8/kernel/kprobes.c ---- linux-3.0.8/kernel/kprobes.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/kprobes.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/kprobes.c linux-3.0.9/kernel/kprobes.c +--- linux-3.0.9/kernel/kprobes.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/kprobes.c 2011-11-12 12:47:14.000000000 -0500 @@ -185,7 +185,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. @@ -63820,9 +63820,9 @@ diff -urNp linux-3.0.8/kernel/kprobes.c linux-3.0.8/kernel/kprobes.c head = &kprobe_table[i]; preempt_disable(); -diff -urNp linux-3.0.8/kernel/lockdep.c linux-3.0.8/kernel/lockdep.c ---- linux-3.0.8/kernel/lockdep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/lockdep.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/lockdep.c linux-3.0.9/kernel/lockdep.c +--- linux-3.0.9/kernel/lockdep.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/lockdep.c 2011-11-12 12:47:14.000000000 -0500 @@ -583,6 +583,10 @@ static int static_obj(void *obj) end = (unsigned long) &_end, addr = (unsigned long) obj; @@ -63851,9 +63851,9 @@ diff -urNp linux-3.0.8/kernel/lockdep.c linux-3.0.8/kernel/lockdep.c if (very_verbose(class)) { printk("\nacquire class [%p] %s", class->key, class->name); if (class->name_version > 1) -diff -urNp linux-3.0.8/kernel/lockdep_proc.c linux-3.0.8/kernel/lockdep_proc.c ---- linux-3.0.8/kernel/lockdep_proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/lockdep_proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/lockdep_proc.c linux-3.0.9/kernel/lockdep_proc.c +--- linux-3.0.9/kernel/lockdep_proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/lockdep_proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -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) @@ -63863,9 +63863,9 @@ diff -urNp linux-3.0.8/kernel/lockdep_proc.c linux-3.0.8/kernel/lockdep_proc.c const char *name = class->name; if (!name) { -diff -urNp linux-3.0.8/kernel/module.c linux-3.0.8/kernel/module.c ---- linux-3.0.8/kernel/module.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/module.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/module.c linux-3.0.9/kernel/module.c +--- linux-3.0.9/kernel/module.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/module.c 2011-11-12 12:47:14.000000000 -0500 @@ -58,6 +58,7 @@ #include <linux/jump_label.h> #include <linux/pfn.h> @@ -64594,9 +64594,9 @@ diff -urNp linux-3.0.8/kernel/module.c linux-3.0.8/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-3.0.8/kernel/mutex.c linux-3.0.8/kernel/mutex.c ---- linux-3.0.8/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/mutex.c linux-3.0.9/kernel/mutex.c +--- linux-3.0.9/kernel/mutex.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/mutex.c 2011-11-12 12:47:14.000000000 -0500 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, spin_lock_mutex(&lock->wait_lock, flags); @@ -64625,9 +64625,9 @@ diff -urNp linux-3.0.8/kernel/mutex.c linux-3.0.8/kernel/mutex.c mutex_set_owner(lock); /* set it to 0 if there are no waiters left: */ -diff -urNp linux-3.0.8/kernel/mutex-debug.c linux-3.0.8/kernel/mutex-debug.c ---- linux-3.0.8/kernel/mutex-debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/mutex-debug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/mutex-debug.c linux-3.0.9/kernel/mutex-debug.c +--- linux-3.0.9/kernel/mutex-debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/mutex-debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute } @@ -64656,9 +64656,9 @@ diff -urNp linux-3.0.8/kernel/mutex-debug.c linux-3.0.8/kernel/mutex-debug.c list_del_init(&waiter->list); waiter->task = NULL; -diff -urNp linux-3.0.8/kernel/mutex-debug.h linux-3.0.8/kernel/mutex-debug.h ---- linux-3.0.8/kernel/mutex-debug.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/mutex-debug.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/mutex-debug.h linux-3.0.9/kernel/mutex-debug.h +--- linux-3.0.9/kernel/mutex-debug.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/mutex-debug.h 2011-11-12 12:47:14.000000000 -0500 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, @@ -64671,9 +64671,9 @@ diff -urNp linux-3.0.8/kernel/mutex-debug.h linux-3.0.8/kernel/mutex-debug.h extern void debug_mutex_unlock(struct mutex *lock); extern void debug_mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key); -diff -urNp linux-3.0.8/kernel/padata.c linux-3.0.8/kernel/padata.c ---- linux-3.0.8/kernel/padata.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/padata.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/padata.c linux-3.0.9/kernel/padata.c +--- linux-3.0.9/kernel/padata.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/padata.c 2011-11-12 12:47:14.000000000 -0500 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins padata->pd = pd; padata->cb_cpu = cb_cpu; @@ -64697,9 +64697,9 @@ diff -urNp linux-3.0.8/kernel/padata.c linux-3.0.8/kernel/padata.c atomic_set(&pd->reorder_objects, 0); atomic_set(&pd->refcnt, 0); pd->pinst = pinst; -diff -urNp linux-3.0.8/kernel/panic.c linux-3.0.8/kernel/panic.c ---- linux-3.0.8/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/panic.c linux-3.0.9/kernel/panic.c +--- linux-3.0.9/kernel/panic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/panic.c 2011-11-12 12:47:14.000000000 -0500 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c const char *board; @@ -64719,9 +64719,9 @@ diff -urNp linux-3.0.8/kernel/panic.c linux-3.0.8/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-3.0.8/kernel/pid.c linux-3.0.8/kernel/pid.c ---- linux-3.0.8/kernel/pid.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/pid.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/pid.c linux-3.0.9/kernel/pid.c +--- linux-3.0.9/kernel/pid.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/pid.c 2011-11-12 12:47:14.000000000 -0500 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -64769,9 +64769,9 @@ diff -urNp linux-3.0.8/kernel/pid.c linux-3.0.8/kernel/pid.c struct pid *get_task_pid(struct task_struct *task, enum pid_type type) { struct pid *pid; -diff -urNp linux-3.0.8/kernel/posix-cpu-timers.c linux-3.0.8/kernel/posix-cpu-timers.c ---- linux-3.0.8/kernel/posix-cpu-timers.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/kernel/posix-cpu-timers.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/kernel/posix-cpu-timers.c linux-3.0.9/kernel/posix-cpu-timers.c +--- linux-3.0.9/kernel/posix-cpu-timers.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/posix-cpu-timers.c 2011-11-12 12:47:14.000000000 -0500 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -64797,9 +64797,9 @@ diff -urNp linux-3.0.8/kernel/posix-cpu-timers.c linux-3.0.8/kernel/posix-cpu-ti .clock_getres = thread_cpu_clock_getres, .clock_get = thread_cpu_clock_get, .timer_create = thread_cpu_timer_create, -diff -urNp linux-3.0.8/kernel/posix-timers.c linux-3.0.8/kernel/posix-timers.c ---- linux-3.0.8/kernel/posix-timers.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/posix-timers.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/posix-timers.c linux-3.0.9/kernel/posix-timers.c +--- linux-3.0.9/kernel/posix-timers.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/posix-timers.c 2011-11-12 12:47:14.000000000 -0500 @@ -43,6 +43,7 @@ #include <linux/idr.h> #include <linux/posix-clock.h> @@ -64903,9 +64903,9 @@ diff -urNp linux-3.0.8/kernel/posix-timers.c linux-3.0.8/kernel/posix-timers.c return kc->clock_set(which_clock, &new_tp); } -diff -urNp linux-3.0.8/kernel/power/poweroff.c linux-3.0.8/kernel/power/poweroff.c ---- linux-3.0.8/kernel/power/poweroff.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/power/poweroff.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/power/poweroff.c linux-3.0.9/kernel/power/poweroff.c +--- linux-3.0.9/kernel/power/poweroff.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/power/poweroff.c 2011-11-12 12:47:14.000000000 -0500 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -64915,9 +64915,9 @@ diff -urNp linux-3.0.8/kernel/power/poweroff.c linux-3.0.8/kernel/power/poweroff { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-3.0.8/kernel/power/process.c linux-3.0.8/kernel/power/process.c ---- linux-3.0.8/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/power/process.c linux-3.0.9/kernel/power/process.c +--- linux-3.0.9/kernel/power/process.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/power/process.c 2011-11-12 12:47:14.000000000 -0500 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_ u64 elapsed_csecs64; unsigned int elapsed_csecs; @@ -64960,9 +64960,9 @@ diff -urNp linux-3.0.8/kernel/power/process.c linux-3.0.8/kernel/power/process.c break; if (pm_wakeup_pending()) { -diff -urNp linux-3.0.8/kernel/printk.c linux-3.0.8/kernel/printk.c ---- linux-3.0.8/kernel/printk.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/kernel/printk.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/kernel/printk.c linux-3.0.9/kernel/printk.c +--- linux-3.0.9/kernel/printk.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/printk.c 2011-11-12 12:47:14.000000000 -0500 @@ -313,12 +313,17 @@ static int check_syslog_permissions(int if (from_file && type != SYSLOG_ACTION_OPEN) return 0; @@ -64982,9 +64982,9 @@ diff -urNp linux-3.0.8/kernel/printk.c linux-3.0.8/kernel/printk.c "but no CAP_SYSLOG (deprecated).\n"); return 0; } -diff -urNp linux-3.0.8/kernel/profile.c linux-3.0.8/kernel/profile.c ---- linux-3.0.8/kernel/profile.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/profile.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/profile.c linux-3.0.9/kernel/profile.c +--- linux-3.0.9/kernel/profile.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/profile.c 2011-11-12 12:47:14.000000000 -0500 @@ -39,7 +39,7 @@ struct profile_hit { /* Oprofile timer tick hook */ static int (*timer_hook)(struct pt_regs *) __read_mostly; @@ -65042,9 +65042,9 @@ diff -urNp linux-3.0.8/kernel/profile.c linux-3.0.8/kernel/profile.c return count; } -diff -urNp linux-3.0.8/kernel/ptrace.c linux-3.0.8/kernel/ptrace.c ---- linux-3.0.8/kernel/ptrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/ptrace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/ptrace.c linux-3.0.9/kernel/ptrace.c +--- linux-3.0.9/kernel/ptrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/ptrace.c 2011-11-12 12:47:14.000000000 -0500 @@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru return ret; } @@ -65216,9 +65216,9 @@ diff -urNp linux-3.0.8/kernel/ptrace.c linux-3.0.8/kernel/ptrace.c goto out_put_task_struct; } -diff -urNp linux-3.0.8/kernel/rcutorture.c linux-3.0.8/kernel/rcutorture.c ---- linux-3.0.8/kernel/rcutorture.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/rcutorture.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/rcutorture.c linux-3.0.9/kernel/rcutorture.c +--- linux-3.0.9/kernel/rcutorture.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/rcutorture.c 2011-11-12 12:47:14.000000000 -0500 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_ { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = @@ -65379,9 +65379,9 @@ diff -urNp linux-3.0.8/kernel/rcutorture.c linux-3.0.8/kernel/rcutorture.c for_each_possible_cpu(cpu) { for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; -diff -urNp linux-3.0.8/kernel/rcutree.c linux-3.0.8/kernel/rcutree.c ---- linux-3.0.8/kernel/rcutree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/rcutree.c 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.9/kernel/rcutree.c linux-3.0.9/kernel/rcutree.c +--- linux-3.0.9/kernel/rcutree.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/rcutree.c 2011-11-12 12:47:14.000000000 -0500 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void) } /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */ @@ -65464,9 +65464,9 @@ diff -urNp linux-3.0.8/kernel/rcutree.c linux-3.0.8/kernel/rcutree.c { __rcu_process_callbacks(&rcu_sched_state, &__get_cpu_var(rcu_sched_data)); -diff -urNp linux-3.0.8/kernel/rcutree.h linux-3.0.8/kernel/rcutree.h ---- linux-3.0.8/kernel/rcutree.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/rcutree.h 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.9/kernel/rcutree.h linux-3.0.9/kernel/rcutree.h +--- linux-3.0.9/kernel/rcutree.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/rcutree.h 2011-11-12 12:47:14.000000000 -0500 @@ -86,7 +86,7 @@ struct rcu_dynticks { int dynticks_nesting; /* Track irq/process nesting level. */ @@ -65476,9 +65476,9 @@ diff -urNp linux-3.0.8/kernel/rcutree.h linux-3.0.8/kernel/rcutree.h }; /* RCU's kthread states for tracing. */ -diff -urNp linux-3.0.8/kernel/rcutree_plugin.h linux-3.0.8/kernel/rcutree_plugin.h ---- linux-3.0.8/kernel/rcutree_plugin.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/rcutree_plugin.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/rcutree_plugin.h linux-3.0.9/kernel/rcutree_plugin.h +--- linux-3.0.9/kernel/rcutree_plugin.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/rcutree_plugin.h 2011-11-12 12:47:14.000000000 -0500 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void) /* Clean up and exit. */ @@ -65541,9 +65541,9 @@ diff -urNp linux-3.0.8/kernel/rcutree_plugin.h linux-3.0.8/kernel/rcutree_plugin put_online_cpus(); } -diff -urNp linux-3.0.8/kernel/relay.c linux-3.0.8/kernel/relay.c ---- linux-3.0.8/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/relay.c linux-3.0.9/kernel/relay.c +--- linux-3.0.9/kernel/relay.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/relay.c 2011-11-12 12:47:14.000000000 -0500 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc }; ssize_t ret; @@ -65553,9 +65553,9 @@ diff -urNp linux-3.0.8/kernel/relay.c linux-3.0.8/kernel/relay.c if (rbuf->subbufs_produced == rbuf->subbufs_consumed) return 0; if (splice_grow_spd(pipe, &spd)) -diff -urNp linux-3.0.8/kernel/resource.c linux-3.0.8/kernel/resource.c ---- linux-3.0.8/kernel/resource.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/resource.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/resource.c linux-3.0.9/kernel/resource.c +--- linux-3.0.9/kernel/resource.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/resource.c 2011-11-12 12:47:14.000000000 -0500 @@ -141,8 +141,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -65575,9 +65575,9 @@ diff -urNp linux-3.0.8/kernel/resource.c linux-3.0.8/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-3.0.8/kernel/rtmutex-tester.c linux-3.0.8/kernel/rtmutex-tester.c ---- linux-3.0.8/kernel/rtmutex-tester.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/rtmutex-tester.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/rtmutex-tester.c linux-3.0.9/kernel/rtmutex-tester.c +--- linux-3.0.9/kernel/rtmutex-tester.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/rtmutex-tester.c 2011-11-12 12:47:14.000000000 -0500 @@ -20,7 +20,7 @@ #define MAX_RT_TEST_MUTEXES 8 @@ -65668,9 +65668,9 @@ diff -urNp linux-3.0.8/kernel/rtmutex-tester.c linux-3.0.8/kernel/rtmutex-tester return; default: -diff -urNp linux-3.0.8/kernel/sched_autogroup.c linux-3.0.8/kernel/sched_autogroup.c ---- linux-3.0.8/kernel/sched_autogroup.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/sched_autogroup.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sched_autogroup.c linux-3.0.9/kernel/sched_autogroup.c +--- linux-3.0.9/kernel/sched_autogroup.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sched_autogroup.c 2011-11-12 12:47:14.000000000 -0500 @@ -7,7 +7,7 @@ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1; @@ -65689,9 +65689,9 @@ diff -urNp linux-3.0.8/kernel/sched_autogroup.c linux-3.0.8/kernel/sched_autogro ag->tg = tg; #ifdef CONFIG_RT_GROUP_SCHED /* -diff -urNp linux-3.0.8/kernel/sched.c linux-3.0.8/kernel/sched.c ---- linux-3.0.8/kernel/sched.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/kernel/sched.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sched.c linux-3.0.9/kernel/sched.c +--- linux-3.0.9/kernel/sched.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sched.c 2011-11-12 12:47:14.000000000 -0500 @@ -4227,6 +4227,8 @@ static void __sched __schedule(void) struct rq *rq; int cpu; @@ -65728,9 +65728,9 @@ diff -urNp linux-3.0.8/kernel/sched.c linux-3.0.8/kernel/sched.c /* can't set/change the rt policy */ if (policy != p->policy && !rlim_rtprio) return -EPERM; -diff -urNp linux-3.0.8/kernel/sched_fair.c linux-3.0.8/kernel/sched_fair.c ---- linux-3.0.8/kernel/sched_fair.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/sched_fair.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sched_fair.c linux-3.0.9/kernel/sched_fair.c +--- linux-3.0.9/kernel/sched_fair.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sched_fair.c 2011-11-12 12:47:14.000000000 -0500 @@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c * run_rebalance_domains is triggered when needed from the scheduler tick. * Also triggered for nohz idle balancing (with nohz_balancing_kick set). @@ -65740,9 +65740,9 @@ diff -urNp linux-3.0.8/kernel/sched_fair.c linux-3.0.8/kernel/sched_fair.c { int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); -diff -urNp linux-3.0.8/kernel/signal.c linux-3.0.8/kernel/signal.c ---- linux-3.0.8/kernel/signal.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/signal.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/signal.c linux-3.0.9/kernel/signal.c +--- linux-3.0.9/kernel/signal.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/signal.c 2011-11-12 12:47:14.000000000 -0500 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache int print_fatal_signals __read_mostly; @@ -65858,7 +65858,7 @@ diff -urNp linux-3.0.8/kernel/signal.c linux-3.0.8/kernel/signal.c BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP); memset(&info, 0, sizeof info); -@@ -2639,7 +2664,15 @@ do_send_specific(pid_t tgid, pid_t pid, +@@ -2637,7 +2662,15 @@ do_send_specific(pid_t tgid, pid_t pid, int error = -ESRCH; rcu_read_lock(); @@ -65875,9 +65875,9 @@ diff -urNp linux-3.0.8/kernel/signal.c linux-3.0.8/kernel/signal.c if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) { error = check_kill_permission(sig, info, p); /* -diff -urNp linux-3.0.8/kernel/smp.c linux-3.0.8/kernel/smp.c ---- linux-3.0.8/kernel/smp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/smp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/smp.c linux-3.0.9/kernel/smp.c +--- linux-3.0.9/kernel/smp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/smp.c 2011-11-12 12:47:14.000000000 -0500 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu } EXPORT_SYMBOL(smp_call_function); @@ -65905,9 +65905,9 @@ diff -urNp linux-3.0.8/kernel/smp.c linux-3.0.8/kernel/smp.c { raw_spin_unlock_irq(&call_function.lock); } -diff -urNp linux-3.0.8/kernel/softirq.c linux-3.0.8/kernel/softirq.c ---- linux-3.0.8/kernel/softirq.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/softirq.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/softirq.c linux-3.0.9/kernel/softirq.c +--- linux-3.0.9/kernel/softirq.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/softirq.c 2011-11-12 12:47:14.000000000 -0500 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -65958,9 +65958,9 @@ diff -urNp linux-3.0.8/kernel/softirq.c linux-3.0.8/kernel/softirq.c { struct tasklet_struct *list; -diff -urNp linux-3.0.8/kernel/sys.c linux-3.0.8/kernel/sys.c ---- linux-3.0.8/kernel/sys.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/kernel/sys.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sys.c linux-3.0.9/kernel/sys.c +--- linux-3.0.9/kernel/sys.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sys.c 2011-11-12 12:47:14.000000000 -0500 @@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -66130,9 +66130,9 @@ diff -urNp linux-3.0.8/kernel/sys.c linux-3.0.8/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-3.0.8/kernel/sysctl_binary.c linux-3.0.8/kernel/sysctl_binary.c ---- linux-3.0.8/kernel/sysctl_binary.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/sysctl_binary.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sysctl_binary.c linux-3.0.9/kernel/sysctl_binary.c +--- linux-3.0.9/kernel/sysctl_binary.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sysctl_binary.c 2011-11-12 12:47:14.000000000 -0500 @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f int i; @@ -66196,9 +66196,9 @@ diff -urNp linux-3.0.8/kernel/sysctl_binary.c linux-3.0.8/kernel/sysctl_binary.c set_fs(old_fs); if (result < 0) goto out; -diff -urNp linux-3.0.8/kernel/sysctl.c linux-3.0.8/kernel/sysctl.c ---- linux-3.0.8/kernel/sysctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/sysctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sysctl.c linux-3.0.9/kernel/sysctl.c +--- linux-3.0.9/kernel/sysctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sysctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -85,6 +85,13 @@ @@ -66388,9 +66388,9 @@ diff -urNp linux-3.0.8/kernel/sysctl.c linux-3.0.8/kernel/sysctl.c EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); -diff -urNp linux-3.0.8/kernel/sysctl_check.c linux-3.0.8/kernel/sysctl_check.c ---- linux-3.0.8/kernel/sysctl_check.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/sysctl_check.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/sysctl_check.c linux-3.0.9/kernel/sysctl_check.c +--- linux-3.0.9/kernel/sysctl_check.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/sysctl_check.c 2011-11-12 12:47:14.000000000 -0500 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n set_fail(&fail, table, "Directory with extra2"); } else { @@ -66399,9 +66399,9 @@ diff -urNp linux-3.0.8/kernel/sysctl_check.c linux-3.0.8/kernel/sysctl_check.c (table->proc_handler == proc_dointvec) || (table->proc_handler == proc_dointvec_minmax) || (table->proc_handler == proc_dointvec_jiffies) || -diff -urNp linux-3.0.8/kernel/taskstats.c linux-3.0.8/kernel/taskstats.c ---- linux-3.0.8/kernel/taskstats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/taskstats.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/taskstats.c linux-3.0.9/kernel/taskstats.c +--- linux-3.0.9/kernel/taskstats.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/taskstats.c 2011-11-12 12:47:14.000000000 -0500 @@ -27,9 +27,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -66425,9 +66425,9 @@ diff -urNp linux-3.0.8/kernel/taskstats.c linux-3.0.8/kernel/taskstats.c if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK]) return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) -diff -urNp linux-3.0.8/kernel/time/alarmtimer.c linux-3.0.8/kernel/time/alarmtimer.c ---- linux-3.0.8/kernel/time/alarmtimer.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/kernel/time/alarmtimer.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time/alarmtimer.c linux-3.0.9/kernel/time/alarmtimer.c +--- linux-3.0.9/kernel/time/alarmtimer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time/alarmtimer.c 2011-11-12 12:47:14.000000000 -0500 @@ -693,7 +693,7 @@ static int __init alarmtimer_init(void) { int error = 0; @@ -66437,9 +66437,9 @@ diff -urNp linux-3.0.8/kernel/time/alarmtimer.c linux-3.0.8/kernel/time/alarmtim .clock_getres = alarm_clock_getres, .clock_get = alarm_clock_get, .timer_create = alarm_timer_create, -diff -urNp linux-3.0.8/kernel/time/tick-broadcast.c linux-3.0.8/kernel/time/tick-broadcast.c ---- linux-3.0.8/kernel/time/tick-broadcast.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/time/tick-broadcast.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time/tick-broadcast.c linux-3.0.9/kernel/time/tick-broadcast.c +--- linux-3.0.9/kernel/time/tick-broadcast.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time/tick-broadcast.c 2011-11-12 12:47:14.000000000 -0500 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -66449,9 +66449,9 @@ diff -urNp linux-3.0.8/kernel/time/tick-broadcast.c linux-3.0.8/kernel/time/tick cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-3.0.8/kernel/time/timekeeping.c linux-3.0.8/kernel/time/timekeeping.c ---- linux-3.0.8/kernel/time/timekeeping.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/time/timekeeping.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time/timekeeping.c linux-3.0.9/kernel/time/timekeeping.c +--- linux-3.0.9/kernel/time/timekeeping.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time/timekeeping.c 2011-11-12 12:47:14.000000000 -0500 @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/mm.h> @@ -66469,9 +66469,9 @@ diff -urNp linux-3.0.8/kernel/time/timekeeping.c linux-3.0.8/kernel/time/timekee write_seqlock_irqsave(&xtime_lock, flags); timekeeping_forward_now(); -diff -urNp linux-3.0.8/kernel/time/timer_list.c linux-3.0.8/kernel/time/timer_list.c ---- linux-3.0.8/kernel/time/timer_list.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/time/timer_list.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time/timer_list.c linux-3.0.9/kernel/time/timer_list.c +--- linux-3.0.9/kernel/time/timer_list.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time/timer_list.c 2011-11-12 12:47:14.000000000 -0500 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, static void print_name_offset(struct seq_file *m, void *sym) @@ -66513,9 +66513,9 @@ diff -urNp linux-3.0.8/kernel/time/timer_list.c linux-3.0.8/kernel/time/timer_li if (!pe) return -ENOMEM; return 0; -diff -urNp linux-3.0.8/kernel/time/timer_stats.c linux-3.0.8/kernel/time/timer_stats.c ---- linux-3.0.8/kernel/time/timer_stats.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/time/timer_stats.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time/timer_stats.c linux-3.0.9/kernel/time/timer_stats.c +--- linux-3.0.9/kernel/time/timer_stats.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time/timer_stats.c 2011-11-12 12:47:14.000000000 -0500 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop; static unsigned long nr_entries; static struct entry entries[MAX_ENTRIES]; @@ -66584,9 +66584,9 @@ diff -urNp linux-3.0.8/kernel/time/timer_stats.c linux-3.0.8/kernel/time/timer_s if (!pe) return -ENOMEM; return 0; -diff -urNp linux-3.0.8/kernel/time.c linux-3.0.8/kernel/time.c ---- linux-3.0.8/kernel/time.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/time.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/time.c linux-3.0.9/kernel/time.c +--- linux-3.0.9/kernel/time.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/time.c 2011-11-12 12:47:14.000000000 -0500 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim return error; @@ -66599,9 +66599,9 @@ diff -urNp linux-3.0.8/kernel/time.c linux-3.0.8/kernel/time.c /* SMP safe, global irq locking makes it work. */ sys_tz = *tz; update_vsyscall_tz(); -diff -urNp linux-3.0.8/kernel/timer.c linux-3.0.8/kernel/timer.c ---- linux-3.0.8/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/timer.c linux-3.0.9/kernel/timer.c +--- linux-3.0.9/kernel/timer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/timer.c 2011-11-12 12:47:14.000000000 -0500 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick) /* * This function runs timers and the timer-tq in bottom half context. @@ -66611,9 +66611,9 @@ diff -urNp linux-3.0.8/kernel/timer.c linux-3.0.8/kernel/timer.c { struct tvec_base *base = __this_cpu_read(tvec_bases); -diff -urNp linux-3.0.8/kernel/trace/blktrace.c linux-3.0.8/kernel/trace/blktrace.c ---- linux-3.0.8/kernel/trace/blktrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/blktrace.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/blktrace.c linux-3.0.9/kernel/trace/blktrace.c +--- linux-3.0.9/kernel/trace/blktrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/blktrace.c 2011-11-12 12:47:14.000000000 -0500 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f struct blk_trace *bt = filp->private_data; char buf[16]; @@ -66641,9 +66641,9 @@ diff -urNp linux-3.0.8/kernel/trace/blktrace.c linux-3.0.8/kernel/trace/blktrace ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, -diff -urNp linux-3.0.8/kernel/trace/ftrace.c linux-3.0.8/kernel/trace/ftrace.c ---- linux-3.0.8/kernel/trace/ftrace.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/kernel/trace/ftrace.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/ftrace.c linux-3.0.9/kernel/trace/ftrace.c +--- linux-3.0.9/kernel/trace/ftrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/ftrace.c 2011-11-12 12:47:14.000000000 -0500 @@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, if (unlikely(ftrace_disabled)) return 0; @@ -66673,9 +66673,9 @@ diff -urNp linux-3.0.8/kernel/trace/ftrace.c linux-3.0.8/kernel/trace/ftrace.c { struct ftrace_func_probe *entry; struct ftrace_page *pg; -diff -urNp linux-3.0.8/kernel/trace/trace.c linux-3.0.8/kernel/trace/trace.c ---- linux-3.0.8/kernel/trace/trace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace.c linux-3.0.9/kernel/trace/trace.c +--- linux-3.0.9/kernel/trace/trace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace.c 2011-11-12 12:47:14.000000000 -0500 @@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe( size_t rem; unsigned int i; @@ -66718,9 +66718,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace.c linux-3.0.8/kernel/trace/trace.c static int once; struct dentry *d_tracer; -diff -urNp linux-3.0.8/kernel/trace/trace_events.c linux-3.0.8/kernel/trace/trace_events.c ---- linux-3.0.8/kernel/trace/trace_events.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_events.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_events.c linux-3.0.9/kernel/trace/trace_events.c +--- linux-3.0.9/kernel/trace/trace_events.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_events.c 2011-11-12 12:47:14.000000000 -0500 @@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list struct ftrace_module_file_ops { struct list_head list; @@ -66767,9 +66767,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_events.c linux-3.0.8/kernel/trace/trac } } -diff -urNp linux-3.0.8/kernel/trace/trace_kprobe.c linux-3.0.8/kernel/trace/trace_kprobe.c ---- linux-3.0.8/kernel/trace/trace_kprobe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_kprobe.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_kprobe.c linux-3.0.9/kernel/trace/trace_kprobe.c +--- linux-3.0.9/kernel/trace/trace_kprobe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_kprobe.c 2011-11-12 12:47:14.000000000 -0500 @@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me long ret; int maxlen = get_rloc_len(*(u32 *)dest); @@ -66806,9 +66806,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_kprobe.c linux-3.0.8/kernel/trace/trac len++; } while (c && ret == 0 && len < MAX_STRING_SIZE); pagefault_enable(); -diff -urNp linux-3.0.8/kernel/trace/trace_mmiotrace.c linux-3.0.8/kernel/trace/trace_mmiotrace.c ---- linux-3.0.8/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_mmiotrace.c linux-3.0.9/kernel/trace/trace_mmiotrace.c +--- linux-3.0.9/kernel/trace/trace_mmiotrace.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_mmiotrace.c 2011-11-12 12:47:14.000000000 -0500 @@ -24,7 +24,7 @@ struct header_iter { static struct trace_array *mmio_trace_array; static bool overrun_detected; @@ -66845,9 +66845,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_mmiotrace.c linux-3.0.8/kernel/trace/t return; } entry = ring_buffer_event_data(event); -diff -urNp linux-3.0.8/kernel/trace/trace_output.c linux-3.0.8/kernel/trace/trace_output.c ---- linux-3.0.8/kernel/trace/trace_output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_output.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_output.c linux-3.0.9/kernel/trace/trace_output.c +--- linux-3.0.9/kernel/trace/trace_output.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_output.c 2011-11-12 12:47:14.000000000 -0500 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); @@ -66857,9 +66857,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_output.c linux-3.0.8/kernel/trace/trac if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-3.0.8/kernel/trace/trace_stack.c linux-3.0.8/kernel/trace/trace_stack.c ---- linux-3.0.8/kernel/trace/trace_stack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_stack.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_stack.c linux-3.0.9/kernel/trace/trace_stack.c +--- linux-3.0.9/kernel/trace/trace_stack.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_stack.c 2011-11-12 12:47:14.000000000 -0500 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -66869,9 +66869,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_stack.c linux-3.0.8/kernel/trace/trace return; local_irq_save(flags); -diff -urNp linux-3.0.8/kernel/trace/trace_workqueue.c linux-3.0.8/kernel/trace/trace_workqueue.c ---- linux-3.0.8/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/kernel/trace/trace_workqueue.c linux-3.0.9/kernel/trace/trace_workqueue.c +--- linux-3.0.9/kernel/trace/trace_workqueue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/kernel/trace/trace_workqueue.c 2011-11-12 12:47:14.000000000 -0500 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats { int cpu; pid_t pid; @@ -66899,9 +66899,9 @@ diff -urNp linux-3.0.8/kernel/trace/trace_workqueue.c linux-3.0.8/kernel/trace/t tsk->comm); put_task_struct(tsk); } -diff -urNp linux-3.0.8/lib/bitmap.c linux-3.0.8/lib/bitmap.c ---- linux-3.0.8/lib/bitmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/bitmap.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/lib/bitmap.c linux-3.0.9/lib/bitmap.c +--- linux-3.0.9/lib/bitmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/bitmap.c 2011-11-12 12:47:14.000000000 -0500 @@ -421,7 +421,7 @@ int __bitmap_parse(const char *buf, unsi { int c, old_c, totaldigits, ndigits, nchunks, nbits; @@ -66938,9 +66938,9 @@ diff -urNp linux-3.0.8/lib/bitmap.c linux-3.0.8/lib/bitmap.c ulen, 1, maskp, nmaskbits); } EXPORT_SYMBOL(bitmap_parselist_user); -diff -urNp linux-3.0.8/lib/bug.c linux-3.0.8/lib/bug.c ---- linux-3.0.8/lib/bug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/bug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/bug.c linux-3.0.9/lib/bug.c +--- linux-3.0.9/lib/bug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/bug.c 2011-11-12 12:47:14.000000000 -0500 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -66950,9 +66950,9 @@ diff -urNp linux-3.0.8/lib/bug.c linux-3.0.8/lib/bug.c file = NULL; line = 0; -diff -urNp linux-3.0.8/lib/debugobjects.c linux-3.0.8/lib/debugobjects.c ---- linux-3.0.8/lib/debugobjects.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/debugobjects.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/debugobjects.c linux-3.0.9/lib/debugobjects.c +--- linux-3.0.9/lib/debugobjects.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/debugobjects.c 2011-11-12 12:47:14.000000000 -0500 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -66962,9 +66962,9 @@ diff -urNp linux-3.0.8/lib/debugobjects.c linux-3.0.8/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-3.0.8/lib/devres.c linux-3.0.8/lib/devres.c ---- linux-3.0.8/lib/devres.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/devres.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/lib/devres.c linux-3.0.9/lib/devres.c +--- linux-3.0.9/lib/devres.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/devres.c 2011-11-12 12:47:14.000000000 -0500 @@ -81,7 +81,7 @@ void devm_iounmap(struct device *dev, vo { iounmap(addr); @@ -66983,9 +66983,9 @@ diff -urNp linux-3.0.8/lib/devres.c linux-3.0.8/lib/devres.c } EXPORT_SYMBOL(devm_ioport_unmap); -diff -urNp linux-3.0.8/lib/dma-debug.c linux-3.0.8/lib/dma-debug.c ---- linux-3.0.8/lib/dma-debug.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/dma-debug.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/dma-debug.c linux-3.0.9/lib/dma-debug.c +--- linux-3.0.9/lib/dma-debug.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/dma-debug.c 2011-11-12 12:47:14.000000000 -0500 @@ -870,7 +870,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -66995,9 +66995,9 @@ diff -urNp linux-3.0.8/lib/dma-debug.c linux-3.0.8/lib/dma-debug.c err_printk(dev, NULL, "DMA-API: device driver maps memory from" "stack [addr=%p]\n", addr); } -diff -urNp linux-3.0.8/lib/extable.c linux-3.0.8/lib/extable.c ---- linux-3.0.8/lib/extable.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/extable.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/extable.c linux-3.0.9/lib/extable.c +--- linux-3.0.9/lib/extable.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/extable.c 2011-11-12 12:47:14.000000000 -0500 @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/sort.h> @@ -67017,9 +67017,9 @@ diff -urNp linux-3.0.8/lib/extable.c linux-3.0.8/lib/extable.c } #ifdef CONFIG_MODULES -diff -urNp linux-3.0.8/lib/inflate.c linux-3.0.8/lib/inflate.c ---- linux-3.0.8/lib/inflate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/inflate.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/inflate.c linux-3.0.9/lib/inflate.c +--- linux-3.0.9/lib/inflate.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/inflate.c 2011-11-12 12:47:14.000000000 -0500 @@ -269,7 +269,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -67029,9 +67029,9 @@ diff -urNp linux-3.0.8/lib/inflate.c linux-3.0.8/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-3.0.8/lib/Kconfig.debug linux-3.0.8/lib/Kconfig.debug ---- linux-3.0.8/lib/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/Kconfig.debug 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/lib/Kconfig.debug linux-3.0.9/lib/Kconfig.debug +--- linux-3.0.9/lib/Kconfig.debug 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/Kconfig.debug 2011-11-12 12:47:14.000000000 -0500 @@ -1088,6 +1088,7 @@ config LATENCYTOP depends on DEBUG_KERNEL depends on STACKTRACE_SUPPORT @@ -67040,9 +67040,9 @@ diff -urNp linux-3.0.8/lib/Kconfig.debug linux-3.0.8/lib/Kconfig.debug select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE select KALLSYMS select KALLSYMS_ALL -diff -urNp linux-3.0.8/lib/kref.c linux-3.0.8/lib/kref.c ---- linux-3.0.8/lib/kref.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/kref.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/kref.c linux-3.0.9/lib/kref.c +--- linux-3.0.9/lib/kref.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/kref.c 2011-11-12 12:47:14.000000000 -0500 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref) */ int kref_put(struct kref *kref, void (*release)(struct kref *kref)) @@ -67052,9 +67052,9 @@ diff -urNp linux-3.0.8/lib/kref.c linux-3.0.8/lib/kref.c WARN_ON(release == (void (*)(struct kref *))kfree); if (atomic_dec_and_test(&kref->refcount)) { -diff -urNp linux-3.0.8/lib/radix-tree.c linux-3.0.8/lib/radix-tree.c ---- linux-3.0.8/lib/radix-tree.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/radix-tree.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/lib/radix-tree.c linux-3.0.9/lib/radix-tree.c +--- linux-3.0.9/lib/radix-tree.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/radix-tree.c 2011-11-12 12:47:14.000000000 -0500 @@ -80,7 +80,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -67064,9 +67064,9 @@ diff -urNp linux-3.0.8/lib/radix-tree.c linux-3.0.8/lib/radix-tree.c static inline void *ptr_to_indirect(void *ptr) { -diff -urNp linux-3.0.8/lib/vsprintf.c linux-3.0.8/lib/vsprintf.c ---- linux-3.0.8/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/lib/vsprintf.c linux-3.0.9/lib/vsprintf.c +--- linux-3.0.9/lib/vsprintf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/lib/vsprintf.c 2011-11-12 12:47:14.000000000 -0500 @@ -16,6 +16,9 @@ * - scnprintf and vscnprintf */ @@ -67160,14 +67160,14 @@ diff -urNp linux-3.0.8/lib/vsprintf.c linux-3.0.8/lib/vsprintf.c break; } -diff -urNp linux-3.0.8/localversion-grsec linux-3.0.8/localversion-grsec ---- linux-3.0.8/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/localversion-grsec 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/localversion-grsec linux-3.0.9/localversion-grsec +--- linux-3.0.9/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/localversion-grsec 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-3.0.8/Makefile linux-3.0.8/Makefile ---- linux-3.0.8/Makefile 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/Makefile 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/Makefile linux-3.0.9/Makefile +--- linux-3.0.9/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/Makefile 2011-11-12 12:47:14.000000000 -0500 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -67349,9 +67349,9 @@ diff -urNp linux-3.0.8/Makefile linux-3.0.8/Makefile $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) $(@:.ko=.o) -diff -urNp linux-3.0.8/mm/filemap.c linux-3.0.8/mm/filemap.c ---- linux-3.0.8/mm/filemap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/filemap.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/filemap.c linux-3.0.9/mm/filemap.c +--- linux-3.0.9/mm/filemap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/filemap.c 2011-11-12 12:47:14.000000000 -0500 @@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -67369,9 +67369,9 @@ diff -urNp linux-3.0.8/mm/filemap.c linux-3.0.8/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-3.0.8/mm/fremap.c linux-3.0.8/mm/fremap.c ---- linux-3.0.8/mm/fremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/fremap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/fremap.c linux-3.0.9/mm/fremap.c +--- linux-3.0.9/mm/fremap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/fremap.c 2011-11-12 12:47:14.000000000 -0500 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -67384,9 +67384,9 @@ diff -urNp linux-3.0.8/mm/fremap.c linux-3.0.8/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-3.0.8/mm/highmem.c linux-3.0.8/mm/highmem.c ---- linux-3.0.8/mm/highmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/highmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/highmem.c linux-3.0.9/mm/highmem.c +--- linux-3.0.9/mm/highmem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/highmem.c 2011-11-12 12:47:14.000000000 -0500 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -67412,9 +67412,9 @@ diff -urNp linux-3.0.8/mm/highmem.c linux-3.0.8/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-3.0.8/mm/huge_memory.c linux-3.0.8/mm/huge_memory.c ---- linux-3.0.8/mm/huge_memory.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/huge_memory.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/huge_memory.c linux-3.0.9/mm/huge_memory.c +--- linux-3.0.9/mm/huge_memory.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/huge_memory.c 2011-11-12 12:47:14.000000000 -0500 @@ -702,7 +702,7 @@ out: * run pte_offset_map on the pmd, if an huge pmd could * materialize from under us from a different thread. @@ -67424,9 +67424,9 @@ diff -urNp linux-3.0.8/mm/huge_memory.c linux-3.0.8/mm/huge_memory.c return VM_FAULT_OOM; /* if an huge pmd materialized from under us just retry later */ if (unlikely(pmd_trans_huge(*pmd))) -diff -urNp linux-3.0.8/mm/hugetlb.c linux-3.0.8/mm/hugetlb.c ---- linux-3.0.8/mm/hugetlb.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/hugetlb.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/hugetlb.c linux-3.0.9/mm/hugetlb.c +--- linux-3.0.9/mm/hugetlb.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/hugetlb.c 2011-11-12 12:47:14.000000000 -0500 @@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -67516,10 +67516,10 @@ diff -urNp linux-3.0.8/mm/hugetlb.c linux-3.0.8/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-3.0.8/mm/internal.h linux-3.0.8/mm/internal.h ---- linux-3.0.8/mm/internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/internal.h 2011-08-23 21:47:56.000000000 -0400 -@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page +diff -urNp linux-3.0.9/mm/internal.h linux-3.0.9/mm/internal.h +--- linux-3.0.9/mm/internal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/internal.h 2011-11-12 12:47:14.000000000 -0500 +@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page * in mm/page_alloc.c */ extern void __free_pages_bootmem(struct page *page, unsigned int order); @@ -67527,9 +67527,9 @@ diff -urNp linux-3.0.8/mm/internal.h linux-3.0.8/mm/internal.h extern void prep_compound_page(struct page *page, unsigned long order); #ifdef CONFIG_MEMORY_FAILURE extern bool is_free_buddy_page(struct page *page); -diff -urNp linux-3.0.8/mm/Kconfig linux-3.0.8/mm/Kconfig ---- linux-3.0.8/mm/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/Kconfig linux-3.0.9/mm/Kconfig +--- linux-3.0.9/mm/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -240,7 +240,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -67539,9 +67539,9 @@ diff -urNp linux-3.0.8/mm/Kconfig linux-3.0.8/mm/Kconfig help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages -diff -urNp linux-3.0.8/mm/kmemleak.c linux-3.0.8/mm/kmemleak.c ---- linux-3.0.8/mm/kmemleak.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/kmemleak.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/kmemleak.c linux-3.0.9/mm/kmemleak.c +--- linux-3.0.9/mm/kmemleak.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/kmemleak.c 2011-11-12 12:47:14.000000000 -0500 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se for (i = 0; i < object->trace_len; i++) { @@ -67551,9 +67551,9 @@ diff -urNp linux-3.0.8/mm/kmemleak.c linux-3.0.8/mm/kmemleak.c } } -diff -urNp linux-3.0.8/mm/maccess.c linux-3.0.8/mm/maccess.c ---- linux-3.0.8/mm/maccess.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/maccess.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/mm/maccess.c linux-3.0.9/mm/maccess.c +--- linux-3.0.9/mm/maccess.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/maccess.c 2011-11-12 12:47:14.000000000 -0500 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons set_fs(KERNEL_DS); pagefault_disable(); @@ -67572,9 +67572,9 @@ diff -urNp linux-3.0.8/mm/maccess.c linux-3.0.8/mm/maccess.c pagefault_enable(); set_fs(old_fs); -diff -urNp linux-3.0.8/mm/madvise.c linux-3.0.8/mm/madvise.c ---- linux-3.0.8/mm/madvise.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/madvise.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/madvise.c linux-3.0.9/mm/madvise.c +--- linux-3.0.9/mm/madvise.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/madvise.c 2011-11-12 12:47:14.000000000 -0500 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -67651,9 +67651,9 @@ diff -urNp linux-3.0.8/mm/madvise.c linux-3.0.8/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-3.0.8/mm/memory.c linux-3.0.8/mm/memory.c ---- linux-3.0.8/mm/memory.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/mm/memory.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/memory.c linux-3.0.9/mm/memory.c +--- linux-3.0.9/mm/memory.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/memory.c 2011-11-12 12:47:14.000000000 -0500 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct return; @@ -68217,9 +68217,9 @@ diff -urNp linux-3.0.8/mm/memory.c linux-3.0.8/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-3.0.8/mm/memory-failure.c linux-3.0.8/mm/memory-failure.c ---- linux-3.0.8/mm/memory-failure.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/memory-failure.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/mm/memory-failure.c linux-3.0.9/mm/memory-failure.c +--- linux-3.0.9/mm/memory-failure.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/memory-failure.c 2011-11-12 12:47:14.000000000 -0500 @@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -68301,9 +68301,9 @@ diff -urNp linux-3.0.8/mm/memory-failure.c linux-3.0.8/mm/memory-failure.c SetPageHWPoison(page); /* keep elevated page count for bad page */ return ret; -diff -urNp linux-3.0.8/mm/mempolicy.c linux-3.0.8/mm/mempolicy.c ---- linux-3.0.8/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c +--- linux-3.0.9/mm/mempolicy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/mempolicy.c 2011-11-12 12:47:14.000000000 -0500 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct unsigned long vmstart; unsigned long vmend; @@ -68375,9 +68375,9 @@ diff -urNp linux-3.0.8/mm/mempolicy.c linux-3.0.8/mm/mempolicy.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-3.0.8/mm/migrate.c linux-3.0.8/mm/migrate.c ---- linux-3.0.8/mm/migrate.c 2011-10-25 09:10:33.000000000 -0400 -+++ linux-3.0.8/mm/migrate.c 2011-10-25 09:10:41.000000000 -0400 +diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c +--- linux-3.0.9/mm/migrate.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/migrate.c 2011-11-12 12:47:14.000000000 -0500 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc unsigned long chunk_start; int err; @@ -68412,9 +68412,9 @@ diff -urNp linux-3.0.8/mm/migrate.c linux-3.0.8/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-3.0.8/mm/mlock.c linux-3.0.8/mm/mlock.c ---- linux-3.0.8/mm/mlock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/mlock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/mlock.c linux-3.0.9/mm/mlock.c +--- linux-3.0.9/mm/mlock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/mlock.c 2011-11-12 12:47:14.000000000 -0500 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -68488,9 +68488,9 @@ diff -urNp linux-3.0.8/mm/mlock.c linux-3.0.8/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-3.0.8/mm/mmap.c linux-3.0.8/mm/mmap.c ---- linux-3.0.8/mm/mmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/mmap.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/mmap.c linux-3.0.9/mm/mmap.c +--- linux-3.0.9/mm/mmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/mmap.c 2011-11-12 12:47:14.000000000 -0500 @@ -46,6 +46,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -69749,9 +69749,9 @@ diff -urNp linux-3.0.8/mm/mmap.c linux-3.0.8/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-3.0.8/mm/mprotect.c linux-3.0.8/mm/mprotect.c ---- linux-3.0.8/mm/mprotect.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/mprotect.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/mprotect.c linux-3.0.9/mm/mprotect.c +--- linux-3.0.9/mm/mprotect.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/mprotect.c 2011-11-12 12:47:14.000000000 -0500 @@ -23,10 +23,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -69978,9 +69978,9 @@ diff -urNp linux-3.0.8/mm/mprotect.c linux-3.0.8/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-3.0.8/mm/mremap.c linux-3.0.8/mm/mremap.c ---- linux-3.0.8/mm/mremap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/mremap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/mremap.c linux-3.0.9/mm/mremap.c +--- linux-3.0.9/mm/mremap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/mremap.c 2011-11-12 12:47:14.000000000 -0500 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -70085,9 +70085,9 @@ diff -urNp linux-3.0.8/mm/mremap.c linux-3.0.8/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-3.0.8/mm/nobootmem.c linux-3.0.8/mm/nobootmem.c ---- linux-3.0.8/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/nobootmem.c linux-3.0.9/mm/nobootmem.c +--- linux-3.0.9/mm/nobootmem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/nobootmem.c 2011-11-12 12:47:14.000000000 -0500 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u unsigned long __init free_all_memory_core_early(int nodeid) { @@ -70121,9 +70121,9 @@ diff -urNp linux-3.0.8/mm/nobootmem.c linux-3.0.8/mm/nobootmem.c return count; } -diff -urNp linux-3.0.8/mm/nommu.c linux-3.0.8/mm/nommu.c ---- linux-3.0.8/mm/nommu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/nommu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/nommu.c linux-3.0.9/mm/nommu.c +--- linux-3.0.9/mm/nommu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/nommu.c 2011-11-12 12:47:14.000000000 -0500 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; @@ -70156,9 +70156,9 @@ diff -urNp linux-3.0.8/mm/nommu.c linux-3.0.8/mm/nommu.c *region = *vma->vm_region; new->vm_region = region; -diff -urNp linux-3.0.8/mm/page_alloc.c linux-3.0.8/mm/page_alloc.c ---- linux-3.0.8/mm/page_alloc.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/mm/page_alloc.c 2011-10-25 09:15:11.000000000 -0400 +diff -urNp linux-3.0.9/mm/page_alloc.c linux-3.0.9/mm/page_alloc.c +--- linux-3.0.9/mm/page_alloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/page_alloc.c 2011-11-12 12:47:14.000000000 -0500 @@ -340,7 +340,7 @@ out: * This usage means that zero-order pages may not be compound. */ @@ -70226,9 +70226,9 @@ diff -urNp linux-3.0.8/mm/page_alloc.c linux-3.0.8/mm/page_alloc.c return 1; } return 0; -diff -urNp linux-3.0.8/mm/percpu.c linux-3.0.8/mm/percpu.c ---- linux-3.0.8/mm/percpu.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/percpu.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/percpu.c linux-3.0.9/mm/percpu.c +--- linux-3.0.9/mm/percpu.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/percpu.c 2011-11-12 12:47:14.000000000 -0500 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -70238,9 +70238,9 @@ diff -urNp linux-3.0.8/mm/percpu.c linux-3.0.8/mm/percpu.c EXPORT_SYMBOL_GPL(pcpu_base_addr); static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ -diff -urNp linux-3.0.8/mm/rmap.c linux-3.0.8/mm/rmap.c ---- linux-3.0.8/mm/rmap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/rmap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/rmap.c linux-3.0.9/mm/rmap.c +--- linux-3.0.9/mm/rmap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/rmap.c 2011-11-12 12:47:14.000000000 -0500 @@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru struct anon_vma *anon_vma = vma->anon_vma; struct anon_vma_chain *avc; @@ -70330,9 +70330,9 @@ diff -urNp linux-3.0.8/mm/rmap.c linux-3.0.8/mm/rmap.c { struct anon_vma_chain *avc; struct anon_vma *anon_vma; -diff -urNp linux-3.0.8/mm/shmem.c linux-3.0.8/mm/shmem.c ---- linux-3.0.8/mm/shmem.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/shmem.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/shmem.c linux-3.0.9/mm/shmem.c +--- linux-3.0.9/mm/shmem.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/shmem.c 2011-11-12 12:47:14.000000000 -0500 @@ -31,7 +31,7 @@ #include <linux/percpu_counter.h> #include <linux/swap.h> @@ -70370,9 +70370,9 @@ diff -urNp linux-3.0.8/mm/shmem.c linux-3.0.8/mm/shmem.c if (!sbinfo) return -ENOMEM; -diff -urNp linux-3.0.8/mm/slab.c linux-3.0.8/mm/slab.c ---- linux-3.0.8/mm/slab.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/slab.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/slab.c linux-3.0.9/mm/slab.c +--- linux-3.0.9/mm/slab.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/slab.c 2011-11-12 12:47:14.000000000 -0500 @@ -151,7 +151,7 @@ /* Legal flag mask for kmem_cache_create(). */ @@ -70544,9 +70544,9 @@ diff -urNp linux-3.0.8/mm/slab.c linux-3.0.8/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-3.0.8/mm/slob.c linux-3.0.8/mm/slob.c ---- linux-3.0.8/mm/slob.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/slob.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/slob.c linux-3.0.9/mm/slob.c +--- linux-3.0.9/mm/slob.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/slob.c 2011-11-12 12:47:14.000000000 -0500 @@ -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 @@ -70895,9 +70895,9 @@ diff -urNp linux-3.0.8/mm/slob.c linux-3.0.8/mm/slob.c } EXPORT_SYMBOL(kmem_cache_free); -diff -urNp linux-3.0.8/mm/slub.c linux-3.0.8/mm/slub.c ---- linux-3.0.8/mm/slub.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/slub.c 2011-09-25 22:15:40.000000000 -0400 +diff -urNp linux-3.0.9/mm/slub.c linux-3.0.9/mm/slub.c +--- linux-3.0.9/mm/slub.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/slub.c 2011-11-12 12:47:14.000000000 -0500 @@ -200,7 +200,7 @@ struct track { enum track_item { TRACK_ALLOC, TRACK_FREE }; @@ -71137,9 +71137,9 @@ diff -urNp linux-3.0.8/mm/slub.c linux-3.0.8/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-3.0.8/mm/swap.c linux-3.0.8/mm/swap.c ---- linux-3.0.8/mm/swap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/swap.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/swap.c linux-3.0.9/mm/swap.c +--- linux-3.0.9/mm/swap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/swap.c 2011-11-12 12:47:14.000000000 -0500 @@ -31,6 +31,7 @@ #include <linux/backing-dev.h> #include <linux/memcontrol.h> @@ -71157,9 +71157,9 @@ diff -urNp linux-3.0.8/mm/swap.c linux-3.0.8/mm/swap.c (*dtor)(page); } -diff -urNp linux-3.0.8/mm/swapfile.c linux-3.0.8/mm/swapfile.c ---- linux-3.0.8/mm/swapfile.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/swapfile.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/swapfile.c linux-3.0.9/mm/swapfile.c +--- linux-3.0.9/mm/swapfile.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/swapfile.c 2011-11-12 12:47:14.000000000 -0500 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex); static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait); @@ -71207,9 +71207,9 @@ diff -urNp linux-3.0.8/mm/swapfile.c linux-3.0.8/mm/swapfile.c wake_up_interruptible(&proc_poll_wait); if (S_ISREG(inode->i_mode)) -diff -urNp linux-3.0.8/mm/util.c linux-3.0.8/mm/util.c ---- linux-3.0.8/mm/util.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/util.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/mm/util.c linux-3.0.9/mm/util.c +--- linux-3.0.9/mm/util.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/util.c 2011-11-12 12:47:14.000000000 -0500 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user); * allocated buffer. Use this if you don't want to free the buffer immediately * like, for example, with RCU. @@ -71239,9 +71239,9 @@ diff -urNp linux-3.0.8/mm/util.c linux-3.0.8/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c ---- linux-3.0.8/mm/vmalloc.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/mm/vmalloc.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/mm/vmalloc.c linux-3.0.9/mm/vmalloc.c +--- linux-3.0.9/mm/vmalloc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/vmalloc.c 2011-11-12 13:03:49.000000000 -0500 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -71345,7 +71345,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c if (!pmd_none(*pmd)) { pte_t *ptep, pte; -@@ -1297,6 +1337,16 @@ static struct vm_struct *__get_vm_area_n +@@ -1308,6 +1348,16 @@ static struct vm_struct *__get_vm_area_n struct vm_struct *area; BUG_ON(in_interrupt()); @@ -71362,7 +71362,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1515,6 +1565,11 @@ void *vmap(struct page **pages, unsigned +@@ -1540,6 +1590,11 @@ void *vmap(struct page **pages, unsigned if (count > totalram_pages) return NULL; @@ -71374,7 +71374,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1616,6 +1671,13 @@ void *__vmalloc_node_range(unsigned long +@@ -1641,6 +1696,13 @@ void *__vmalloc_node_range(unsigned long if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; @@ -71385,10 +71385,10 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c + else +#endif + - area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node, - gfp_mask, caller); + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, + start, end, node, gfp_mask, caller); -@@ -1655,6 +1717,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1686,6 +1748,7 @@ static void *__vmalloc_node(unsigned lon gfp_mask, prot, node, caller); } @@ -71396,7 +71396,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, 1, gfp_mask, prot, -1, -@@ -1678,6 +1741,7 @@ static inline void *__vmalloc_node_flags +@@ -1709,6 +1772,7 @@ static inline void *__vmalloc_node_flags * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -71404,7 +71404,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vmalloc(unsigned long size) { return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM); -@@ -1694,6 +1758,7 @@ EXPORT_SYMBOL(vmalloc); +@@ -1725,6 +1789,7 @@ EXPORT_SYMBOL(vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -71412,7 +71412,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vzalloc(unsigned long size) { return __vmalloc_node_flags(size, -1, -@@ -1708,6 +1773,7 @@ EXPORT_SYMBOL(vzalloc); +@@ -1739,6 +1804,7 @@ EXPORT_SYMBOL(vzalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -71420,7 +71420,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1735,6 +1801,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1766,6 +1832,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -71428,7 +71428,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vmalloc_node(unsigned long size, int node) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1754,6 +1821,7 @@ EXPORT_SYMBOL(vmalloc_node); +@@ -1785,6 +1852,7 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc_node() instead. */ @@ -71436,7 +71436,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vzalloc_node(unsigned long size, int node) { return __vmalloc_node_flags(size, node, -@@ -1776,10 +1844,10 @@ EXPORT_SYMBOL(vzalloc_node); +@@ -1807,10 +1875,10 @@ EXPORT_SYMBOL(vzalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -71449,7 +71449,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c -1, __builtin_return_address(0)); } -@@ -1798,6 +1866,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1829,6 +1897,7 @@ void *vmalloc_exec(unsigned long size) * Allocate enough 32bit PA addressable pages to cover @size from the * page level allocator and map them into contiguous kernel virtual space. */ @@ -71457,7 +71457,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vmalloc_32(unsigned long size) { return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1812,6 +1881,7 @@ EXPORT_SYMBOL(vmalloc_32); +@@ -1843,6 +1912,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -71465,7 +71465,7 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -@@ -2074,6 +2144,8 @@ int remap_vmalloc_range(struct vm_area_s +@@ -2105,6 +2175,8 @@ int remap_vmalloc_range(struct vm_area_s unsigned long uaddr = vma->vm_start; unsigned long usize = vma->vm_end - vma->vm_start; @@ -71474,9 +71474,9 @@ diff -urNp linux-3.0.8/mm/vmalloc.c linux-3.0.8/mm/vmalloc.c if ((PAGE_SIZE-1) & (unsigned long)addr) return -EINVAL; -diff -urNp linux-3.0.8/mm/vmstat.c linux-3.0.8/mm/vmstat.c ---- linux-3.0.8/mm/vmstat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/mm/vmstat.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c +--- linux-3.0.9/mm/vmstat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/mm/vmstat.c 2011-11-12 12:47:14.000000000 -0500 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters @@ -71529,9 +71529,9 @@ diff -urNp linux-3.0.8/mm/vmstat.c linux-3.0.8/mm/vmstat.c #endif return 0; } -diff -urNp linux-3.0.8/net/8021q/vlan.c linux-3.0.8/net/8021q/vlan.c ---- linux-3.0.8/net/8021q/vlan.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/8021q/vlan.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/8021q/vlan.c linux-3.0.9/net/8021q/vlan.c +--- linux-3.0.9/net/8021q/vlan.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/8021q/vlan.c 2011-11-12 12:47:14.000000000 -0500 @@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net err = -EPERM; if (!capable(CAP_NET_ADMIN)) @@ -71542,9 +71542,9 @@ diff -urNp linux-3.0.8/net/8021q/vlan.c linux-3.0.8/net/8021q/vlan.c struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff -urNp linux-3.0.8/net/9p/trans_fd.c linux-3.0.8/net/9p/trans_fd.c ---- linux-3.0.8/net/9p/trans_fd.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/9p/trans_fd.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/9p/trans_fd.c linux-3.0.9/net/9p/trans_fd.c +--- linux-3.0.9/net/9p/trans_fd.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/9p/trans_fd.c 2011-11-12 12:47:14.000000000 -0500 @@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client oldfs = get_fs(); set_fs(get_ds()); @@ -71554,9 +71554,9 @@ diff -urNp linux-3.0.8/net/9p/trans_fd.c linux-3.0.8/net/9p/trans_fd.c set_fs(oldfs); if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) -diff -urNp linux-3.0.8/net/9p/trans_virtio.c linux-3.0.8/net/9p/trans_virtio.c ---- linux-3.0.8/net/9p/trans_virtio.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/9p/trans_virtio.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/9p/trans_virtio.c linux-3.0.9/net/9p/trans_virtio.c +--- linux-3.0.9/net/9p/trans_virtio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/9p/trans_virtio.c 2011-11-12 12:47:14.000000000 -0500 @@ -327,7 +327,7 @@ req_retry_pinned: } else { char *pbuf; @@ -71575,9 +71575,9 @@ diff -urNp linux-3.0.8/net/9p/trans_virtio.c linux-3.0.8/net/9p/trans_virtio.c else pbuf = req->tc->pkbuf; -diff -urNp linux-3.0.8/net/atm/atm_misc.c linux-3.0.8/net/atm/atm_misc.c ---- linux-3.0.8/net/atm/atm_misc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/atm_misc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/atm_misc.c linux-3.0.9/net/atm/atm_misc.c +--- linux-3.0.9/net/atm/atm_misc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/atm_misc.c 2011-11-12 12:47:14.000000000 -0500 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -71614,9 +71614,9 @@ diff -urNp linux-3.0.8/net/atm/atm_misc.c linux-3.0.8/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-3.0.8/net/atm/lec.h linux-3.0.8/net/atm/lec.h ---- linux-3.0.8/net/atm/lec.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/lec.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/lec.h linux-3.0.9/net/atm/lec.h +--- linux-3.0.9/net/atm/lec.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/lec.h 2011-11-12 12:47:14.000000000 -0500 @@ -48,7 +48,7 @@ struct lane2_ops { const u8 *tlvs, u32 sizeoftlvs); void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr, @@ -71626,9 +71626,9 @@ diff -urNp linux-3.0.8/net/atm/lec.h linux-3.0.8/net/atm/lec.h /* * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType -diff -urNp linux-3.0.8/net/atm/mpc.h linux-3.0.8/net/atm/mpc.h ---- linux-3.0.8/net/atm/mpc.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/mpc.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/mpc.h linux-3.0.9/net/atm/mpc.h +--- linux-3.0.9/net/atm/mpc.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/mpc.h 2011-11-12 12:47:14.000000000 -0500 @@ -33,7 +33,7 @@ struct mpoa_client { struct mpc_parameters parameters; /* parameters for this client */ @@ -71638,9 +71638,9 @@ diff -urNp linux-3.0.8/net/atm/mpc.h linux-3.0.8/net/atm/mpc.h }; -diff -urNp linux-3.0.8/net/atm/mpoa_caches.c linux-3.0.8/net/atm/mpoa_caches.c ---- linux-3.0.8/net/atm/mpoa_caches.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/mpoa_caches.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/mpoa_caches.c linux-3.0.9/net/atm/mpoa_caches.c +--- linux-3.0.9/net/atm/mpoa_caches.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/mpoa_caches.c 2011-11-12 12:47:14.000000000 -0500 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru struct timeval now; struct k_message msg; @@ -71650,9 +71650,9 @@ diff -urNp linux-3.0.8/net/atm/mpoa_caches.c linux-3.0.8/net/atm/mpoa_caches.c do_gettimeofday(&now); read_lock_bh(&client->ingress_lock); -diff -urNp linux-3.0.8/net/atm/proc.c linux-3.0.8/net/atm/proc.c ---- linux-3.0.8/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/proc.c linux-3.0.9/net/atm/proc.c +--- linux-3.0.9/net/atm/proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -71666,9 +71666,9 @@ diff -urNp linux-3.0.8/net/atm/proc.c linux-3.0.8/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-3.0.8/net/atm/resources.c linux-3.0.8/net/atm/resources.c ---- linux-3.0.8/net/atm/resources.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/atm/resources.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/atm/resources.c linux-3.0.9/net/atm/resources.c +--- linux-3.0.9/net/atm/resources.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/atm/resources.c 2011-11-12 12:47:14.000000000 -0500 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister); static void copy_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -71687,9 +71687,9 @@ diff -urNp linux-3.0.8/net/atm/resources.c linux-3.0.8/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-3.0.8/net/batman-adv/hard-interface.c linux-3.0.8/net/batman-adv/hard-interface.c ---- linux-3.0.8/net/batman-adv/hard-interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/hard-interface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/hard-interface.c linux-3.0.9/net/batman-adv/hard-interface.c +--- linux-3.0.9/net/batman-adv/hard-interface.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/hard-interface.c 2011-11-12 12:47:14.000000000 -0500 @@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_ hard_iface->batman_adv_ptype.dev = hard_iface->net_dev; dev_add_pack(&hard_iface->batman_adv_ptype); @@ -71701,9 +71701,9 @@ diff -urNp linux-3.0.8/net/batman-adv/hard-interface.c linux-3.0.8/net/batman-ad bat_info(hard_iface->soft_iface, "Adding interface: %s\n", hard_iface->net_dev->name); -diff -urNp linux-3.0.8/net/batman-adv/routing.c linux-3.0.8/net/batman-adv/routing.c ---- linux-3.0.8/net/batman-adv/routing.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/routing.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/routing.c linux-3.0.9/net/batman-adv/routing.c +--- linux-3.0.9/net/batman-adv/routing.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/routing.c 2011-11-12 12:47:14.000000000 -0500 @@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e return; @@ -71713,9 +71713,9 @@ diff -urNp linux-3.0.8/net/batman-adv/routing.c linux-3.0.8/net/batman-adv/routi has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0); -diff -urNp linux-3.0.8/net/batman-adv/send.c linux-3.0.8/net/batman-adv/send.c ---- linux-3.0.8/net/batman-adv/send.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/send.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/send.c linux-3.0.9/net/batman-adv/send.c +--- linux-3.0.9/net/batman-adv/send.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/send.c 2011-11-12 12:47:14.000000000 -0500 @@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa /* change sequence number to network order */ @@ -71734,9 +71734,9 @@ diff -urNp linux-3.0.8/net/batman-adv/send.c linux-3.0.8/net/batman-adv/send.c slide_own_bcast_window(hard_iface); send_time = own_send_time(bat_priv); -diff -urNp linux-3.0.8/net/batman-adv/soft-interface.c linux-3.0.8/net/batman-adv/soft-interface.c ---- linux-3.0.8/net/batman-adv/soft-interface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/soft-interface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/soft-interface.c linux-3.0.9/net/batman-adv/soft-interface.c +--- linux-3.0.9/net/batman-adv/soft-interface.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/soft-interface.c 2011-11-12 12:47:14.000000000 -0500 @@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st /* set broadcast sequence number */ @@ -71755,9 +71755,9 @@ diff -urNp linux-3.0.8/net/batman-adv/soft-interface.c linux-3.0.8/net/batman-ad atomic_set(&bat_priv->tt_local_changed, 0); bat_priv->primary_if = NULL; -diff -urNp linux-3.0.8/net/batman-adv/types.h linux-3.0.8/net/batman-adv/types.h ---- linux-3.0.8/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/types.h linux-3.0.9/net/batman-adv/types.h +--- linux-3.0.9/net/batman-adv/types.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/types.h 2011-11-12 12:47:14.000000000 -0500 @@ -38,8 +38,8 @@ struct hard_iface { int16_t if_num; char if_status; @@ -71778,9 +71778,9 @@ diff -urNp linux-3.0.8/net/batman-adv/types.h linux-3.0.8/net/batman-adv/types.h atomic_t bcast_queue_left; atomic_t batman_queue_left; char num_ifaces; -diff -urNp linux-3.0.8/net/batman-adv/unicast.c linux-3.0.8/net/batman-adv/unicast.c ---- linux-3.0.8/net/batman-adv/unicast.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/batman-adv/unicast.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/batman-adv/unicast.c linux-3.0.9/net/batman-adv/unicast.c +--- linux-3.0.9/net/batman-adv/unicast.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/batman-adv/unicast.c 2011-11-12 12:47:14.000000000 -0500 @@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s frag1->flags = UNI_FRAG_HEAD | large_tail; frag2->flags = large_tail; @@ -71790,9 +71790,9 @@ diff -urNp linux-3.0.8/net/batman-adv/unicast.c linux-3.0.8/net/batman-adv/unica frag1->seqno = htons(seqno - 1); frag2->seqno = htons(seqno); -diff -urNp linux-3.0.8/net/bridge/br_multicast.c linux-3.0.8/net/bridge/br_multicast.c ---- linux-3.0.8/net/bridge/br_multicast.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/bridge/br_multicast.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/bridge/br_multicast.c linux-3.0.9/net/bridge/br_multicast.c +--- linux-3.0.9/net/bridge/br_multicast.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/bridge/br_multicast.c 2011-11-12 12:47:14.000000000 -0500 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct nexthdr = ip6h->nexthdr; offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr); @@ -71802,9 +71802,9 @@ diff -urNp linux-3.0.8/net/bridge/br_multicast.c linux-3.0.8/net/bridge/br_multi return 0; /* Okay, we found ICMPv6 header */ -diff -urNp linux-3.0.8/net/bridge/netfilter/ebtables.c linux-3.0.8/net/bridge/netfilter/ebtables.c ---- linux-3.0.8/net/bridge/netfilter/ebtables.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/bridge/netfilter/ebtables.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/bridge/netfilter/ebtables.c linux-3.0.9/net/bridge/netfilter/ebtables.c +--- linux-3.0.9/net/bridge/netfilter/ebtables.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/bridge/netfilter/ebtables.c 2011-11-12 12:47:14.000000000 -0500 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s tmp.valid_hooks = t->table->valid_hooks; } @@ -71823,9 +71823,9 @@ diff -urNp linux-3.0.8/net/bridge/netfilter/ebtables.c linux-3.0.8/net/bridge/ne memset(&tinfo, 0, sizeof(tinfo)); if (cmd == EBT_SO_GET_ENTRIES) { -diff -urNp linux-3.0.8/net/caif/caif_socket.c linux-3.0.8/net/caif/caif_socket.c ---- linux-3.0.8/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/caif/caif_socket.c linux-3.0.9/net/caif/caif_socket.c +--- linux-3.0.9/net/caif/caif_socket.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/caif/caif_socket.c 2011-11-12 12:47:14.000000000 -0500 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir; #ifdef CONFIG_DEBUG_FS struct debug_fs_counter { @@ -71955,9 +71955,9 @@ diff -urNp linux-3.0.8/net/caif/caif_socket.c linux-3.0.8/net/caif/caif_socket.c #ifdef CONFIG_DEBUG_FS if (!IS_ERR(debugfsdir)) { -diff -urNp linux-3.0.8/net/caif/cfctrl.c linux-3.0.8/net/caif/cfctrl.c ---- linux-3.0.8/net/caif/cfctrl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/caif/cfctrl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/caif/cfctrl.c linux-3.0.9/net/caif/cfctrl.c +--- linux-3.0.9/net/caif/cfctrl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/caif/cfctrl.c 2011-11-12 12:47:14.000000000 -0500 @@ -9,6 +9,7 @@ #include <linux/stddef.h> #include <linux/spinlock.h> @@ -72005,9 +72005,9 @@ diff -urNp linux-3.0.8/net/caif/cfctrl.c linux-3.0.8/net/caif/cfctrl.c cfpkt_extr_head(pkt, &cmdrsp, 1); cmd = cmdrsp & CFCTRL_CMD_MASK; -diff -urNp linux-3.0.8/net/compat.c linux-3.0.8/net/compat.c ---- linux-3.0.8/net/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/compat.c linux-3.0.9/net/compat.c +--- linux-3.0.9/net/compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || __get_user(kmsg->msg_flags, &umsg->msg_flags)) @@ -72135,9 +72135,9 @@ diff -urNp linux-3.0.8/net/compat.c linux-3.0.8/net/compat.c struct group_filter __user *kgf; int __user *koptlen; u32 interface, fmode, numsrc; -diff -urNp linux-3.0.8/net/core/datagram.c linux-3.0.8/net/core/datagram.c ---- linux-3.0.8/net/core/datagram.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/datagram.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/core/datagram.c linux-3.0.9/net/core/datagram.c +--- linux-3.0.9/net/core/datagram.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/datagram.c 2011-11-12 12:47:14.000000000 -0500 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s } @@ -72147,9 +72147,9 @@ diff -urNp linux-3.0.8/net/core/datagram.c linux-3.0.8/net/core/datagram.c sk_mem_reclaim_partial(sk); return err; -diff -urNp linux-3.0.8/net/core/dev.c linux-3.0.8/net/core/dev.c ---- linux-3.0.8/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/core/dev.c linux-3.0.9/net/core/dev.c +--- linux-3.0.9/net/core/dev.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/dev.c 2011-11-12 12:47:14.000000000 -0500 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha if (no_module && capable(CAP_NET_ADMIN)) no_module = request_module("netdev-%s", name); @@ -72192,9 +72192,9 @@ diff -urNp linux-3.0.8/net/core/dev.c linux-3.0.8/net/core/dev.c { struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; -diff -urNp linux-3.0.8/net/core/flow.c linux-3.0.8/net/core/flow.c ---- linux-3.0.8/net/core/flow.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/flow.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/core/flow.c linux-3.0.9/net/core/flow.c +--- linux-3.0.9/net/core/flow.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/flow.c 2011-11-12 12:47:14.000000000 -0500 @@ -60,7 +60,7 @@ struct flow_cache { struct timer_list rnd_timer; }; @@ -72213,7 +72213,7 @@ diff -urNp linux-3.0.8/net/core/flow.c linux-3.0.8/net/core/flow.c return 0; if (fle->object && !fle->object->ops->check(fle->object)) return 0; -@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, const +@@ -256,7 +256,7 @@ flow_cache_lookup(struct net *net, const hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); fcp->hash_count++; } @@ -72222,7 +72222,7 @@ diff -urNp linux-3.0.8/net/core/flow.c linux-3.0.8/net/core/flow.c flo = fle->object; if (!flo) goto ret_object; -@@ -274,7 +274,7 @@ nocache: +@@ -277,7 +277,7 @@ nocache: } flo = resolver(net, key, family, dir, flo, ctx); if (fle) { @@ -72231,9 +72231,9 @@ diff -urNp linux-3.0.8/net/core/flow.c linux-3.0.8/net/core/flow.c if (!IS_ERR(flo)) fle->object = flo; else -diff -urNp linux-3.0.8/net/core/iovec.c linux-3.0.8/net/core/iovec.c ---- linux-3.0.8/net/core/iovec.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/iovec.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/core/iovec.c linux-3.0.9/net/core/iovec.c +--- linux-3.0.9/net/core/iovec.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/iovec.c 2011-11-12 12:47:14.000000000 -0500 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc if (m->msg_namelen) { if (mode == VERIFY_READ) { @@ -72252,9 +72252,9 @@ diff -urNp linux-3.0.8/net/core/iovec.c linux-3.0.8/net/core/iovec.c return -EFAULT; m->msg_iov = iov; -diff -urNp linux-3.0.8/net/core/rtnetlink.c linux-3.0.8/net/core/rtnetlink.c ---- linux-3.0.8/net/core/rtnetlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/rtnetlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/core/rtnetlink.c linux-3.0.9/net/core/rtnetlink.c +--- linux-3.0.9/net/core/rtnetlink.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/rtnetlink.c 2011-11-12 12:47:14.000000000 -0500 @@ -56,7 +56,7 @@ struct rtnl_link { rtnl_doit_func doit; @@ -72264,9 +72264,9 @@ diff -urNp linux-3.0.8/net/core/rtnetlink.c linux-3.0.8/net/core/rtnetlink.c static DEFINE_MUTEX(rtnl_mutex); -diff -urNp linux-3.0.8/net/core/scm.c linux-3.0.8/net/core/scm.c ---- linux-3.0.8/net/core/scm.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/core/scm.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/core/scm.c linux-3.0.9/net/core/scm.c +--- linux-3.0.9/net/core/scm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/scm.c 2011-11-12 12:47:14.000000000 -0500 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send); int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) { @@ -72303,9 +72303,9 @@ diff -urNp linux-3.0.8/net/core/scm.c linux-3.0.8/net/core/scm.c i++, cmfptr++) { int new_fd; -diff -urNp linux-3.0.8/net/core/skbuff.c linux-3.0.8/net/core/skbuff.c ---- linux-3.0.8/net/core/skbuff.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/skbuff.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/core/skbuff.c linux-3.0.9/net/core/skbuff.c +--- linux-3.0.9/net/core/skbuff.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/skbuff.c 2011-11-12 12:47:14.000000000 -0500 @@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk = skb->sk; int ret = 0; @@ -72315,9 +72315,9 @@ diff -urNp linux-3.0.8/net/core/skbuff.c linux-3.0.8/net/core/skbuff.c if (splice_grow_spd(pipe, &spd)) return -ENOMEM; -diff -urNp linux-3.0.8/net/core/sock.c linux-3.0.8/net/core/sock.c ---- linux-3.0.8/net/core/sock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/core/sock.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/core/sock.c linux-3.0.9/net/core/sock.c +--- linux-3.0.9/net/core/sock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/core/sock.c 2011-11-12 12:47:14.000000000 -0500 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, */ if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= @@ -72390,7 +72390,7 @@ diff -urNp linux-3.0.8/net/core/sock.c linux-3.0.8/net/core/sock.c return -EFAULT; lenout: if (put_user(len, optlen)) -@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock, +@@ -2024,7 +2024,7 @@ void sock_init_data(struct socket *sock, */ smp_wmb(); atomic_set(&sk->sk_refcnt, 1); @@ -72399,9 +72399,9 @@ diff -urNp linux-3.0.8/net/core/sock.c linux-3.0.8/net/core/sock.c } EXPORT_SYMBOL(sock_init_data); -diff -urNp linux-3.0.8/net/decnet/sysctl_net_decnet.c linux-3.0.8/net/decnet/sysctl_net_decnet.c ---- linux-3.0.8/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/decnet/sysctl_net_decnet.c linux-3.0.9/net/decnet/sysctl_net_decnet.c +--- linux-3.0.9/net/decnet/sysctl_net_decnet.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/decnet/sysctl_net_decnet.c 2011-11-12 12:47:14.000000000 -0500 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t if (len > *lenp) len = *lenp; @@ -72420,9 +72420,9 @@ diff -urNp linux-3.0.8/net/decnet/sysctl_net_decnet.c linux-3.0.8/net/decnet/sys return -EFAULT; *lenp = len; -diff -urNp linux-3.0.8/net/econet/Kconfig linux-3.0.8/net/econet/Kconfig ---- linux-3.0.8/net/econet/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/econet/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/econet/Kconfig linux-3.0.9/net/econet/Kconfig +--- linux-3.0.9/net/econet/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/econet/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -4,7 +4,7 @@ config ECONET @@ -72432,9 +72432,9 @@ diff -urNp linux-3.0.8/net/econet/Kconfig linux-3.0.8/net/econet/Kconfig ---help--- Econet is a fairly old and slow networking protocol mainly used by Acorn computers to access file and print servers. It uses native -diff -urNp linux-3.0.8/net/ipv4/fib_frontend.c linux-3.0.8/net/ipv4/fib_frontend.c ---- linux-3.0.8/net/ipv4/fib_frontend.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/fib_frontend.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/fib_frontend.c linux-3.0.9/net/ipv4/fib_frontend.c +--- linux-3.0.9/net/ipv4/fib_frontend.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/fib_frontend.c 2011-11-12 12:47:14.000000000 -0500 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not #ifdef CONFIG_IP_ROUTE_MULTIPATH fib_sync_up(dev); @@ -72459,9 +72459,9 @@ diff -urNp linux-3.0.8/net/ipv4/fib_frontend.c linux-3.0.8/net/ipv4/fib_frontend rt_cache_flush(dev_net(dev), -1); break; case NETDEV_DOWN: -diff -urNp linux-3.0.8/net/ipv4/fib_semantics.c linux-3.0.8/net/ipv4/fib_semantics.c ---- linux-3.0.8/net/ipv4/fib_semantics.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/fib_semantics.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/fib_semantics.c linux-3.0.9/net/ipv4/fib_semantics.c +--- linux-3.0.9/net/ipv4/fib_semantics.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/fib_semantics.c 2011-11-12 12:47:14.000000000 -0500 @@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n nh->nh_saddr = inet_select_addr(nh->nh_dev, nh->nh_gw, @@ -72471,9 +72471,9 @@ diff -urNp linux-3.0.8/net/ipv4/fib_semantics.c linux-3.0.8/net/ipv4/fib_semanti return nh->nh_saddr; } -diff -urNp linux-3.0.8/net/ipv4/inet_diag.c linux-3.0.8/net/ipv4/inet_diag.c ---- linux-3.0.8/net/ipv4/inet_diag.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/inet_diag.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/inet_diag.c linux-3.0.9/net/ipv4/inet_diag.c +--- linux-3.0.9/net/ipv4/inet_diag.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/inet_diag.c 2011-11-12 12:47:14.000000000 -0500 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc r->idiag_retrans = 0; @@ -72535,9 +72535,9 @@ diff -urNp linux-3.0.8/net/ipv4/inet_diag.c linux-3.0.8/net/ipv4/inet_diag.c tmo = req->expires - jiffies; if (tmo < 0) -diff -urNp linux-3.0.8/net/ipv4/inet_hashtables.c linux-3.0.8/net/ipv4/inet_hashtables.c ---- linux-3.0.8/net/ipv4/inet_hashtables.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/ipv4/inet_hashtables.c 2011-08-23 21:55:24.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/inet_hashtables.c linux-3.0.9/net/ipv4/inet_hashtables.c +--- linux-3.0.9/net/ipv4/inet_hashtables.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/inet_hashtables.c 2011-11-12 12:47:14.000000000 -0500 @@ -18,12 +18,15 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -72563,9 +72563,9 @@ diff -urNp linux-3.0.8/net/ipv4/inet_hashtables.c linux-3.0.8/net/ipv4/inet_hash if (tw) { inet_twsk_deschedule(tw, death_row); while (twrefcnt) { -diff -urNp linux-3.0.8/net/ipv4/inetpeer.c linux-3.0.8/net/ipv4/inetpeer.c ---- linux-3.0.8/net/ipv4/inetpeer.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/ipv4/inetpeer.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/inetpeer.c linux-3.0.9/net/ipv4/inetpeer.c +--- linux-3.0.9/net/ipv4/inetpeer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/inetpeer.c 2011-11-12 12:47:14.000000000 -0500 @@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in unsigned int sequence; int invalidated, newrefcnt = 0; @@ -72586,9 +72586,9 @@ diff -urNp linux-3.0.8/net/ipv4/inetpeer.c linux-3.0.8/net/ipv4/inetpeer.c p->tcp_ts_stamp = 0; p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW; p->rate_tokens = 0; -diff -urNp linux-3.0.8/net/ipv4/ipconfig.c linux-3.0.8/net/ipv4/ipconfig.c ---- linux-3.0.8/net/ipv4/ipconfig.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/ipconfig.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/ipconfig.c linux-3.0.9/net/ipv4/ipconfig.c +--- linux-3.0.9/net/ipv4/ipconfig.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/ipconfig.c 2011-11-12 12:47:14.000000000 -0500 @@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig mm_segment_t oldfs = get_fs(); @@ -72616,9 +72616,9 @@ diff -urNp linux-3.0.8/net/ipv4/ipconfig.c linux-3.0.8/net/ipv4/ipconfig.c set_fs(oldfs); return res; } -diff -urNp linux-3.0.8/net/ipv4/ip_fragment.c linux-3.0.8/net/ipv4/ip_fragment.c ---- linux-3.0.8/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/ip_fragment.c linux-3.0.9/net/ipv4/ip_fragment.c +--- linux-3.0.9/net/ipv4/ip_fragment.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/ip_fragment.c 2011-11-12 12:47:14.000000000 -0500 @@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct return 0; @@ -72628,9 +72628,9 @@ diff -urNp linux-3.0.8/net/ipv4/ip_fragment.c linux-3.0.8/net/ipv4/ip_fragment.c qp->rid = end; rc = qp->q.fragments && (end - start) > max; -diff -urNp linux-3.0.8/net/ipv4/ip_sockglue.c linux-3.0.8/net/ipv4/ip_sockglue.c ---- linux-3.0.8/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/ip_sockglue.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/ip_sockglue.c linux-3.0.9/net/ipv4/ip_sockglue.c +--- linux-3.0.9/net/ipv4/ip_sockglue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/ip_sockglue.c 2011-11-12 12:47:14.000000000 -0500 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock int val; int len; @@ -72659,9 +72659,9 @@ diff -urNp linux-3.0.8/net/ipv4/ip_sockglue.c linux-3.0.8/net/ipv4/ip_sockglue.c msg.msg_controllen = len; msg.msg_flags = 0; -diff -urNp linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-11-12 12:47:14.000000000 -0500 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -72671,9 +72671,9 @@ diff -urNp linux-3.0.8/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.8/net/ip if (*octets == NULL) { if (net_ratelimit()) pr_notice("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-3.0.8/net/ipv4/ping.c linux-3.0.8/net/ipv4/ping.c ---- linux-3.0.8/net/ipv4/ping.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/ping.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/ping.c linux-3.0.9/net/ipv4/ping.c +--- linux-3.0.9/net/ipv4/ping.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/ping.c 2011-11-12 12:47:14.000000000 -0500 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock sk_rmem_alloc_get(sp), 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp), @@ -72683,9 +72683,9 @@ diff -urNp linux-3.0.8/net/ipv4/ping.c linux-3.0.8/net/ipv4/ping.c } static int ping_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/ipv4/raw.c linux-3.0.8/net/ipv4/raw.c ---- linux-3.0.8/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/raw.c linux-3.0.9/net/ipv4/raw.c +--- linux-3.0.9/net/ipv4/raw.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/raw.c 2011-11-12 12:47:14.000000000 -0500 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, int raw_rcv(struct sock *sk, struct sk_buff *skb) { @@ -72744,9 +72744,9 @@ diff -urNp linux-3.0.8/net/ipv4/raw.c linux-3.0.8/net/ipv4/raw.c } static int raw_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/ipv4/route.c linux-3.0.8/net/ipv4/route.c ---- linux-3.0.8/net/ipv4/route.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/ipv4/route.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/route.c linux-3.0.9/net/ipv4/route.c +--- linux-3.0.9/net/ipv4/route.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/route.c 2011-11-12 12:47:14.000000000 -0500 @@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3 static inline int rt_genid(struct net *net) @@ -72774,9 +72774,9 @@ diff -urNp linux-3.0.8/net/ipv4/route.c linux-3.0.8/net/ipv4/route.c if (peer->tcp_ts_stamp) { ts = peer->tcp_ts; tsage = get_seconds() - peer->tcp_ts_stamp; -diff -urNp linux-3.0.8/net/ipv4/tcp.c linux-3.0.8/net/ipv4/tcp.c ---- linux-3.0.8/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp.c linux-3.0.9/net/ipv4/tcp.c +--- linux-3.0.9/net/ipv4/tcp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp.c 2011-11-12 12:47:14.000000000 -0500 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock int val; int err = 0; @@ -72795,9 +72795,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp.c linux-3.0.8/net/ipv4/tcp.c if (get_user(len, optlen)) return -EFAULT; -diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c ---- linux-3.0.8/net/ipv4/tcp_ipv4.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp_ipv4.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp_ipv4.c linux-3.0.9/net/ipv4/tcp_ipv4.c +--- linux-3.0.9/net/ipv4/tcp_ipv4.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp_ipv4.c 2011-11-12 12:47:14.000000000 -0500 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly; int sysctl_tcp_low_latency __read_mostly; EXPORT_SYMBOL(sysctl_tcp_low_latency); @@ -72808,7 +72808,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c #ifdef CONFIG_TCP_MD5SIG static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, -@@ -1607,6 +1610,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc +@@ -1610,6 +1613,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc return 0; reset: @@ -72818,7 +72818,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(rsk, skb); discard: kfree_skb(skb); -@@ -1669,12 +1675,19 @@ int tcp_v4_rcv(struct sk_buff *skb) +@@ -1672,12 +1678,19 @@ int tcp_v4_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -72841,7 +72841,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -1724,6 +1737,10 @@ no_tcp_socket: +@@ -1727,6 +1740,10 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -72852,7 +72852,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -@@ -2388,7 +2405,11 @@ static void get_openreq4(struct sock *sk +@@ -2391,7 +2408,11 @@ static void get_openreq4(struct sock *sk 0, /* non standard timer */ 0, /* open_requests have no inode */ atomic_read(&sk->sk_refcnt), @@ -72864,7 +72864,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c len); } -@@ -2438,7 +2459,12 @@ static void get_tcp4_sock(struct sock *s +@@ -2441,7 +2462,12 @@ static void get_tcp4_sock(struct sock *s sock_i_uid(sk), icsk->icsk_probes_out, sock_i_ino(sk), @@ -72878,7 +72878,7 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c jiffies_to_clock_t(icsk->icsk_rto), jiffies_to_clock_t(icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, -@@ -2466,7 +2492,13 @@ static void get_timewait4_sock(struct in +@@ -2469,7 +2495,13 @@ static void get_timewait4_sock(struct in " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n", i, src, srcp, dest, destp, tw->tw_substate, 0, 0, 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, @@ -72893,9 +72893,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_ipv4.c linux-3.0.8/net/ipv4/tcp_ipv4.c } #define TMPSZ 150 -diff -urNp linux-3.0.8/net/ipv4/tcp_minisocks.c linux-3.0.8/net/ipv4/tcp_minisocks.c ---- linux-3.0.8/net/ipv4/tcp_minisocks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp_minisocks.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp_minisocks.c linux-3.0.9/net/ipv4/tcp_minisocks.c +--- linux-3.0.9/net/ipv4/tcp_minisocks.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp_minisocks.c 2011-11-12 12:47:14.000000000 -0500 @@ -27,6 +27,10 @@ #include <net/inet_common.h> #include <net/xfrm.h> @@ -72918,9 +72918,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_minisocks.c linux-3.0.8/net/ipv4/tcp_minisoc if (!(flg & TCP_FLAG_RST)) req->rsk_ops->send_reset(sk, skb); -diff -urNp linux-3.0.8/net/ipv4/tcp_output.c linux-3.0.8/net/ipv4/tcp_output.c ---- linux-3.0.8/net/ipv4/tcp_output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp_output.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp_output.c linux-3.0.9/net/ipv4/tcp_output.c +--- linux-3.0.9/net/ipv4/tcp_output.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp_output.c 2011-11-12 12:47:14.000000000 -0500 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s int mss; int s_data_desired = 0; @@ -72930,9 +72930,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_output.c linux-3.0.8/net/ipv4/tcp_output.c if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired) s_data_desired = cvp->s_data_desired; skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC); -diff -urNp linux-3.0.8/net/ipv4/tcp_probe.c linux-3.0.8/net/ipv4/tcp_probe.c ---- linux-3.0.8/net/ipv4/tcp_probe.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp_probe.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp_probe.c linux-3.0.9/net/ipv4/tcp_probe.c +--- linux-3.0.9/net/ipv4/tcp_probe.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp_probe.c 2011-11-12 12:47:14.000000000 -0500 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file if (cnt + width >= len) break; @@ -72942,9 +72942,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_probe.c linux-3.0.8/net/ipv4/tcp_probe.c return -EFAULT; cnt += width; } -diff -urNp linux-3.0.8/net/ipv4/tcp_timer.c linux-3.0.8/net/ipv4/tcp_timer.c ---- linux-3.0.8/net/ipv4/tcp_timer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/tcp_timer.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/tcp_timer.c linux-3.0.9/net/ipv4/tcp_timer.c +--- linux-3.0.9/net/ipv4/tcp_timer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/tcp_timer.c 2011-11-12 12:47:14.000000000 -0500 @@ -22,6 +22,10 @@ #include <linux/gfp.h> #include <net/tcp.h> @@ -72970,9 +72970,9 @@ diff -urNp linux-3.0.8/net/ipv4/tcp_timer.c linux-3.0.8/net/ipv4/tcp_timer.c if (retransmits_timed_out(sk, retry_until, syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ -diff -urNp linux-3.0.8/net/ipv4/udp.c linux-3.0.8/net/ipv4/udp.c ---- linux-3.0.8/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv4/udp.c linux-3.0.9/net/ipv4/udp.c +--- linux-3.0.9/net/ipv4/udp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv4/udp.c 2011-11-12 12:47:14.000000000 -0500 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -73085,9 +73085,9 @@ diff -urNp linux-3.0.8/net/ipv4/udp.c linux-3.0.8/net/ipv4/udp.c } int udp4_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/ipv6/addrconf.c linux-3.0.8/net/ipv6/addrconf.c ---- linux-3.0.8/net/ipv6/addrconf.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv6/addrconf.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/addrconf.c linux-3.0.9/net/ipv6/addrconf.c +--- linux-3.0.9/net/ipv6/addrconf.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/addrconf.c 2011-11-12 12:47:14.000000000 -0500 @@ -2072,7 +2072,7 @@ int addrconf_set_dstaddr(struct net *net p.iph.ihl = 5; p.iph.protocol = IPPROTO_IPV6; @@ -73097,9 +73097,9 @@ diff -urNp linux-3.0.8/net/ipv6/addrconf.c linux-3.0.8/net/ipv6/addrconf.c if (ops->ndo_do_ioctl) { mm_segment_t oldfs = get_fs(); -diff -urNp linux-3.0.8/net/ipv6/inet6_connection_sock.c linux-3.0.8/net/ipv6/inet6_connection_sock.c ---- linux-3.0.8/net/ipv6/inet6_connection_sock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv6/inet6_connection_sock.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/inet6_connection_sock.c linux-3.0.9/net/ipv6/inet6_connection_sock.c +--- linux-3.0.9/net/ipv6/inet6_connection_sock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/inet6_connection_sock.c 2011-11-12 12:47:14.000000000 -0500 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock * #ifdef CONFIG_XFRM { @@ -73118,9 +73118,9 @@ diff -urNp linux-3.0.8/net/ipv6/inet6_connection_sock.c linux-3.0.8/net/ipv6/ine __sk_dst_reset(sk); dst = NULL; } -diff -urNp linux-3.0.8/net/ipv6/ipv6_sockglue.c linux-3.0.8/net/ipv6/ipv6_sockglue.c ---- linux-3.0.8/net/ipv6/ipv6_sockglue.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/ipv6/ipv6_sockglue.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/ipv6_sockglue.c linux-3.0.9/net/ipv6/ipv6_sockglue.c +--- linux-3.0.9/net/ipv6/ipv6_sockglue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/ipv6_sockglue.c 2011-11-12 12:47:14.000000000 -0500 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc int val, valbool; int retv = -ENOPROTOOPT; @@ -73148,9 +73148,9 @@ diff -urNp linux-3.0.8/net/ipv6/ipv6_sockglue.c linux-3.0.8/net/ipv6/ipv6_sockgl msg.msg_controllen = len; msg.msg_flags = flags; -diff -urNp linux-3.0.8/net/ipv6/raw.c linux-3.0.8/net/ipv6/raw.c ---- linux-3.0.8/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/raw.c linux-3.0.9/net/ipv6/raw.c +--- linux-3.0.9/net/ipv6/raw.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/raw.c 2011-11-12 12:47:14.000000000 -0500 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s { if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) && @@ -73246,9 +73246,9 @@ diff -urNp linux-3.0.8/net/ipv6/raw.c linux-3.0.8/net/ipv6/raw.c } static int raw6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c ---- linux-3.0.8/net/ipv6/tcp_ipv6.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/ipv6/tcp_ipv6.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/tcp_ipv6.c linux-3.0.9/net/ipv6/tcp_ipv6.c +--- linux-3.0.9/net/ipv6/tcp_ipv6.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/tcp_ipv6.c 2011-11-12 12:47:14.000000000 -0500 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 } #endif @@ -73260,7 +73260,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c static void tcp_v6_hash(struct sock *sk) { if (sk->sk_state != TCP_CLOSE) { -@@ -1662,6 +1666,9 @@ static int tcp_v6_do_rcv(struct sock *sk +@@ -1667,6 +1671,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; reset: @@ -73270,7 +73270,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1741,12 +1748,20 @@ static int tcp_v6_rcv(struct sk_buff *sk +@@ -1746,12 +1753,20 @@ static int tcp_v6_rcv(struct sk_buff *sk TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -73293,7 +73293,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -1794,6 +1809,10 @@ no_tcp_socket: +@@ -1799,6 +1814,10 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -73304,7 +73304,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -@@ -2054,7 +2073,13 @@ static void get_openreq6(struct seq_file +@@ -2059,7 +2078,13 @@ static void get_openreq6(struct seq_file uid, 0, /* non standard timer */ 0, /* open_requests have no inode */ @@ -73319,7 +73319,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c } static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) -@@ -2104,7 +2129,12 @@ static void get_tcp6_sock(struct seq_fil +@@ -2109,7 +2134,12 @@ static void get_tcp6_sock(struct seq_fil sock_i_uid(sp), icsk->icsk_probes_out, sock_i_ino(sp), @@ -73333,7 +73333,7 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c jiffies_to_clock_t(icsk->icsk_rto), jiffies_to_clock_t(icsk->icsk_ack.ato), (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, -@@ -2139,7 +2169,13 @@ static void get_timewait6_sock(struct se +@@ -2144,7 +2174,13 @@ static void get_timewait6_sock(struct se dest->s6_addr32[2], dest->s6_addr32[3], destp, tw->tw_substate, 0, 0, 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0, @@ -73348,9 +73348,9 @@ diff -urNp linux-3.0.8/net/ipv6/tcp_ipv6.c linux-3.0.8/net/ipv6/tcp_ipv6.c } static int tcp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/ipv6/udp.c linux-3.0.8/net/ipv6/udp.c ---- linux-3.0.8/net/ipv6/udp.c 2011-10-24 08:05:32.000000000 -0400 -+++ linux-3.0.8/net/ipv6/udp.c 2011-10-17 23:17:19.000000000 -0400 +diff -urNp linux-3.0.9/net/ipv6/udp.c linux-3.0.9/net/ipv6/udp.c +--- linux-3.0.9/net/ipv6/udp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/ipv6/udp.c 2011-11-12 12:47:14.000000000 -0500 @@ -50,6 +50,10 @@ #include <linux/seq_file.h> #include "udp_impl.h" @@ -73415,9 +73415,9 @@ diff -urNp linux-3.0.8/net/ipv6/udp.c linux-3.0.8/net/ipv6/udp.c } int udp6_seq_show(struct seq_file *seq, void *v) -diff -urNp linux-3.0.8/net/irda/ircomm/ircomm_tty.c linux-3.0.8/net/irda/ircomm/ircomm_tty.c ---- linux-3.0.8/net/irda/ircomm/ircomm_tty.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/irda/ircomm/ircomm_tty.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/irda/ircomm/ircomm_tty.c linux-3.0.9/net/irda/ircomm/ircomm_tty.c +--- linux-3.0.9/net/irda/ircomm/ircomm_tty.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/irda/ircomm/ircomm_tty.c 2011-11-12 12:47:14.000000000 -0500 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -73540,9 +73540,9 @@ diff -urNp linux-3.0.8/net/irda/ircomm/ircomm_tty.c linux-3.0.8/net/irda/ircomm/ seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-3.0.8/net/iucv/af_iucv.c linux-3.0.8/net/iucv/af_iucv.c ---- linux-3.0.8/net/iucv/af_iucv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/iucv/af_iucv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/iucv/af_iucv.c linux-3.0.9/net/iucv/af_iucv.c +--- linux-3.0.9/net/iucv/af_iucv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/iucv/af_iucv.c 2011-11-12 12:47:14.000000000 -0500 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc write_lock_bh(&iucv_sk_list.lock); @@ -73556,9 +73556,9 @@ diff -urNp linux-3.0.8/net/iucv/af_iucv.c linux-3.0.8/net/iucv/af_iucv.c } write_unlock_bh(&iucv_sk_list.lock); -diff -urNp linux-3.0.8/net/key/af_key.c linux-3.0.8/net/key/af_key.c ---- linux-3.0.8/net/key/af_key.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/key/af_key.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/key/af_key.c linux-3.0.9/net/key/af_key.c +--- linux-3.0.9/net/key/af_key.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/key/af_key.c 2011-11-12 12:47:14.000000000 -0500 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk struct xfrm_migrate m[XFRM_MAX_DEPTH]; struct xfrm_kmaddress k; @@ -73581,9 +73581,9 @@ diff -urNp linux-3.0.8/net/key/af_key.c linux-3.0.8/net/key/af_key.c } while (!res); return res; } -diff -urNp linux-3.0.8/net/lapb/lapb_iface.c linux-3.0.8/net/lapb/lapb_iface.c ---- linux-3.0.8/net/lapb/lapb_iface.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/lapb/lapb_iface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/lapb/lapb_iface.c linux-3.0.9/net/lapb/lapb_iface.c +--- linux-3.0.9/net/lapb/lapb_iface.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/lapb/lapb_iface.c 2011-11-12 12:47:14.000000000 -0500 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev goto out; @@ -73647,9 +73647,9 @@ diff -urNp linux-3.0.8/net/lapb/lapb_iface.c linux-3.0.8/net/lapb/lapb_iface.c used = 1; } -diff -urNp linux-3.0.8/net/mac80211/debugfs_sta.c linux-3.0.8/net/mac80211/debugfs_sta.c ---- linux-3.0.8/net/mac80211/debugfs_sta.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/debugfs_sta.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/debugfs_sta.c linux-3.0.9/net/mac80211/debugfs_sta.c +--- linux-3.0.9/net/mac80211/debugfs_sta.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/debugfs_sta.c 2011-11-12 12:47:14.000000000 -0500 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc struct tid_ampdu_rx *tid_rx; struct tid_ampdu_tx *tid_tx; @@ -73668,9 +73668,9 @@ diff -urNp linux-3.0.8/net/mac80211/debugfs_sta.c linux-3.0.8/net/mac80211/debug p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n", htc->ht_supported ? "" : "not "); if (htc->ht_supported) { -diff -urNp linux-3.0.8/net/mac80211/ieee80211_i.h linux-3.0.8/net/mac80211/ieee80211_i.h ---- linux-3.0.8/net/mac80211/ieee80211_i.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/ieee80211_i.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/ieee80211_i.h linux-3.0.9/net/mac80211/ieee80211_i.h +--- linux-3.0.9/net/mac80211/ieee80211_i.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/ieee80211_i.h 2011-11-12 12:47:14.000000000 -0500 @@ -27,6 +27,7 @@ #include <net/ieee80211_radiotap.h> #include <net/cfg80211.h> @@ -73679,7 +73679,7 @@ diff -urNp linux-3.0.8/net/mac80211/ieee80211_i.h linux-3.0.8/net/mac80211/ieee8 #include "key.h" #include "sta_info.h" -@@ -721,7 +722,7 @@ struct ieee80211_local { +@@ -723,7 +724,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -73688,9 +73688,9 @@ diff -urNp linux-3.0.8/net/mac80211/ieee80211_i.h linux-3.0.8/net/mac80211/ieee8 int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, -diff -urNp linux-3.0.8/net/mac80211/iface.c linux-3.0.8/net/mac80211/iface.c ---- linux-3.0.8/net/mac80211/iface.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/mac80211/iface.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/iface.c linux-3.0.9/net/mac80211/iface.c +--- linux-3.0.9/net/mac80211/iface.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/iface.c 2011-11-12 12:47:14.000000000 -0500 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_ break; } @@ -73745,9 +73745,9 @@ diff -urNp linux-3.0.8/net/mac80211/iface.c linux-3.0.8/net/mac80211/iface.c if (local->ops->napi_poll) napi_disable(&local->napi); ieee80211_clear_tx_pending(local); -diff -urNp linux-3.0.8/net/mac80211/main.c linux-3.0.8/net/mac80211/main.c ---- linux-3.0.8/net/mac80211/main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/main.c linux-3.0.9/net/mac80211/main.c +--- linux-3.0.9/net/mac80211/main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/main.c 2011-11-12 12:47:14.000000000 -0500 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -73757,10 +73757,10 @@ diff -urNp linux-3.0.8/net/mac80211/main.c linux-3.0.8/net/mac80211/main.c ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-3.0.8/net/mac80211/mlme.c linux-3.0.8/net/mac80211/mlme.c ---- linux-3.0.8/net/mac80211/mlme.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/mac80211/mlme.c 2011-08-23 21:48:14.000000000 -0400 -@@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru +diff -urNp linux-3.0.9/net/mac80211/mlme.c linux-3.0.9/net/mac80211/mlme.c +--- linux-3.0.9/net/mac80211/mlme.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/mlme.c 2011-11-12 12:47:14.000000000 -0500 +@@ -1447,6 +1447,8 @@ static bool ieee80211_assoc_success(stru bool have_higher_than_11mbit = false; u16 ap_ht_cap_flags; @@ -73769,9 +73769,9 @@ diff -urNp linux-3.0.8/net/mac80211/mlme.c linux-3.0.8/net/mac80211/mlme.c /* AssocResp and ReassocResp have identical structure */ aid = le16_to_cpu(mgmt->u.assoc_resp.aid); -diff -urNp linux-3.0.8/net/mac80211/pm.c linux-3.0.8/net/mac80211/pm.c ---- linux-3.0.8/net/mac80211/pm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/pm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/pm.c linux-3.0.9/net/mac80211/pm.c +--- linux-3.0.9/net/mac80211/pm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/pm.c 2011-11-12 12:47:14.000000000 -0500 @@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211 cancel_work_sync(&local->dynamic_ps_enable_work); del_timer_sync(&local->dynamic_ps_timer); @@ -73790,9 +73790,9 @@ diff -urNp linux-3.0.8/net/mac80211/pm.c linux-3.0.8/net/mac80211/pm.c ieee80211_stop_device(local); suspend: -diff -urNp linux-3.0.8/net/mac80211/rate.c linux-3.0.8/net/mac80211/rate.c ---- linux-3.0.8/net/mac80211/rate.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/rate.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/rate.c linux-3.0.9/net/mac80211/rate.c +--- linux-3.0.9/net/mac80211/rate.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/rate.c 2011-11-12 12:47:14.000000000 -0500 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct ASSERT_RTNL(); @@ -73802,9 +73802,9 @@ diff -urNp linux-3.0.8/net/mac80211/rate.c linux-3.0.8/net/mac80211/rate.c return -EBUSY; if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) { -diff -urNp linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c ---- linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c +--- linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/rc80211_pid_debugfs.c 2011-11-12 12:47:14.000000000 -0500 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r spin_unlock_irqrestore(&events->lock, status); @@ -73814,9 +73814,9 @@ diff -urNp linux-3.0.8/net/mac80211/rc80211_pid_debugfs.c linux-3.0.8/net/mac802 return -EFAULT; return p; -diff -urNp linux-3.0.8/net/mac80211/util.c linux-3.0.8/net/mac80211/util.c ---- linux-3.0.8/net/mac80211/util.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/mac80211/util.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/mac80211/util.c linux-3.0.9/net/mac80211/util.c +--- linux-3.0.9/net/mac80211/util.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/mac80211/util.c 2011-11-12 12:47:14.000000000 -0500 @@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_ #endif @@ -73826,9 +73826,9 @@ diff -urNp linux-3.0.8/net/mac80211/util.c linux-3.0.8/net/mac80211/util.c /* * Upon resume hardware can sometimes be goofy due to * various platform / driver / bus issues, so restarting -diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c ---- linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c +--- linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_conn.c 2011-11-12 12:47:14.000000000 -0500 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s /* Increase the refcnt counter of the dest */ atomic_inc(&dest->refcnt); @@ -73856,9 +73856,9 @@ diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.8/net/netfilter if (i > 8 || i < 0) return 0; if (!todrop_rate[i]) return 0; -diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c ---- linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c +--- linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_core.c 2011-11-12 12:47:14.000000000 -0500 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv ret = cp->packet_xmit(skb, cp, pd->pp); /* do not touch skb anymore */ @@ -73877,9 +73877,9 @@ diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_core.c linux-3.0.8/net/netfilter if ((ipvs->sync_state & IP_VS_STATE_MASTER) && cp->protocol == IPPROTO_SCTP) { -diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c ---- linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c +--- linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_ctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service ip_vs_rs_hash(ipvs, dest); write_unlock_bh(&ipvs->rs_lock); @@ -73934,9 +73934,9 @@ diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.8/net/netfilter/ NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)); NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold); NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold); -diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c ---- linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c +--- linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_sync.c 2011-11-12 12:47:14.000000000 -0500 @@ -648,7 +648,7 @@ control: * i.e only increment in_pkts for Templates. */ @@ -73955,9 +73955,9 @@ diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.8/net/netfilter cp->state = state; cp->old_state = cp->state; /* -diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/ipvs/ip_vs_xmit.c 2011-11-12 12:47:14.000000000 -0500 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str else rc = NF_ACCEPT; @@ -73976,9 +73976,9 @@ diff -urNp linux-3.0.8/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.8/net/netfilter goto out; } -diff -urNp linux-3.0.8/net/netfilter/Kconfig linux-3.0.8/net/netfilter/Kconfig ---- linux-3.0.8/net/netfilter/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/Kconfig 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/Kconfig linux-3.0.9/net/netfilter/Kconfig +--- linux-3.0.9/net/netfilter/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP To compile it as a module, choose M here. If unsure, say N. @@ -73996,9 +73996,9 @@ diff -urNp linux-3.0.8/net/netfilter/Kconfig linux-3.0.8/net/netfilter/Kconfig config NETFILTER_XT_MATCH_HASHLIMIT tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) -diff -urNp linux-3.0.8/net/netfilter/Makefile linux-3.0.8/net/netfilter/Makefile ---- linux-3.0.8/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/Makefile linux-3.0.9/net/netfilter/Makefile +--- linux-3.0.9/net/netfilter/Makefile 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/Makefile 2011-11-12 12:47:14.000000000 -0500 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o @@ -74007,9 +74007,9 @@ diff -urNp linux-3.0.8/net/netfilter/Makefile linux-3.0.8/net/netfilter/Makefile obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o -diff -urNp linux-3.0.8/net/netfilter/nfnetlink_log.c linux-3.0.8/net/netfilter/nfnetlink_log.c ---- linux-3.0.8/net/netfilter/nfnetlink_log.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/nfnetlink_log.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/nfnetlink_log.c linux-3.0.9/net/netfilter/nfnetlink_log.c +--- linux-3.0.9/net/netfilter/nfnetlink_log.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/nfnetlink_log.c 2011-11-12 12:47:14.000000000 -0500 @@ -70,7 +70,7 @@ struct nfulnl_instance { }; @@ -74028,9 +74028,9 @@ diff -urNp linux-3.0.8/net/netfilter/nfnetlink_log.c linux-3.0.8/net/netfilter/n if (data_len) { struct nlattr *nla; -diff -urNp linux-3.0.8/net/netfilter/nfnetlink_queue.c linux-3.0.8/net/netfilter/nfnetlink_queue.c ---- linux-3.0.8/net/netfilter/nfnetlink_queue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/nfnetlink_queue.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/nfnetlink_queue.c linux-3.0.9/net/netfilter/nfnetlink_queue.c +--- linux-3.0.9/net/netfilter/nfnetlink_queue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/nfnetlink_queue.c 2011-11-12 12:47:14.000000000 -0500 @@ -58,7 +58,7 @@ struct nfqnl_instance { */ spinlock_t lock; @@ -74058,9 +74058,9 @@ diff -urNp linux-3.0.8/net/netfilter/nfnetlink_queue.c linux-3.0.8/net/netfilter } static const struct seq_operations nfqnl_seq_ops = { -diff -urNp linux-3.0.8/net/netfilter/xt_gradm.c linux-3.0.8/net/netfilter/xt_gradm.c ---- linux-3.0.8/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/net/netfilter/xt_gradm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/xt_gradm.c linux-3.0.9/net/netfilter/xt_gradm.c +--- linux-3.0.9/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/net/netfilter/xt_gradm.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,51 @@ +/* + * gradm match for netfilter @@ -74113,9 +74113,9 @@ diff -urNp linux-3.0.8/net/netfilter/xt_gradm.c linux-3.0.8/net/netfilter/xt_gra +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_gradm"); +MODULE_ALIAS("ip6t_gradm"); -diff -urNp linux-3.0.8/net/netfilter/xt_statistic.c linux-3.0.8/net/netfilter/xt_statistic.c ---- linux-3.0.8/net/netfilter/xt_statistic.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netfilter/xt_statistic.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netfilter/xt_statistic.c linux-3.0.9/net/netfilter/xt_statistic.c +--- linux-3.0.9/net/netfilter/xt_statistic.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netfilter/xt_statistic.c 2011-11-12 12:47:14.000000000 -0500 @@ -18,7 +18,7 @@ #include <linux/netfilter/x_tables.h> @@ -74146,9 +74146,9 @@ diff -urNp linux-3.0.8/net/netfilter/xt_statistic.c linux-3.0.8/net/netfilter/xt return 0; } -diff -urNp linux-3.0.8/net/netlink/af_netlink.c linux-3.0.8/net/netlink/af_netlink.c ---- linux-3.0.8/net/netlink/af_netlink.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netlink/af_netlink.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/netlink/af_netlink.c linux-3.0.9/net/netlink/af_netlink.c +--- linux-3.0.9/net/netlink/af_netlink.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netlink/af_netlink.c 2011-11-12 12:47:14.000000000 -0500 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock sk->sk_error_report(sk); } @@ -74167,9 +74167,9 @@ diff -urNp linux-3.0.8/net/netlink/af_netlink.c linux-3.0.8/net/netlink/af_netli sock_i_ino(s) ); -diff -urNp linux-3.0.8/net/netrom/af_netrom.c linux-3.0.8/net/netrom/af_netrom.c ---- linux-3.0.8/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/netrom/af_netrom.c linux-3.0.9/net/netrom/af_netrom.c +--- linux-3.0.9/net/netrom/af_netrom.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/netrom/af_netrom.c 2011-11-12 12:47:14.000000000 -0500 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc struct sock *sk = sock->sk; struct nr_sock *nr = nr_sk(sk); @@ -74186,10 +74186,10 @@ diff -urNp linux-3.0.8/net/netrom/af_netrom.c linux-3.0.8/net/netrom/af_netrom.c sax->fsa_ax25.sax25_call = nr->source_addr; *uaddr_len = sizeof(struct sockaddr_ax25); } -diff -urNp linux-3.0.8/net/packet/af_packet.c linux-3.0.8/net/packet/af_packet.c ---- linux-3.0.8/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400 -@@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk +diff -urNp linux-3.0.9/net/packet/af_packet.c linux-3.0.9/net/packet/af_packet.c +--- linux-3.0.9/net/packet/af_packet.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/packet/af_packet.c 2011-11-12 13:05:59.000000000 -0500 +@@ -647,7 +647,7 @@ static int packet_rcv(struct sk_buff *sk spin_lock(&sk->sk_receive_queue.lock); po->stats.tp_packets++; @@ -74198,15 +74198,16 @@ diff -urNp linux-3.0.8/net/packet/af_packet.c linux-3.0.8/net/packet/af_packet.c __skb_queue_tail(&sk->sk_receive_queue, skb); spin_unlock(&sk->sk_receive_queue.lock); sk->sk_data_ready(sk, skb->len); - return 0; - +@@ -656,7 +656,7 @@ static int packet_rcv(struct sk_buff *sk drop_n_acct: -- po->stats.tp_drops = atomic_inc_return(&sk->sk_drops); -+ po->stats.tp_drops = atomic_inc_return_unchecked(&sk->sk_drops); + spin_lock(&sk->sk_receive_queue.lock); + po->stats.tp_drops++; +- atomic_inc(&sk->sk_drops); ++ atomic_inc_unchecked(&sk->sk_drops); + spin_unlock(&sk->sk_receive_queue.lock); drop_n_restore: - if (skb_head != skb->data && skb_shared(skb)) { -@@ -2168,7 +2168,7 @@ static int packet_getsockopt(struct sock +@@ -2171,7 +2171,7 @@ static int packet_getsockopt(struct sock case PACKET_HDRLEN: if (len > sizeof(int)) len = sizeof(int); @@ -74215,7 +74216,7 @@ diff -urNp linux-3.0.8/net/packet/af_packet.c linux-3.0.8/net/packet/af_packet.c return -EFAULT; switch (val) { case TPACKET_V1: -@@ -2206,7 +2206,7 @@ static int packet_getsockopt(struct sock +@@ -2209,7 +2209,7 @@ static int packet_getsockopt(struct sock if (put_user(len, optlen)) return -EFAULT; @@ -74224,9 +74225,9 @@ diff -urNp linux-3.0.8/net/packet/af_packet.c linux-3.0.8/net/packet/af_packet.c return -EFAULT; return 0; } -diff -urNp linux-3.0.8/net/phonet/af_phonet.c linux-3.0.8/net/phonet/af_phonet.c ---- linux-3.0.8/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/phonet/af_phonet.c linux-3.0.9/net/phonet/af_phonet.c +--- linux-3.0.9/net/phonet/af_phonet.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/phonet/af_phonet.c 2011-11-12 12:47:14.000000000 -0500 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr { struct phonet_protocol *pp; @@ -74245,9 +74246,9 @@ diff -urNp linux-3.0.8/net/phonet/af_phonet.c linux-3.0.8/net/phonet/af_phonet.c return -EINVAL; err = proto_register(pp->prot, 1); -diff -urNp linux-3.0.8/net/phonet/pep.c linux-3.0.8/net/phonet/pep.c ---- linux-3.0.8/net/phonet/pep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/phonet/pep.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/phonet/pep.c linux-3.0.9/net/phonet/pep.c +--- linux-3.0.9/net/phonet/pep.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/phonet/pep.c 2011-11-12 12:47:14.000000000 -0500 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, case PNS_PEP_CTRL_REQ: @@ -74275,9 +74276,9 @@ diff -urNp linux-3.0.8/net/phonet/pep.c linux-3.0.8/net/phonet/pep.c err = NET_RX_DROP; break; } -diff -urNp linux-3.0.8/net/phonet/socket.c linux-3.0.8/net/phonet/socket.c ---- linux-3.0.8/net/phonet/socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/phonet/socket.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/phonet/socket.c linux-3.0.9/net/phonet/socket.c +--- linux-3.0.9/net/phonet/socket.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/phonet/socket.c 2011-11-12 12:47:14.000000000 -0500 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f pn->resource, sk->sk_state, sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk), @@ -74294,9 +74295,9 @@ diff -urNp linux-3.0.8/net/phonet/socket.c linux-3.0.8/net/phonet/socket.c } seq_printf(seq, "%*s\n", 127 - len, ""); return 0; -diff -urNp linux-3.0.8/net/rds/cong.c linux-3.0.8/net/rds/cong.c ---- linux-3.0.8/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/cong.c linux-3.0.9/net/rds/cong.c +--- linux-3.0.9/net/rds/cong.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/cong.c 2011-11-12 12:47:14.000000000 -0500 @@ -77,7 +77,7 @@ * finds that the saved generation number is smaller than the global generation * number, it wakes up the process. @@ -74324,9 +74325,9 @@ diff -urNp linux-3.0.8/net/rds/cong.c linux-3.0.8/net/rds/cong.c if (likely(*recent == gen)) return 0; -diff -urNp linux-3.0.8/net/rds/ib_cm.c linux-3.0.8/net/rds/ib_cm.c ---- linux-3.0.8/net/rds/ib_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/ib_cm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/ib_cm.c linux-3.0.9/net/rds/ib_cm.c +--- linux-3.0.9/net/rds/ib_cm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/ib_cm.c 2011-11-12 12:47:14.000000000 -0500 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -74336,9 +74337,9 @@ diff -urNp linux-3.0.8/net/rds/ib_cm.c linux-3.0.8/net/rds/ib_cm.c #else ic->i_ack_next = 0; #endif -diff -urNp linux-3.0.8/net/rds/ib.h linux-3.0.8/net/rds/ib.h ---- linux-3.0.8/net/rds/ib.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/ib.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/ib.h linux-3.0.9/net/rds/ib.h +--- linux-3.0.9/net/rds/ib.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/ib.h 2011-11-12 12:47:14.000000000 -0500 @@ -127,7 +127,7 @@ struct rds_ib_connection { /* sending acks */ unsigned long i_ack_flags; @@ -74348,9 +74349,9 @@ diff -urNp linux-3.0.8/net/rds/ib.h linux-3.0.8/net/rds/ib.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-3.0.8/net/rds/ib_recv.c linux-3.0.8/net/rds/ib_recv.c ---- linux-3.0.8/net/rds/ib_recv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/ib_recv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/ib_recv.c linux-3.0.9/net/rds/ib_recv.c +--- linux-3.0.9/net/rds/ib_recv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/ib_recv.c 2011-11-12 12:47:14.000000000 -0500 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_ static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq, int ack_required) @@ -74369,9 +74370,9 @@ diff -urNp linux-3.0.8/net/rds/ib_recv.c linux-3.0.8/net/rds/ib_recv.c } #endif -diff -urNp linux-3.0.8/net/rds/iw_cm.c linux-3.0.8/net/rds/iw_cm.c ---- linux-3.0.8/net/rds/iw_cm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/iw_cm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/iw_cm.c linux-3.0.9/net/rds/iw_cm.c +--- linux-3.0.9/net/rds/iw_cm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/iw_cm.c 2011-11-12 12:47:14.000000000 -0500 @@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); @@ -74381,9 +74382,9 @@ diff -urNp linux-3.0.8/net/rds/iw_cm.c linux-3.0.8/net/rds/iw_cm.c #else ic->i_ack_next = 0; #endif -diff -urNp linux-3.0.8/net/rds/iw.h linux-3.0.8/net/rds/iw.h ---- linux-3.0.8/net/rds/iw.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/iw.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/iw.h linux-3.0.9/net/rds/iw.h +--- linux-3.0.9/net/rds/iw.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/iw.h 2011-11-12 12:47:14.000000000 -0500 @@ -133,7 +133,7 @@ struct rds_iw_connection { /* sending acks */ unsigned long i_ack_flags; @@ -74393,9 +74394,9 @@ diff -urNp linux-3.0.8/net/rds/iw.h linux-3.0.8/net/rds/iw.h #else spinlock_t i_ack_lock; /* protect i_ack_next */ u64 i_ack_next; /* next ACK to send */ -diff -urNp linux-3.0.8/net/rds/iw_rdma.c linux-3.0.8/net/rds/iw_rdma.c ---- linux-3.0.8/net/rds/iw_rdma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/iw_rdma.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/iw_rdma.c linux-3.0.9/net/rds/iw_rdma.c +--- linux-3.0.9/net/rds/iw_rdma.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/iw_rdma.c 2011-11-12 12:47:14.000000000 -0500 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de struct rdma_cm_id *pcm_id; int rc; @@ -74405,9 +74406,9 @@ diff -urNp linux-3.0.8/net/rds/iw_rdma.c linux-3.0.8/net/rds/iw_rdma.c src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr; dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr; -diff -urNp linux-3.0.8/net/rds/iw_recv.c linux-3.0.8/net/rds/iw_recv.c ---- linux-3.0.8/net/rds/iw_recv.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/iw_recv.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/iw_recv.c linux-3.0.9/net/rds/iw_recv.c +--- linux-3.0.9/net/rds/iw_recv.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/iw_recv.c 2011-11-12 12:47:14.000000000 -0500 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_ static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq, int ack_required) @@ -74426,9 +74427,9 @@ diff -urNp linux-3.0.8/net/rds/iw_recv.c linux-3.0.8/net/rds/iw_recv.c } #endif -diff -urNp linux-3.0.8/net/rds/tcp.c linux-3.0.8/net/rds/tcp.c ---- linux-3.0.8/net/rds/tcp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/tcp.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/tcp.c linux-3.0.9/net/rds/tcp.c +--- linux-3.0.9/net/rds/tcp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/tcp.c 2011-11-12 12:47:14.000000000 -0500 @@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock int val = 1; @@ -74438,9 +74439,9 @@ diff -urNp linux-3.0.8/net/rds/tcp.c linux-3.0.8/net/rds/tcp.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-3.0.8/net/rds/tcp_send.c linux-3.0.8/net/rds/tcp_send.c ---- linux-3.0.8/net/rds/tcp_send.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rds/tcp_send.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/rds/tcp_send.c linux-3.0.9/net/rds/tcp_send.c +--- linux-3.0.9/net/rds/tcp_send.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rds/tcp_send.c 2011-11-12 12:47:14.000000000 -0500 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket * oldfs = get_fs(); @@ -74450,9 +74451,9 @@ diff -urNp linux-3.0.8/net/rds/tcp_send.c linux-3.0.8/net/rds/tcp_send.c sizeof(val)); set_fs(oldfs); } -diff -urNp linux-3.0.8/net/rxrpc/af_rxrpc.c linux-3.0.8/net/rxrpc/af_rxrpc.c ---- linux-3.0.8/net/rxrpc/af_rxrpc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/af_rxrpc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/af_rxrpc.c linux-3.0.9/net/rxrpc/af_rxrpc.c +--- linux-3.0.9/net/rxrpc/af_rxrpc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/af_rxrpc.c 2011-11-12 12:47:14.000000000 -0500 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ __be32 rxrpc_epoch; @@ -74462,9 +74463,9 @@ diff -urNp linux-3.0.8/net/rxrpc/af_rxrpc.c linux-3.0.8/net/rxrpc/af_rxrpc.c /* count of skbs currently in use */ atomic_t rxrpc_n_skbs; -diff -urNp linux-3.0.8/net/rxrpc/ar-ack.c linux-3.0.8/net/rxrpc/ar-ack.c ---- linux-3.0.8/net/rxrpc/ar-ack.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-ack.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-ack.c linux-3.0.9/net/rxrpc/ar-ack.c +--- linux-3.0.9/net/rxrpc/ar-ack.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-ack.c 2011-11-12 12:47:14.000000000 -0500 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca _enter("{%d,%d,%d,%d},", @@ -74537,9 +74538,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-ack.c linux-3.0.8/net/rxrpc/ar-ack.c _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial)); send_message_2: -diff -urNp linux-3.0.8/net/rxrpc/ar-call.c linux-3.0.8/net/rxrpc/ar-call.c ---- linux-3.0.8/net/rxrpc/ar-call.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-call.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-call.c linux-3.0.9/net/rxrpc/ar-call.c +--- linux-3.0.9/net/rxrpc/ar-call.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-call.c 2011-11-12 12:47:14.000000000 -0500 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca spin_lock_init(&call->lock); rwlock_init(&call->state_lock); @@ -74549,9 +74550,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-call.c linux-3.0.8/net/rxrpc/ar-call.c call->state = RXRPC_CALL_CLIENT_SEND_REQUEST; memset(&call->sock_node, 0xed, sizeof(call->sock_node)); -diff -urNp linux-3.0.8/net/rxrpc/ar-connection.c linux-3.0.8/net/rxrpc/ar-connection.c ---- linux-3.0.8/net/rxrpc/ar-connection.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-connection.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-connection.c linux-3.0.9/net/rxrpc/ar-connection.c +--- linux-3.0.9/net/rxrpc/ar-connection.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-connection.c 2011-11-12 12:47:14.000000000 -0500 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al rwlock_init(&conn->lock); spin_lock_init(&conn->state_lock); @@ -74561,9 +74562,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-connection.c linux-3.0.8/net/rxrpc/ar-connec conn->avail_calls = RXRPC_MAXCALLS; conn->size_align = 4; conn->header_size = sizeof(struct rxrpc_header); -diff -urNp linux-3.0.8/net/rxrpc/ar-connevent.c linux-3.0.8/net/rxrpc/ar-connevent.c ---- linux-3.0.8/net/rxrpc/ar-connevent.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-connevent.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-connevent.c linux-3.0.9/net/rxrpc/ar-connevent.c +--- linux-3.0.9/net/rxrpc/ar-connevent.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-connevent.c 2011-11-12 12:47:14.000000000 -0500 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct len = iov[0].iov_len + iov[1].iov_len; @@ -74573,9 +74574,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-connevent.c linux-3.0.8/net/rxrpc/ar-conneve _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len); -diff -urNp linux-3.0.8/net/rxrpc/ar-input.c linux-3.0.8/net/rxrpc/ar-input.c ---- linux-3.0.8/net/rxrpc/ar-input.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-input.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-input.c linux-3.0.9/net/rxrpc/ar-input.c +--- linux-3.0.9/net/rxrpc/ar-input.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-input.c 2011-11-12 12:47:14.000000000 -0500 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx /* track the latest serial number on this connection for ACK packet * information */ @@ -74588,9 +74589,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-input.c linux-3.0.8/net/rxrpc/ar-input.c serial); /* request ACK generation for any ACK or DATA packet that requests -diff -urNp linux-3.0.8/net/rxrpc/ar-internal.h linux-3.0.8/net/rxrpc/ar-internal.h ---- linux-3.0.8/net/rxrpc/ar-internal.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-internal.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-internal.h linux-3.0.9/net/rxrpc/ar-internal.h +--- linux-3.0.9/net/rxrpc/ar-internal.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-internal.h 2011-11-12 12:47:14.000000000 -0500 @@ -272,8 +272,8 @@ struct rxrpc_connection { int error; /* error code for local abort */ int debug_id; /* debug ID for printks */ @@ -74620,9 +74621,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-internal.h linux-3.0.8/net/rxrpc/ar-internal extern struct workqueue_struct *rxrpc_workqueue; /* -diff -urNp linux-3.0.8/net/rxrpc/ar-local.c linux-3.0.8/net/rxrpc/ar-local.c ---- linux-3.0.8/net/rxrpc/ar-local.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-local.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-local.c linux-3.0.9/net/rxrpc/ar-local.c +--- linux-3.0.9/net/rxrpc/ar-local.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-local.c 2011-11-12 12:47:14.000000000 -0500 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st spin_lock_init(&local->lock); rwlock_init(&local->services_lock); @@ -74632,9 +74633,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-local.c linux-3.0.8/net/rxrpc/ar-local.c memcpy(&local->srx, srx, sizeof(*srx)); } -diff -urNp linux-3.0.8/net/rxrpc/ar-output.c linux-3.0.8/net/rxrpc/ar-output.c ---- linux-3.0.8/net/rxrpc/ar-output.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-output.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-output.c linux-3.0.9/net/rxrpc/ar-output.c +--- linux-3.0.9/net/rxrpc/ar-output.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-output.c 2011-11-12 12:47:14.000000000 -0500 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb sp->hdr.cid = call->cid; sp->hdr.callNumber = call->call_id; @@ -74647,9 +74648,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-output.c linux-3.0.8/net/rxrpc/ar-output.c sp->hdr.type = RXRPC_PACKET_TYPE_DATA; sp->hdr.userStatus = 0; sp->hdr.securityIndex = conn->security_ix; -diff -urNp linux-3.0.8/net/rxrpc/ar-peer.c linux-3.0.8/net/rxrpc/ar-peer.c ---- linux-3.0.8/net/rxrpc/ar-peer.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-peer.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-peer.c linux-3.0.9/net/rxrpc/ar-peer.c +--- linux-3.0.9/net/rxrpc/ar-peer.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-peer.c 2011-11-12 12:47:14.000000000 -0500 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe INIT_LIST_HEAD(&peer->error_targets); spin_lock_init(&peer->lock); @@ -74659,9 +74660,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-peer.c linux-3.0.8/net/rxrpc/ar-peer.c memcpy(&peer->srx, srx, sizeof(*srx)); rxrpc_assess_MTU_size(peer); -diff -urNp linux-3.0.8/net/rxrpc/ar-proc.c linux-3.0.8/net/rxrpc/ar-proc.c ---- linux-3.0.8/net/rxrpc/ar-proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-proc.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-proc.c linux-3.0.9/net/rxrpc/ar-proc.c +--- linux-3.0.9/net/rxrpc/ar-proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str atomic_read(&conn->usage), rxrpc_conn_states[conn->state], @@ -74673,9 +74674,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-proc.c linux-3.0.8/net/rxrpc/ar-proc.c return 0; } -diff -urNp linux-3.0.8/net/rxrpc/ar-transport.c linux-3.0.8/net/rxrpc/ar-transport.c ---- linux-3.0.8/net/rxrpc/ar-transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/ar-transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/ar-transport.c linux-3.0.9/net/rxrpc/ar-transport.c +--- linux-3.0.9/net/rxrpc/ar-transport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/ar-transport.c 2011-11-12 12:47:14.000000000 -0500 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all spin_lock_init(&trans->client_lock); rwlock_init(&trans->conn_lock); @@ -74685,9 +74686,9 @@ diff -urNp linux-3.0.8/net/rxrpc/ar-transport.c linux-3.0.8/net/rxrpc/ar-transpo if (peer->srx.transport.family == AF_INET) { switch (peer->srx.transport_type) { -diff -urNp linux-3.0.8/net/rxrpc/rxkad.c linux-3.0.8/net/rxrpc/rxkad.c ---- linux-3.0.8/net/rxrpc/rxkad.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/rxrpc/rxkad.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/rxrpc/rxkad.c linux-3.0.9/net/rxrpc/rxkad.c +--- linux-3.0.9/net/rxrpc/rxkad.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/rxrpc/rxkad.c 2011-11-12 12:47:14.000000000 -0500 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c u16 check; int nsg; @@ -74724,9 +74725,9 @@ diff -urNp linux-3.0.8/net/rxrpc/rxkad.c linux-3.0.8/net/rxrpc/rxkad.c _proto("Tx RESPONSE %%%u", ntohl(hdr->serial)); ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); -diff -urNp linux-3.0.8/net/sctp/proc.c linux-3.0.8/net/sctp/proc.c ---- linux-3.0.8/net/sctp/proc.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sctp/proc.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/sctp/proc.c linux-3.0.9/net/sctp/proc.c +--- linux-3.0.9/net/sctp/proc.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sctp/proc.c 2011-11-12 12:47:14.000000000 -0500 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s seq_printf(seq, "%8pK %8pK %-3d %-3d %-2d %-4d " @@ -74737,9 +74738,9 @@ diff -urNp linux-3.0.8/net/sctp/proc.c linux-3.0.8/net/sctp/proc.c assoc->state, hash, assoc->assoc_id, assoc->sndbuf_used, -diff -urNp linux-3.0.8/net/sctp/socket.c linux-3.0.8/net/sctp/socket.c ---- linux-3.0.8/net/sctp/socket.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sctp/socket.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sctp/socket.c linux-3.0.9/net/sctp/socket.c +--- linux-3.0.9/net/sctp/socket.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sctp/socket.c 2011-11-12 12:47:14.000000000 -0500 @@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) @@ -74749,9 +74750,9 @@ diff -urNp linux-3.0.8/net/sctp/socket.c linux-3.0.8/net/sctp/socket.c return -EFAULT; to += addrlen; cnt++; -diff -urNp linux-3.0.8/net/socket.c linux-3.0.8/net/socket.c ---- linux-3.0.8/net/socket.c 2011-10-24 08:05:30.000000000 -0400 -+++ linux-3.0.8/net/socket.c 2011-10-16 21:55:28.000000000 -0400 +diff -urNp linux-3.0.9/net/socket.c linux-3.0.9/net/socket.c +--- linux-3.0.9/net/socket.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/socket.c 2011-11-12 12:47:14.000000000 -0500 @@ -88,6 +88,7 @@ #include <linux/nsproxy.h> #include <linux/magic.h> @@ -75019,9 +75020,9 @@ diff -urNp linux-3.0.8/net/socket.c linux-3.0.8/net/socket.c set_fs(KERNEL_DS); if (level == SOL_SOCKET) -diff -urNp linux-3.0.8/net/sunrpc/sched.c linux-3.0.8/net/sunrpc/sched.c ---- linux-3.0.8/net/sunrpc/sched.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/sched.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/sched.c linux-3.0.9/net/sunrpc/sched.c +--- linux-3.0.9/net/sunrpc/sched.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/sched.c 2011-11-12 12:47:14.000000000 -0500 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w #ifdef RPC_DEBUG static void rpc_task_set_debuginfo(struct rpc_task *task) @@ -75034,9 +75035,9 @@ diff -urNp linux-3.0.8/net/sunrpc/sched.c linux-3.0.8/net/sunrpc/sched.c } #else static inline void rpc_task_set_debuginfo(struct rpc_task *task) -diff -urNp linux-3.0.8/net/sunrpc/svcsock.c linux-3.0.8/net/sunrpc/svcsock.c ---- linux-3.0.8/net/sunrpc/svcsock.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/svcsock.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/svcsock.c linux-3.0.9/net/sunrpc/svcsock.c +--- linux-3.0.9/net/sunrpc/svcsock.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/svcsock.c 2011-11-12 12:47:14.000000000 -0500 @@ -392,7 +392,7 @@ static int svc_partial_recvfrom(struct s int buflen, unsigned int base) { @@ -75046,9 +75047,9 @@ diff -urNp linux-3.0.8/net/sunrpc/svcsock.c linux-3.0.8/net/sunrpc/svcsock.c unsigned int i; int ret; -diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c ---- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c +--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma.c 2011-11-12 12:47:14.000000000 -0500 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR static unsigned int min_max_inline = 4096; static unsigned int max_max_inline = 65536; @@ -75156,9 +75157,9 @@ diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.8/net/sunrpc/xpr .mode = 0644, .proc_handler = read_reset_stat, }, -diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c ---- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2011-11-12 12:47:14.000000000 -0500 @@ -499,7 +499,7 @@ next_sge: svc_rdma_put_context(ctxt, 0); goto out; @@ -75186,9 +75187,9 @@ diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.8/net/s /* Build up the XDR from the receive buffers. */ rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len); -diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c ---- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c +--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2011-11-12 12:47:14.000000000 -0500 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm write_wr.wr.rdma.remote_addr = to; @@ -75198,9 +75199,9 @@ diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.8/net/sun if (svc_rdma_send(xprt, &write_wr)) goto err; return 0; -diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c ---- linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c +--- linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sunrpc/xprtrdma/svc_rdma_transport.c 2011-11-12 12:47:14.000000000 -0500 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd return; @@ -75246,9 +75247,9 @@ diff -urNp linux-3.0.8/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.8/net/ /* See if we can opportunistically reap SQ WR to make room */ sq_cq_reap(xprt); -diff -urNp linux-3.0.8/net/sysctl_net.c linux-3.0.8/net/sysctl_net.c ---- linux-3.0.8/net/sysctl_net.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/sysctl_net.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/sysctl_net.c linux-3.0.9/net/sysctl_net.c +--- linux-3.0.9/net/sysctl_net.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/sysctl_net.c 2011-11-12 12:47:14.000000000 -0500 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -75258,9 +75259,9 @@ diff -urNp linux-3.0.8/net/sysctl_net.c linux-3.0.8/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-3.0.8/net/tipc/link.c linux-3.0.8/net/tipc/link.c ---- linux-3.0.8/net/tipc/link.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/tipc/link.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/tipc/link.c linux-3.0.9/net/tipc/link.c +--- linux-3.0.9/net/tipc/link.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/tipc/link.c 2011-11-12 12:47:14.000000000 -0500 @@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc struct tipc_msg fragm_hdr; struct sk_buff *buf, *buf_chain, *prev; @@ -75288,9 +75289,9 @@ diff -urNp linux-3.0.8/net/tipc/link.c linux-3.0.8/net/tipc/link.c sect_crs += sz; sect_rest -= sz; fragm_crs += sz; -diff -urNp linux-3.0.8/net/tipc/msg.c linux-3.0.8/net/tipc/msg.c ---- linux-3.0.8/net/tipc/msg.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/tipc/msg.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/tipc/msg.c linux-3.0.9/net/tipc/msg.c +--- linux-3.0.9/net/tipc/msg.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/tipc/msg.c 2011-11-12 12:47:14.000000000 -0500 @@ -101,7 +101,7 @@ int tipc_msg_build(struct tipc_msg *hdr, msg_sect[cnt].iov_len); else @@ -75300,9 +75301,9 @@ diff -urNp linux-3.0.8/net/tipc/msg.c linux-3.0.8/net/tipc/msg.c msg_sect[cnt].iov_len); pos += msg_sect[cnt].iov_len; } -diff -urNp linux-3.0.8/net/tipc/subscr.c linux-3.0.8/net/tipc/subscr.c ---- linux-3.0.8/net/tipc/subscr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/tipc/subscr.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/net/tipc/subscr.c linux-3.0.9/net/tipc/subscr.c +--- linux-3.0.9/net/tipc/subscr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/tipc/subscr.c 2011-11-12 12:47:14.000000000 -0500 @@ -101,7 +101,7 @@ static void subscr_send_event(struct sub { struct iovec msg_sect; @@ -75312,9 +75313,9 @@ diff -urNp linux-3.0.8/net/tipc/subscr.c linux-3.0.8/net/tipc/subscr.c msg_sect.iov_len = sizeof(struct tipc_event); sub->evt.event = htohl(event, sub->swap); -diff -urNp linux-3.0.8/net/unix/af_unix.c linux-3.0.8/net/unix/af_unix.c ---- linux-3.0.8/net/unix/af_unix.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/unix/af_unix.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/unix/af_unix.c linux-3.0.9/net/unix/af_unix.c +--- linux-3.0.9/net/unix/af_unix.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/unix/af_unix.c 2011-11-12 12:47:14.000000000 -0500 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -75361,9 +75362,9 @@ diff -urNp linux-3.0.8/net/unix/af_unix.c linux-3.0.8/net/unix/af_unix.c mutex_unlock(&nd.path.dentry->d_inode->i_mutex); dput(nd.path.dentry); nd.path.dentry = dentry; -diff -urNp linux-3.0.8/net/wireless/core.h linux-3.0.8/net/wireless/core.h ---- linux-3.0.8/net/wireless/core.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/wireless/core.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/wireless/core.h linux-3.0.9/net/wireless/core.h +--- linux-3.0.9/net/wireless/core.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/wireless/core.h 2011-11-12 12:47:14.000000000 -0500 @@ -27,7 +27,7 @@ struct cfg80211_registered_device { struct mutex mtx; @@ -75373,9 +75374,9 @@ diff -urNp linux-3.0.8/net/wireless/core.h linux-3.0.8/net/wireless/core.h struct rfkill *rfkill; struct work_struct rfkill_sync; -diff -urNp linux-3.0.8/net/wireless/wext-core.c linux-3.0.8/net/wireless/wext-core.c ---- linux-3.0.8/net/wireless/wext-core.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/wireless/wext-core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/wireless/wext-core.c linux-3.0.9/net/wireless/wext-core.c +--- linux-3.0.9/net/wireless/wext-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/wireless/wext-core.c 2011-11-12 12:47:14.000000000 -0500 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc */ @@ -75409,9 +75410,9 @@ diff -urNp linux-3.0.8/net/wireless/wext-core.c linux-3.0.8/net/wireless/wext-co err = handler(dev, info, (union iwreq_data *) iwp, extra); iwp->length += essid_compat; -diff -urNp linux-3.0.8/net/xfrm/xfrm_policy.c linux-3.0.8/net/xfrm/xfrm_policy.c ---- linux-3.0.8/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/net/xfrm/xfrm_policy.c linux-3.0.9/net/xfrm/xfrm_policy.c +--- linux-3.0.9/net/xfrm/xfrm_policy.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/xfrm/xfrm_policy.c 2011-11-12 12:47:14.000000000 -0500 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm { policy->walk.dead = 1; @@ -75484,9 +75485,9 @@ diff -urNp linux-3.0.8/net/xfrm/xfrm_policy.c linux-3.0.8/net/xfrm/xfrm_policy.c } } -diff -urNp linux-3.0.8/net/xfrm/xfrm_user.c linux-3.0.8/net/xfrm/xfrm_user.c ---- linux-3.0.8/net/xfrm/xfrm_user.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/net/xfrm/xfrm_user.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/net/xfrm/xfrm_user.c linux-3.0.9/net/xfrm/xfrm_user.c +--- linux-3.0.9/net/xfrm/xfrm_user.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/net/xfrm/xfrm_user.c 2011-11-12 12:47:14.000000000 -0500 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH]; int i; @@ -75505,9 +75506,9 @@ diff -urNp linux-3.0.8/net/xfrm/xfrm_user.c linux-3.0.8/net/xfrm/xfrm_user.c if (attrs[XFRMA_MIGRATE] == NULL) return -EINVAL; -diff -urNp linux-3.0.8/scripts/basic/fixdep.c linux-3.0.8/scripts/basic/fixdep.c ---- linux-3.0.8/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/basic/fixdep.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/scripts/basic/fixdep.c linux-3.0.9/scripts/basic/fixdep.c +--- linux-3.0.9/scripts/basic/fixdep.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/basic/fixdep.c 2011-11-12 12:47:14.000000000 -0500 @@ -161,7 +161,7 @@ static unsigned int strhash(const char * /* * Lookup a value in the configuration string. @@ -75551,15 +75552,15 @@ diff -urNp linux-3.0.8/scripts/basic/fixdep.c linux-3.0.8/scripts/basic/fixdep.c if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-3.0.8/scripts/gcc-plugin.sh linux-3.0.8/scripts/gcc-plugin.sh ---- linux-3.0.8/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/scripts/gcc-plugin.sh 2011-09-14 09:08:05.000000000 -0400 +diff -urNp linux-3.0.9/scripts/gcc-plugin.sh linux-3.0.9/scripts/gcc-plugin.sh +--- linux-3.0.9/scripts/gcc-plugin.sh 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/scripts/gcc-plugin.sh 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,2 @@ +#!/bin/sh +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y" -diff -urNp linux-3.0.8/scripts/Makefile.build linux-3.0.8/scripts/Makefile.build ---- linux-3.0.8/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/Makefile.build linux-3.0.9/scripts/Makefile.build +--- linux-3.0.9/scripts/Makefile.build 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/Makefile.build 2011-11-12 12:47:14.000000000 -0500 @@ -109,7 +109,7 @@ endif endif @@ -75569,9 +75570,9 @@ diff -urNp linux-3.0.8/scripts/Makefile.build linux-3.0.8/scripts/Makefile.build include scripts/Makefile.host endif -diff -urNp linux-3.0.8/scripts/Makefile.clean linux-3.0.8/scripts/Makefile.clean ---- linux-3.0.8/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/Makefile.clean linux-3.0.9/scripts/Makefile.clean +--- linux-3.0.9/scripts/Makefile.clean 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/Makefile.clean 2011-11-12 12:47:14.000000000 -0500 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subd __clean-files := $(extra-y) $(always) \ $(targets) $(clean-files) \ @@ -75582,9 +75583,9 @@ diff -urNp linux-3.0.8/scripts/Makefile.clean linux-3.0.8/scripts/Makefile.clean __clean-files := $(filter-out $(no-clean-files), $(__clean-files)) -diff -urNp linux-3.0.8/scripts/Makefile.host linux-3.0.8/scripts/Makefile.host ---- linux-3.0.8/scripts/Makefile.host 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/Makefile.host 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/Makefile.host linux-3.0.9/scripts/Makefile.host +--- linux-3.0.9/scripts/Makefile.host 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/Makefile.host 2011-11-12 12:47:14.000000000 -0500 @@ -31,6 +31,7 @@ # Note: Shared libraries consisting of C++ files are not supported @@ -75601,9 +75602,9 @@ diff -urNp linux-3.0.8/scripts/Makefile.host linux-3.0.8/scripts/Makefile.host # Remove .so files from "xxx-objs" host-cobjs := $(filter-out %.so,$(host-cobjs)) -diff -urNp linux-3.0.8/scripts/mod/file2alias.c linux-3.0.8/scripts/mod/file2alias.c ---- linux-3.0.8/scripts/mod/file2alias.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/mod/file2alias.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/scripts/mod/file2alias.c linux-3.0.9/scripts/mod/file2alias.c +--- linux-3.0.9/scripts/mod/file2alias.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/mod/file2alias.c 2011-11-12 12:47:14.000000000 -0500 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -75667,9 +75668,9 @@ diff -urNp linux-3.0.8/scripts/mod/file2alias.c linux-3.0.8/scripts/mod/file2ali sprintf(alias, "dmi*"); -diff -urNp linux-3.0.8/scripts/mod/modpost.c linux-3.0.8/scripts/mod/modpost.c ---- linux-3.0.8/scripts/mod/modpost.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/mod/modpost.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/mod/modpost.c linux-3.0.9/scripts/mod/modpost.c +--- linux-3.0.9/scripts/mod/modpost.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/mod/modpost.c 2011-11-12 12:47:14.000000000 -0500 @@ -892,6 +892,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, @@ -75746,9 +75747,9 @@ diff -urNp linux-3.0.8/scripts/mod/modpost.c linux-3.0.8/scripts/mod/modpost.c goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-3.0.8/scripts/mod/modpost.h linux-3.0.8/scripts/mod/modpost.h ---- linux-3.0.8/scripts/mod/modpost.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/mod/modpost.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/mod/modpost.h linux-3.0.9/scripts/mod/modpost.h +--- linux-3.0.9/scripts/mod/modpost.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/mod/modpost.h 2011-11-12 12:47:14.000000000 -0500 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -75768,9 +75769,9 @@ diff -urNp linux-3.0.8/scripts/mod/modpost.h linux-3.0.8/scripts/mod/modpost.h struct module { struct module *next; -diff -urNp linux-3.0.8/scripts/mod/sumversion.c linux-3.0.8/scripts/mod/sumversion.c ---- linux-3.0.8/scripts/mod/sumversion.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/mod/sumversion.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/mod/sumversion.c linux-3.0.9/scripts/mod/sumversion.c +--- linux-3.0.9/scripts/mod/sumversion.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/mod/sumversion.c 2011-11-12 12:47:14.000000000 -0500 @@ -470,7 +470,7 @@ static void write_version(const char *fi goto out; } @@ -75780,9 +75781,9 @@ diff -urNp linux-3.0.8/scripts/mod/sumversion.c linux-3.0.8/scripts/mod/sumversi warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-3.0.8/scripts/pnmtologo.c linux-3.0.8/scripts/pnmtologo.c ---- linux-3.0.8/scripts/pnmtologo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/scripts/pnmtologo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/scripts/pnmtologo.c linux-3.0.9/scripts/pnmtologo.c +--- linux-3.0.9/scripts/pnmtologo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/scripts/pnmtologo.c 2011-11-12 12:47:14.000000000 -0500 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -75809,9 +75810,9 @@ diff -urNp linux-3.0.8/scripts/pnmtologo.c linux-3.0.8/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-3.0.8/security/apparmor/lsm.c linux-3.0.8/security/apparmor/lsm.c ---- linux-3.0.8/security/apparmor/lsm.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/security/apparmor/lsm.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/apparmor/lsm.c linux-3.0.9/security/apparmor/lsm.c +--- linux-3.0.9/security/apparmor/lsm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/apparmor/lsm.c 2011-11-12 12:47:14.000000000 -0500 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc return error; } @@ -75821,9 +75822,9 @@ diff -urNp linux-3.0.8/security/apparmor/lsm.c linux-3.0.8/security/apparmor/lsm .name = "apparmor", .ptrace_access_check = apparmor_ptrace_access_check, -diff -urNp linux-3.0.8/security/commoncap.c linux-3.0.8/security/commoncap.c ---- linux-3.0.8/security/commoncap.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/commoncap.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/commoncap.c linux-3.0.9/security/commoncap.c +--- linux-3.0.9/security/commoncap.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/commoncap.c 2011-11-12 12:47:14.000000000 -0500 @@ -28,6 +28,7 @@ #include <linux/prctl.h> #include <linux/securebits.h> @@ -75851,9 +75852,9 @@ diff -urNp linux-3.0.8/security/commoncap.c linux-3.0.8/security/commoncap.c if (cred->uid != 0) { if (bprm->cap_effective) return 1; -diff -urNp linux-3.0.8/security/integrity/ima/ima_api.c linux-3.0.8/security/integrity/ima/ima_api.c ---- linux-3.0.8/security/integrity/ima/ima_api.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/integrity/ima/ima_api.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/integrity/ima/ima_api.c linux-3.0.9/security/integrity/ima/ima_api.c +--- linux-3.0.9/security/integrity/ima/ima_api.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/integrity/ima/ima_api.c 2011-11-12 12:47:14.000000000 -0500 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino int result; @@ -75863,9 +75864,9 @@ diff -urNp linux-3.0.8/security/integrity/ima/ima_api.c linux-3.0.8/security/int entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-3.0.8/security/integrity/ima/ima_fs.c linux-3.0.8/security/integrity/ima/ima_fs.c ---- linux-3.0.8/security/integrity/ima/ima_fs.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/integrity/ima/ima_fs.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/integrity/ima/ima_fs.c linux-3.0.9/security/integrity/ima/ima_fs.c +--- linux-3.0.9/security/integrity/ima/ima_fs.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/integrity/ima/ima_fs.c 2011-11-12 12:47:14.000000000 -0500 @@ -28,12 +28,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -75881,9 +75882,9 @@ diff -urNp linux-3.0.8/security/integrity/ima/ima_fs.c linux-3.0.8/security/inte return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-3.0.8/security/integrity/ima/ima.h linux-3.0.8/security/integrity/ima/ima.h ---- linux-3.0.8/security/integrity/ima/ima.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/integrity/ima/ima.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/integrity/ima/ima.h linux-3.0.9/security/integrity/ima/ima.h +--- linux-3.0.9/security/integrity/ima/ima.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/integrity/ima/ima.h 2011-11-12 12:47:14.000000000 -0500 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -75895,9 +75896,9 @@ diff -urNp linux-3.0.8/security/integrity/ima/ima.h linux-3.0.8/security/integri struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-3.0.8/security/integrity/ima/ima_queue.c linux-3.0.8/security/integrity/ima/ima_queue.c ---- linux-3.0.8/security/integrity/ima/ima_queue.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/integrity/ima/ima_queue.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/integrity/ima/ima_queue.c linux-3.0.9/security/integrity/ima/ima_queue.c +--- linux-3.0.9/security/integrity/ima/ima_queue.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/integrity/ima/ima_queue.c 2011-11-12 12:47:14.000000000 -0500 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i INIT_LIST_HEAD(&qe->later); list_add_tail_rcu(&qe->later, &ima_measurements); @@ -75907,9 +75908,9 @@ diff -urNp linux-3.0.8/security/integrity/ima/ima_queue.c linux-3.0.8/security/i key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-3.0.8/security/Kconfig linux-3.0.8/security/Kconfig ---- linux-3.0.8/security/Kconfig 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/Kconfig 2011-10-06 04:19:25.000000000 -0400 +diff -urNp linux-3.0.9/security/Kconfig linux-3.0.9/security/Kconfig +--- linux-3.0.9/security/Kconfig 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/Kconfig 2011-11-12 12:47:14.000000000 -0500 @@ -4,6 +4,558 @@ menu "Security options" @@ -76478,9 +76479,9 @@ diff -urNp linux-3.0.8/security/Kconfig linux-3.0.8/security/Kconfig default 65536 help This is the portion of low virtual memory which should be protected -diff -urNp linux-3.0.8/security/keys/compat.c linux-3.0.8/security/keys/compat.c ---- linux-3.0.8/security/keys/compat.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/keys/compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/security/keys/compat.c linux-3.0.9/security/keys/compat.c +--- linux-3.0.9/security/keys/compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/keys/compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov( if (ret == 0) goto no_payload_free; @@ -76490,9 +76491,9 @@ diff -urNp linux-3.0.8/security/keys/compat.c linux-3.0.8/security/keys/compat.c if (iov != iovstack) kfree(iov); -diff -urNp linux-3.0.8/security/keys/keyctl.c linux-3.0.8/security/keys/keyctl.c ---- linux-3.0.8/security/keys/keyctl.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/keys/keyctl.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/security/keys/keyctl.c linux-3.0.9/security/keys/keyctl.c +--- linux-3.0.9/security/keys/keyctl.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/keys/keyctl.c 2011-11-12 12:47:14.000000000 -0500 @@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str /* * Copy the iovec data from userspace @@ -76529,9 +76530,9 @@ diff -urNp linux-3.0.8/security/keys/keyctl.c linux-3.0.8/security/keys/keyctl.c if (iov != iovstack) kfree(iov); -diff -urNp linux-3.0.8/security/keys/keyring.c linux-3.0.8/security/keys/keyring.c ---- linux-3.0.8/security/keys/keyring.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/keys/keyring.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/keys/keyring.c linux-3.0.9/security/keys/keyring.c +--- linux-3.0.9/security/keys/keyring.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/keys/keyring.c 2011-11-12 12:47:14.000000000 -0500 @@ -215,15 +215,15 @@ static long keyring_read(const struct ke ret = -EFAULT; @@ -76551,9 +76552,9 @@ diff -urNp linux-3.0.8/security/keys/keyring.c linux-3.0.8/security/keys/keyring goto error; buflen -= tmp; -diff -urNp linux-3.0.8/security/min_addr.c linux-3.0.8/security/min_addr.c ---- linux-3.0.8/security/min_addr.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/min_addr.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/min_addr.c linux-3.0.9/security/min_addr.c +--- linux-3.0.9/security/min_addr.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/min_addr.c 2011-11-12 12:47:14.000000000 -0500 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -76570,9 +76571,9 @@ diff -urNp linux-3.0.8/security/min_addr.c linux-3.0.8/security/min_addr.c } /* -diff -urNp linux-3.0.8/security/security.c linux-3.0.8/security/security.c ---- linux-3.0.8/security/security.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/security.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/security.c linux-3.0.9/security/security.c +--- linux-3.0.9/security/security.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/security.c 2011-11-12 12:47:14.000000000 -0500 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI /* things that live in capability.c */ extern void __init security_fixup_ops(struct security_operations *ops); @@ -76594,9 +76595,9 @@ diff -urNp linux-3.0.8/security/security.c linux-3.0.8/security/security.c } /* Save user chosen LSM */ -diff -urNp linux-3.0.8/security/selinux/hooks.c linux-3.0.8/security/selinux/hooks.c ---- linux-3.0.8/security/selinux/hooks.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/selinux/hooks.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/selinux/hooks.c linux-3.0.9/security/selinux/hooks.c +--- linux-3.0.9/security/selinux/hooks.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/selinux/hooks.c 2011-11-12 12:47:14.000000000 -0500 @@ -93,7 +93,6 @@ #define NUM_SEL_MNT_OPTS 5 @@ -76614,9 +76615,9 @@ diff -urNp linux-3.0.8/security/selinux/hooks.c linux-3.0.8/security/selinux/hoo .name = "selinux", .ptrace_access_check = selinux_ptrace_access_check, -diff -urNp linux-3.0.8/security/selinux/include/xfrm.h linux-3.0.8/security/selinux/include/xfrm.h ---- linux-3.0.8/security/selinux/include/xfrm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/selinux/include/xfrm.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/selinux/include/xfrm.h linux-3.0.9/security/selinux/include/xfrm.h +--- linux-3.0.9/security/selinux/include/xfrm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/selinux/include/xfrm.h 2011-11-12 12:47:14.000000000 -0500 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s static inline void selinux_xfrm_notify_policyload(void) @@ -76626,9 +76627,9 @@ diff -urNp linux-3.0.8/security/selinux/include/xfrm.h linux-3.0.8/security/seli } #else static inline int selinux_xfrm_enabled(void) -diff -urNp linux-3.0.8/security/selinux/ss/services.c linux-3.0.8/security/selinux/ss/services.c ---- linux-3.0.8/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400 +diff -urNp linux-3.0.9/security/selinux/ss/services.c linux-3.0.9/security/selinux/ss/services.c +--- linux-3.0.9/security/selinux/ss/services.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/selinux/ss/services.c 2011-11-12 12:47:14.000000000 -0500 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz int rc = 0; struct policy_file file = { data, len }, *fp = &file; @@ -76638,9 +76639,9 @@ diff -urNp linux-3.0.8/security/selinux/ss/services.c linux-3.0.8/security/selin if (!ss_initialized) { avtab_cache_init(); rc = policydb_read(&policydb, fp); -diff -urNp linux-3.0.8/security/smack/smack_lsm.c linux-3.0.8/security/smack/smack_lsm.c ---- linux-3.0.8/security/smack/smack_lsm.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/smack/smack_lsm.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/smack/smack_lsm.c linux-3.0.9/security/smack/smack_lsm.c +--- linux-3.0.9/security/smack/smack_lsm.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/smack/smack_lsm.c 2011-11-12 12:47:14.000000000 -0500 @@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct return 0; } @@ -76650,9 +76651,9 @@ diff -urNp linux-3.0.8/security/smack/smack_lsm.c linux-3.0.8/security/smack/sma .name = "smack", .ptrace_access_check = smack_ptrace_access_check, -diff -urNp linux-3.0.8/security/tomoyo/tomoyo.c linux-3.0.8/security/tomoyo/tomoyo.c ---- linux-3.0.8/security/tomoyo/tomoyo.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/security/tomoyo/tomoyo.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/security/tomoyo/tomoyo.c linux-3.0.9/security/tomoyo/tomoyo.c +--- linux-3.0.9/security/tomoyo/tomoyo.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/security/tomoyo/tomoyo.c 2011-11-12 12:47:14.000000000 -0500 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa * tomoyo_security_ops is a "struct security_operations" which is used for * registering TOMOYO. @@ -76662,9 +76663,9 @@ diff -urNp linux-3.0.8/security/tomoyo/tomoyo.c linux-3.0.8/security/tomoyo/tomo .name = "tomoyo", .cred_alloc_blank = tomoyo_cred_alloc_blank, .cred_prepare = tomoyo_cred_prepare, -diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.c linux-3.0.8/sound/aoa/codecs/onyx.c ---- linux-3.0.8/sound/aoa/codecs/onyx.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/aoa/codecs/onyx.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.c linux-3.0.9/sound/aoa/codecs/onyx.c +--- linux-3.0.9/sound/aoa/codecs/onyx.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/aoa/codecs/onyx.c 2011-11-12 12:47:14.000000000 -0500 @@ -54,7 +54,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -76693,9 +76694,9 @@ diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.c linux-3.0.8/sound/aoa/codecs/onyx onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.h linux-3.0.8/sound/aoa/codecs/onyx.h ---- linux-3.0.8/sound/aoa/codecs/onyx.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/aoa/codecs/onyx.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/aoa/codecs/onyx.h linux-3.0.9/sound/aoa/codecs/onyx.h +--- linux-3.0.9/sound/aoa/codecs/onyx.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/aoa/codecs/onyx.h 2011-11-12 12:47:14.000000000 -0500 @@ -11,6 +11,7 @@ #include <linux/i2c.h> #include <asm/pmac_low_i2c.h> @@ -76704,9 +76705,9 @@ diff -urNp linux-3.0.8/sound/aoa/codecs/onyx.h linux-3.0.8/sound/aoa/codecs/onyx /* PCM3052 register definitions */ -diff -urNp linux-3.0.8/sound/core/oss/pcm_oss.c linux-3.0.8/sound/core/oss/pcm_oss.c ---- linux-3.0.8/sound/core/oss/pcm_oss.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/core/oss/pcm_oss.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/sound/core/oss/pcm_oss.c linux-3.0.9/sound/core/oss/pcm_oss.c +--- linux-3.0.9/sound/core/oss/pcm_oss.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/core/oss/pcm_oss.c 2011-11-12 12:47:14.000000000 -0500 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str if (in_kernel) { mm_segment_t fs; @@ -76778,9 +76779,9 @@ diff -urNp linux-3.0.8/sound/core/oss/pcm_oss.c linux-3.0.8/sound/core/oss/pcm_o snd_leave_user(fs); } } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) { -diff -urNp linux-3.0.8/sound/core/pcm_compat.c linux-3.0.8/sound/core/pcm_compat.c ---- linux-3.0.8/sound/core/pcm_compat.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/sound/core/pcm_compat.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/sound/core/pcm_compat.c linux-3.0.9/sound/core/pcm_compat.c +--- linux-3.0.9/sound/core/pcm_compat.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/core/pcm_compat.c 2011-11-12 12:47:14.000000000 -0500 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st int err; @@ -76790,9 +76791,9 @@ diff -urNp linux-3.0.8/sound/core/pcm_compat.c linux-3.0.8/sound/core/pcm_compat snd_leave_user(fs); if (err < 0) return err; -diff -urNp linux-3.0.8/sound/core/pcm_native.c linux-3.0.8/sound/core/pcm_native.c ---- linux-3.0.8/sound/core/pcm_native.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/core/pcm_native.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/sound/core/pcm_native.c linux-3.0.9/sound/core/pcm_native.c +--- linux-3.0.9/sound/core/pcm_native.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/core/pcm_native.c 2011-11-12 12:47:14.000000000 -0500 @@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_ switch (substream->stream) { case SNDRV_PCM_STREAM_PLAYBACK: @@ -76807,9 +76808,9 @@ diff -urNp linux-3.0.8/sound/core/pcm_native.c linux-3.0.8/sound/core/pcm_native break; default: result = -EINVAL; -diff -urNp linux-3.0.8/sound/core/seq/seq_device.c linux-3.0.8/sound/core/seq/seq_device.c ---- linux-3.0.8/sound/core/seq/seq_device.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/core/seq/seq_device.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/core/seq/seq_device.c linux-3.0.9/sound/core/seq/seq_device.c +--- linux-3.0.9/sound/core/seq/seq_device.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/core/seq/seq_device.c 2011-11-12 12:47:14.000000000 -0500 @@ -63,7 +63,7 @@ struct ops_list { int argsize; /* argument size */ @@ -76846,9 +76847,9 @@ diff -urNp linux-3.0.8/sound/core/seq/seq_device.c linux-3.0.8/sound/core/seq/se dev->status = SNDRV_SEQ_DEVICE_FREE; dev->driver_data = NULL; ops->num_init_devices--; -diff -urNp linux-3.0.8/sound/drivers/mts64.c linux-3.0.8/sound/drivers/mts64.c ---- linux-3.0.8/sound/drivers/mts64.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/drivers/mts64.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/drivers/mts64.c linux-3.0.9/sound/drivers/mts64.c +--- linux-3.0.9/sound/drivers/mts64.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/drivers/mts64.c 2011-11-12 12:47:14.000000000 -0500 @@ -28,6 +28,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -76905,9 +76906,9 @@ diff -urNp linux-3.0.8/sound/drivers/mts64.c linux-3.0.8/sound/drivers/mts64.c return 0; } -diff -urNp linux-3.0.8/sound/drivers/opl4/opl4_lib.c linux-3.0.8/sound/drivers/opl4/opl4_lib.c ---- linux-3.0.8/sound/drivers/opl4/opl4_lib.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/drivers/opl4/opl4_lib.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/drivers/opl4/opl4_lib.c linux-3.0.9/sound/drivers/opl4/opl4_lib.c +--- linux-3.0.9/sound/drivers/opl4/opl4_lib.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/drivers/opl4/opl4_lib.c 2011-11-12 12:47:14.000000000 -0500 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ MODULE_DESCRIPTION("OPL4 driver"); MODULE_LICENSE("GPL"); @@ -76917,9 +76918,9 @@ diff -urNp linux-3.0.8/sound/drivers/opl4/opl4_lib.c linux-3.0.8/sound/drivers/o { int timeout = 10; while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0) -diff -urNp linux-3.0.8/sound/drivers/portman2x4.c linux-3.0.8/sound/drivers/portman2x4.c ---- linux-3.0.8/sound/drivers/portman2x4.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/drivers/portman2x4.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/drivers/portman2x4.c linux-3.0.9/sound/drivers/portman2x4.c +--- linux-3.0.9/sound/drivers/portman2x4.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/drivers/portman2x4.c 2011-11-12 12:47:14.000000000 -0500 @@ -47,6 +47,7 @@ #include <sound/initval.h> #include <sound/rawmidi.h> @@ -76937,9 +76938,9 @@ diff -urNp linux-3.0.8/sound/drivers/portman2x4.c linux-3.0.8/sound/drivers/port int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-3.0.8/sound/firewire/amdtp.c linux-3.0.8/sound/firewire/amdtp.c ---- linux-3.0.8/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/firewire/amdtp.c linux-3.0.9/sound/firewire/amdtp.c +--- linux-3.0.9/sound/firewire/amdtp.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/firewire/amdtp.c 2011-11-12 12:47:14.000000000 -0500 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt ptr = s->pcm_buffer_pointer + data_blocks; if (ptr >= pcm->runtime->buffer_size) @@ -76958,9 +76959,9 @@ diff -urNp linux-3.0.8/sound/firewire/amdtp.c linux-3.0.8/sound/firewire/amdtp.c (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24; } EXPORT_SYMBOL(amdtp_out_stream_update); -diff -urNp linux-3.0.8/sound/firewire/amdtp.h linux-3.0.8/sound/firewire/amdtp.h ---- linux-3.0.8/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/firewire/amdtp.h linux-3.0.9/sound/firewire/amdtp.h +--- linux-3.0.9/sound/firewire/amdtp.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/firewire/amdtp.h 2011-11-12 12:47:14.000000000 -0500 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_ static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s, struct snd_pcm_substream *pcm) @@ -76970,9 +76971,9 @@ diff -urNp linux-3.0.8/sound/firewire/amdtp.h linux-3.0.8/sound/firewire/amdtp.h } /** -diff -urNp linux-3.0.8/sound/firewire/isight.c linux-3.0.8/sound/firewire/isight.c ---- linux-3.0.8/sound/firewire/isight.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/firewire/isight.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/firewire/isight.c linux-3.0.9/sound/firewire/isight.c +--- linux-3.0.9/sound/firewire/isight.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/firewire/isight.c 2011-11-12 12:47:14.000000000 -0500 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc ptr += count; if (ptr >= runtime->buffer_size) @@ -77013,9 +77014,9 @@ diff -urNp linux-3.0.8/sound/firewire/isight.c linux-3.0.8/sound/firewire/isight break; default: return -EINVAL; -diff -urNp linux-3.0.8/sound/isa/cmi8330.c linux-3.0.8/sound/isa/cmi8330.c ---- linux-3.0.8/sound/isa/cmi8330.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/isa/cmi8330.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/isa/cmi8330.c linux-3.0.9/sound/isa/cmi8330.c +--- linux-3.0.9/sound/isa/cmi8330.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/isa/cmi8330.c 2011-11-12 12:47:14.000000000 -0500 @@ -172,7 +172,7 @@ struct snd_cmi8330 { struct snd_pcm *pcm; @@ -77025,9 +77026,9 @@ diff -urNp linux-3.0.8/sound/isa/cmi8330.c linux-3.0.8/sound/isa/cmi8330.c snd_pcm_open_callback_t open; void *private_data; /* sb or wss */ } streams[2]; -diff -urNp linux-3.0.8/sound/oss/sb_audio.c linux-3.0.8/sound/oss/sb_audio.c ---- linux-3.0.8/sound/oss/sb_audio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/oss/sb_audio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/oss/sb_audio.c linux-3.0.9/sound/oss/sb_audio.c +--- linux-3.0.9/sound/oss/sb_audio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/oss/sb_audio.c 2011-11-12 12:47:14.000000000 -0500 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, buf16 = (signed short *)(localbuf + localoffs); while (c) @@ -77037,9 +77038,9 @@ diff -urNp linux-3.0.8/sound/oss/sb_audio.c linux-3.0.8/sound/oss/sb_audio.c if (copy_from_user(lbuf8, userbuf+useroffs + p, locallen)) -diff -urNp linux-3.0.8/sound/oss/swarm_cs4297a.c linux-3.0.8/sound/oss/swarm_cs4297a.c ---- linux-3.0.8/sound/oss/swarm_cs4297a.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/oss/swarm_cs4297a.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/oss/swarm_cs4297a.c linux-3.0.9/sound/oss/swarm_cs4297a.c +--- linux-3.0.9/sound/oss/swarm_cs4297a.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/oss/swarm_cs4297a.c 2011-11-12 12:47:14.000000000 -0500 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void) { struct cs4297a_state *s; @@ -77074,9 +77075,9 @@ diff -urNp linux-3.0.8/sound/oss/swarm_cs4297a.c linux-3.0.8/sound/oss/swarm_cs4 list_add(&s->list, &cs4297a_devs); -diff -urNp linux-3.0.8/sound/pci/hda/hda_codec.h linux-3.0.8/sound/pci/hda/hda_codec.h ---- linux-3.0.8/sound/pci/hda/hda_codec.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/pci/hda/hda_codec.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/pci/hda/hda_codec.h linux-3.0.9/sound/pci/hda/hda_codec.h +--- linux-3.0.9/sound/pci/hda/hda_codec.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/pci/hda/hda_codec.h 2011-11-12 12:47:14.000000000 -0500 @@ -615,7 +615,7 @@ struct hda_bus_ops { /* notify power-up/down from codec to controller */ void (*pm_notify)(struct hda_bus *bus); @@ -77112,9 +77113,9 @@ diff -urNp linux-3.0.8/sound/pci/hda/hda_codec.h linux-3.0.8/sound/pci/hda/hda_c /* PCM to create, set by patch_ops.build_pcms callback */ unsigned int num_pcms; -diff -urNp linux-3.0.8/sound/pci/ice1712/ice1712.h linux-3.0.8/sound/pci/ice1712/ice1712.h ---- linux-3.0.8/sound/pci/ice1712/ice1712.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/pci/ice1712/ice1712.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/pci/ice1712/ice1712.h linux-3.0.9/sound/pci/ice1712/ice1712.h +--- linux-3.0.9/sound/pci/ice1712/ice1712.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/pci/ice1712/ice1712.h 2011-11-12 12:47:14.000000000 -0500 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private { unsigned int mask_flags; /* total mask bits */ struct snd_akm4xxx_ops { @@ -77133,9 +77134,9 @@ diff -urNp linux-3.0.8/sound/pci/ice1712/ice1712.h linux-3.0.8/sound/pci/ice1712 }; -diff -urNp linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c ---- linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c +--- linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/pci/ymfpci/ymfpci_main.c 2011-11-12 12:47:14.000000000 -0500 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0) break; @@ -77176,9 +77177,9 @@ diff -urNp linux-3.0.8/sound/pci/ymfpci/ymfpci_main.c linux-3.0.8/sound/pci/ymfp chip->card = card; chip->pci = pci; chip->irq = -1; -diff -urNp linux-3.0.8/sound/soc/soc-core.c linux-3.0.8/sound/soc/soc-core.c ---- linux-3.0.8/sound/soc/soc-core.c 2011-10-24 08:05:21.000000000 -0400 -+++ linux-3.0.8/sound/soc/soc-core.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/soc/soc-core.c linux-3.0.9/sound/soc/soc-core.c +--- linux-3.0.9/sound/soc/soc-core.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/soc/soc-core.c 2011-11-12 12:47:14.000000000 -0500 @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer } @@ -77196,9 +77197,9 @@ diff -urNp linux-3.0.8/sound/soc/soc-core.c linux-3.0.8/sound/soc/soc-core.c soc_pcm_ops.mmap = platform->driver->ops->mmap; soc_pcm_ops.pointer = platform->driver->ops->pointer; soc_pcm_ops.ioctl = platform->driver->ops->ioctl; -diff -urNp linux-3.0.8/sound/usb/card.h linux-3.0.8/sound/usb/card.h ---- linux-3.0.8/sound/usb/card.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/sound/usb/card.h 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/sound/usb/card.h linux-3.0.9/sound/usb/card.h +--- linux-3.0.9/sound/usb/card.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/sound/usb/card.h 2011-11-12 12:47:14.000000000 -0500 @@ -44,6 +44,7 @@ struct snd_urb_ops { int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); @@ -77216,9 +77217,9 @@ diff -urNp linux-3.0.8/sound/usb/card.h linux-3.0.8/sound/usb/card.h }; struct snd_usb_stream { -diff -urNp linux-3.0.8/tools/gcc/checker_plugin.c linux-3.0.8/tools/gcc/checker_plugin.c ---- linux-3.0.8/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/checker_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/checker_plugin.c linux-3.0.9/tools/gcc/checker_plugin.c +--- linux-3.0.9/tools/gcc/checker_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/checker_plugin.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,169 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -77389,9 +77390,9 @@ diff -urNp linux-3.0.8/tools/gcc/checker_plugin.c linux-3.0.8/tools/gcc/checker_ + + return 0; +} -diff -urNp linux-3.0.8/tools/gcc/constify_plugin.c linux-3.0.8/tools/gcc/constify_plugin.c ---- linux-3.0.8/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/constify_plugin.c 2011-08-30 18:23:52.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/constify_plugin.c linux-3.0.9/tools/gcc/constify_plugin.c +--- linux-3.0.9/tools/gcc/constify_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/constify_plugin.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,293 @@ +/* + * Copyright 2011 by Emese Revfy <re.emese@gmail.com> @@ -77686,9 +77687,9 @@ diff -urNp linux-3.0.8/tools/gcc/constify_plugin.c linux-3.0.8/tools/gcc/constif + + return 0; +} -diff -urNp linux-3.0.8/tools/gcc/kallocstat_plugin.c linux-3.0.8/tools/gcc/kallocstat_plugin.c ---- linux-3.0.8/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/kallocstat_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/kallocstat_plugin.c linux-3.0.9/tools/gcc/kallocstat_plugin.c +--- linux-3.0.9/tools/gcc/kallocstat_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/kallocstat_plugin.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,165 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -77855,9 +77856,9 @@ diff -urNp linux-3.0.8/tools/gcc/kallocstat_plugin.c linux-3.0.8/tools/gcc/kallo + + return 0; +} -diff -urNp linux-3.0.8/tools/gcc/kernexec_plugin.c linux-3.0.8/tools/gcc/kernexec_plugin.c ---- linux-3.0.8/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/kernexec_plugin.c 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/kernexec_plugin.c linux-3.0.9/tools/gcc/kernexec_plugin.c +--- linux-3.0.9/tools/gcc/kernexec_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/kernexec_plugin.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,273 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -78132,9 +78133,9 @@ diff -urNp linux-3.0.8/tools/gcc/kernexec_plugin.c linux-3.0.8/tools/gcc/kernexe + + return 0; +} -diff -urNp linux-3.0.8/tools/gcc/Makefile linux-3.0.8/tools/gcc/Makefile ---- linux-3.0.8/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/Makefile 2011-10-06 04:17:55.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/Makefile linux-3.0.9/tools/gcc/Makefile +--- linux-3.0.9/tools/gcc/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/Makefile 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,21 @@ +#CC := gcc +#PLUGIN_SOURCE_FILES := pax_plugin.c @@ -78157,9 +78158,9 @@ diff -urNp linux-3.0.8/tools/gcc/Makefile linux-3.0.8/tools/gcc/Makefile +kallocstat_plugin-objs := kallocstat_plugin.o +kernexec_plugin-objs := kernexec_plugin.o +checker_plugin-objs := checker_plugin.o -diff -urNp linux-3.0.8/tools/gcc/stackleak_plugin.c linux-3.0.8/tools/gcc/stackleak_plugin.c ---- linux-3.0.8/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-3.0.8/tools/gcc/stackleak_plugin.c 2011-09-17 00:53:44.000000000 -0400 +diff -urNp linux-3.0.9/tools/gcc/stackleak_plugin.c linux-3.0.9/tools/gcc/stackleak_plugin.c +--- linux-3.0.9/tools/gcc/stackleak_plugin.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-3.0.9/tools/gcc/stackleak_plugin.c 2011-11-12 12:47:14.000000000 -0500 @@ -0,0 +1,251 @@ +/* + * Copyright 2011 by the PaX Team <pageexec@freemail.hu> @@ -78412,9 +78413,9 @@ diff -urNp linux-3.0.8/tools/gcc/stackleak_plugin.c linux-3.0.8/tools/gcc/stackl + + return 0; +} -diff -urNp linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h ---- linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h 2011-10-20 04:46:01.000000000 -0400 +diff -urNp linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h +--- linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/tools/perf/util/include/asm/alternative-asm.h 2011-11-12 12:47:14.000000000 -0500 @@ -5,4 +5,7 @@ #define altinstruction_entry # @@ -78423,9 +78424,9 @@ diff -urNp linux-3.0.8/tools/perf/util/include/asm/alternative-asm.h linux-3.0.8 + .endm + #endif -diff -urNp linux-3.0.8/usr/gen_init_cpio.c linux-3.0.8/usr/gen_init_cpio.c ---- linux-3.0.8/usr/gen_init_cpio.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/usr/gen_init_cpio.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/usr/gen_init_cpio.c linux-3.0.9/usr/gen_init_cpio.c +--- linux-3.0.9/usr/gen_init_cpio.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/usr/gen_init_cpio.c 2011-11-12 12:47:14.000000000 -0500 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -78448,9 +78449,9 @@ diff -urNp linux-3.0.8/usr/gen_init_cpio.c linux-3.0.8/usr/gen_init_cpio.c } else break; } -diff -urNp linux-3.0.8/virt/kvm/kvm_main.c linux-3.0.8/virt/kvm/kvm_main.c ---- linux-3.0.8/virt/kvm/kvm_main.c 2011-07-21 22:17:23.000000000 -0400 -+++ linux-3.0.8/virt/kvm/kvm_main.c 2011-08-23 21:47:56.000000000 -0400 +diff -urNp linux-3.0.9/virt/kvm/kvm_main.c linux-3.0.9/virt/kvm/kvm_main.c +--- linux-3.0.9/virt/kvm/kvm_main.c 2011-11-11 13:12:24.000000000 -0500 ++++ linux-3.0.9/virt/kvm/kvm_main.c 2011-11-12 12:47:14.000000000 -0500 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list); static cpumask_var_t cpus_hardware_enabled; diff --git a/3.0.8/4421_grsec-remove-localversion-grsec.patch b/3.0.9/4421_grsec-remove-localversion-grsec.patch index 31cf878..31cf878 100644 --- a/3.0.8/4421_grsec-remove-localversion-grsec.patch +++ b/3.0.9/4421_grsec-remove-localversion-grsec.patch diff --git a/3.0.8/4422_grsec-mute-warnings.patch b/3.0.9/4422_grsec-mute-warnings.patch index fbca0bb..fbca0bb 100644 --- a/3.0.8/4422_grsec-mute-warnings.patch +++ b/3.0.9/4422_grsec-mute-warnings.patch diff --git a/3.0.8/4423_grsec-remove-protected-paths.patch b/3.0.9/4423_grsec-remove-protected-paths.patch index 4afb3e2..4afb3e2 100644 --- a/3.0.8/4423_grsec-remove-protected-paths.patch +++ b/3.0.9/4423_grsec-remove-protected-paths.patch diff --git a/3.0.8/4425_grsec-pax-without-grsec.patch b/3.0.9/4425_grsec-pax-without-grsec.patch index 41be0d0..41be0d0 100644 --- a/3.0.8/4425_grsec-pax-without-grsec.patch +++ b/3.0.9/4425_grsec-pax-without-grsec.patch diff --git a/3.0.8/4430_grsec-kconfig-default-gids.patch b/3.0.9/4430_grsec-kconfig-default-gids.patch index 6a448bf..6a448bf 100644 --- a/3.0.8/4430_grsec-kconfig-default-gids.patch +++ b/3.0.9/4430_grsec-kconfig-default-gids.patch diff --git a/3.0.8/4435_grsec-kconfig-gentoo.patch b/3.0.9/4435_grsec-kconfig-gentoo.patch index 1bc9742..1bc9742 100644 --- a/3.0.8/4435_grsec-kconfig-gentoo.patch +++ b/3.0.9/4435_grsec-kconfig-gentoo.patch diff --git a/3.0.8/4437-grsec-kconfig-proc-user.patch b/3.0.9/4437-grsec-kconfig-proc-user.patch index c588683..c588683 100644 --- a/3.0.8/4437-grsec-kconfig-proc-user.patch +++ b/3.0.9/4437-grsec-kconfig-proc-user.patch diff --git a/3.0.8/4440_selinux-avc_audit-log-curr_ip.patch b/3.0.9/4440_selinux-avc_audit-log-curr_ip.patch index 0fd5d2d..0fd5d2d 100644 --- a/3.0.8/4440_selinux-avc_audit-log-curr_ip.patch +++ b/3.0.9/4440_selinux-avc_audit-log-curr_ip.patch diff --git a/3.0.8/4445_disable-compat_vdso.patch b/3.0.9/4445_disable-compat_vdso.patch index 3b76b6c..3b76b6c 100644 --- a/3.0.8/4445_disable-compat_vdso.patch +++ b/3.0.9/4445_disable-compat_vdso.patch |