diff options
| author |   Jory A. Pratt <anarchy@gentoo.org> | 2010-03-05 20:12:35 -0600 |
|---|---|---|
| committer | Jory A. Pratt <anarchy@gentoo.org> | 2010-03-05 20:12:35 -0600 |
| commit | 9ede6783a88582d1663b08245758380712959d75 (patch) | |
| tree | b999af869982efe70b620a2054f2556c6b0ef1d5 | |
| parent | Added the hardened-patches-2.6.32-5.extras patches (diff) | |
| download | hardened-patchset-9ede6783a88582d1663b08245758380712959d75.tar.gz hardened-patchset-9ede6783a88582d1663b08245758380712959d75.tar.bz2 hardened-patchset-9ede6783a88582d1663b08245758380712959d75.zip | |
update grsecurity patch for 32.9
| -rw-r--r-- | kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.9-201002231820.patch (renamed from kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.7-201001291848.patch) | 8239 | ||||
| -rw-r--r-- | kernel/2.6.32/README.Changelog | 3 |
2 files changed, 4507 insertions, 3735 deletions
diff --git a/kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.7-201001291848.patch b/kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.9-201002231820.patch index 2cc847c..09d2f5d 100644 --- a/kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.7-201001291848.patch +++ b/kernel/2.6.32/4420_grsecurity-2.1.14-2.6.32.9-201002231820.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.32.7/arch/alpha/include/asm/elf.h linux-2.6.32.7/arch/alpha/include/asm/elf.h ---- linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 17:39:40.226974977 -0500 +diff -urNp linux-2.6.32.9/arch/alpha/include/asm/elf.h linux-2.6.32.9/arch/alpha/include/asm/elf.h +--- linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/alpha/include/asm/elf.h 2010-02-23 17:09:53.067670152 -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.7/arch/alpha/include/asm/elf.h linux-2.6.32.7/arch/alpha /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.32.7/arch/alpha/include/asm/pgtable.h linux-2.6.32.7/arch/alpha/include/asm/pgtable.h ---- linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 17:39:40.227409538 -0500 +diff -urNp linux-2.6.32.9/arch/alpha/include/asm/pgtable.h linux-2.6.32.9/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/alpha/include/asm/pgtable.h 2010-02-23 17:09:53.067670152 -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.7/arch/alpha/include/asm/pgtable.h linux-2.6.32.7/arch/a #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.32.7/arch/alpha/kernel/module.c linux-2.6.32.7/arch/alpha/kernel/module.c ---- linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 17:39:40.227409538 -0500 +diff -urNp linux-2.6.32.9/arch/alpha/kernel/module.c linux-2.6.32.9/arch/alpha/kernel/module.c +--- linux-2.6.32.9/arch/alpha/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/alpha/kernel/module.c 2010-02-23 17:09:53.067670152 -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.7/arch/alpha/kernel/module.c linux-2.6.32.7/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.32.7/arch/alpha/kernel/osf_sys.c linux-2.6.32.7/arch/alpha/kernel/osf_sys.c ---- linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 17:39:40.227409538 -0500 +diff -urNp linux-2.6.32.9/arch/alpha/kernel/osf_sys.c linux-2.6.32.9/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/alpha/kernel/osf_sys.c 2010-02-23 17:09:53.067670152 -0500 @@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.7/arch/alpha/kernel/osf_sys.c linux-2.6.32.7/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.32.7/arch/alpha/mm/fault.c linux-2.6.32.7/arch/alpha/mm/fault.c ---- linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/alpha/mm/fault.c linux-2.6.32.9/arch/alpha/mm/fault.c +--- linux-2.6.32.9/arch/alpha/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/alpha/mm/fault.c 2010-02-23 17:09:53.071672140 -0500 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.7/arch/alpha/mm/fault.c linux-2.6.32.7/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.32.7/arch/arm/include/asm/elf.h linux-2.6.32.7/arch/arm/include/asm/elf.h ---- linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/include/asm/elf.h linux-2.6.32.9/arch/arm/include/asm/elf.h +--- linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/include/asm/elf.h 2010-02-23 17:09:53.071672140 -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. */ @@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.7/arch/arm/include/asm/elf.h linux-2.6.32.7/arch/arm/inc /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.32.7/arch/arm/include/asm/kmap_types.h linux-2.6.32.7/arch/arm/include/asm/kmap_types.h ---- linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/include/asm/kmap_types.h linux-2.6.32.9/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.7/arch/arm/include/asm/kmap_types.h linux-2.6.32.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.32.7/arch/arm/include/asm/uaccess.h linux-2.6.32.7/arch/arm/include/asm/uaccess.h ---- linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/include/asm/uaccess.h linux-2.6.32.9/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/include/asm/uaccess.h 2010-02-23 17:09:53.071672140 -0500 @@ -403,6 +403,9 @@ extern unsigned long __must_check __strn static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) @@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.7/arch/arm/include/asm/uaccess.h linux-2.6.32.7/arch/arm if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.32.7/arch/arm/kernel/kgdb.c linux-2.6.32.7/arch/arm/kernel/kgdb.c ---- linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/kernel/kgdb.c linux-2.6.32.9/arch/arm/kernel/kgdb.c +--- linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/kernel/kgdb.c 2010-02-23 17:09:53.071672140 -0500 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void) * and we handle the normal undef case within the do_undefinstr * handler. @@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.7/arch/arm/kernel/kgdb.c linux-2.6.32.7/arch/arm/kernel/ #ifndef __ARMEB__ .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} #else /* ! __ARMEB__ */ -diff -urNp linux-2.6.32.7/arch/arm/mach-at91/pm.c linux-2.6.32.7/arch/arm/mach-at91/pm.c ---- linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-at91/pm.c linux-2.6.32.9/arch/arm/mach-at91/pm.c +--- linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-at91/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -348,7 +348,7 @@ static void at91_pm_end(void) } @@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-at91/pm.c linux-2.6.32.7/arch/arm/mach-a .valid = at91_pm_valid_state, .begin = at91_pm_begin, .enter = at91_pm_enter, -diff -urNp linux-2.6.32.7/arch/arm/mach-omap1/pm.c linux-2.6.32.7/arch/arm/mach-omap1/pm.c ---- linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-omap1/pm.c linux-2.6.32.9/arch/arm/mach-omap1/pm.c +--- linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-omap1/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq @@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-omap1/pm.c linux-2.6.32.7/arch/arm/mach- .prepare = omap_pm_prepare, .enter = omap_pm_enter, .finish = omap_pm_finish, -diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c ---- linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 17:39:40.228183006 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-omap2/pm24xx.c 2010-02-23 17:09:53.071672140 -0500 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void) enable_hlt(); } @@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.7/arch/arm/m .prepare = omap2_pm_prepare, .enter = omap2_pm_enter, .finish = omap2_pm_finish, -diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c ---- linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 17:39:40.229409370 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-omap2/pm34xx.c 2010-02-23 17:09:53.071672140 -0500 @@ -401,7 +401,7 @@ static void omap3_pm_end(void) return; } @@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.7/arch/arm/m .begin = omap3_pm_begin, .end = omap3_pm_end, .prepare = omap3_pm_prepare, -diff -urNp linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c ---- linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 17:39:40.229409370 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-pnx4008/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat (state == PM_SUSPEND_MEM); } @@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c linux-2.6.32.7/arch/arm/mac .enter = pnx4008_pm_enter, .valid = pnx4008_pm_valid, }; -diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/pm.c linux-2.6.32.7/arch/arm/mach-pxa/pm.c ---- linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 17:39:40.229409370 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-pxa/pm.c linux-2.6.32.9/arch/arm/mach-pxa/pm.c +--- linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-pxa/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -95,7 +95,7 @@ void pxa_pm_finish(void) pxa_cpu_pm_fns->finish(); } @@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/pm.c linux-2.6.32.7/arch/arm/mach-px .valid = pxa_pm_valid, .enter = pxa_pm_enter, .prepare = pxa_pm_prepare, -diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c ---- linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 17:39:40.230112049 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status } @@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.7/arch/arm .prepare = pxa_pm_prepare, .finish = pxa_pm_finish, .enter = corgi_pxa_pm_enter, -diff -urNp linux-2.6.32.7/arch/arm/mach-sa1100/pm.c linux-2.6.32.7/arch/arm/mach-sa1100/pm.c ---- linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 17:39:40.230112049 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mach-sa1100/pm.c linux-2.6.32.9/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mach-sa1100/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) return virt_to_phys(sp); } @@ -393,9 +393,60 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-sa1100/pm.c linux-2.6.32.7/arch/arm/mach .enter = sa11x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c ---- linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 17:39:40.230112049 -0500 +diff -urNp linux-2.6.32.9/arch/arm/mm/fault.c linux-2.6.32.9/arch/arm/mm/fault.c +--- linux-2.6.32.9/arch/arm/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mm/fault.c 2010-02-23 17:09:53.071672140 -0500 +@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, + } + #endif + ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (fsr & FSR_LNX_PF) { ++ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + tsk->thread.address = addr; + tsk->thread.error_code = fsr; + tsk->thread.trap_no = 14; +@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign + } + #endif /* CONFIG_MMU */ + ++#ifdef CONFIG_PAX_PAGEEXEC ++void pax_report_insns(void *pc, void *sp) ++{ ++ long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i = 0; i < 20; i++) { ++ unsigned char c; ++ if (get_user(c, (__force unsigned char __user *)pc+i)) ++ printk(KERN_CONT "?? "); ++ else ++ printk(KERN_CONT "%02x ", c); ++ } ++ printk("\n"); ++ ++ printk(KERN_ERR "PAX: bytes at SP-4: "); ++ for (i = -1; i < 20; i++) { ++ unsigned long c; ++ if (get_user(c, (__force unsigned long __user *)sp+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08lx ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + /* + * First Level Translation Fault Handler + * +diff -urNp linux-2.6.32.9/arch/arm/mm/mmap.c linux-2.6.32.9/arch/arm/mm/mmap.c +--- linux-2.6.32.9/arch/arm/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/mm/mmap.c 2010-02-23 17:09:53.071672140 -0500 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -432,9 +483,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c linux-2.6.32.7/arch/arm/plat-s3c/pm.c ---- linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 17:39:40.241617700 -0500 +diff -urNp linux-2.6.32.9/arch/arm/plat-s3c/pm.c linux-2.6.32.9/arch/arm/plat-s3c/pm.c +--- linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/arm/plat-s3c/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void) s3c_pm_check_cleanup(); } @@ -444,9 +495,9 @@ diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c linux-2.6.32.7/arch/arm/plat-s3 .enter = s3c_pm_enter, .prepare = s3c_pm_prepare, .finish = s3c_pm_finish, -diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h linux-2.6.32.7/arch/avr32/include/asm/elf.h ---- linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 17:39:40.241617700 -0500 +diff -urNp linux-2.6.32.9/arch/avr32/include/asm/elf.h linux-2.6.32.9/arch/avr32/include/asm/elf.h +--- linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/avr32/include/asm/elf.h 2010-02-23 17:09:53.071672140 -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. */ @@ -463,9 +514,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h linux-2.6.32.7/arch/avr32 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 17:39:40.241617700 -0500 +diff -urNp linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/avr32/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -476,9 +527,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h linux-2.6.32.7/arc }; #undef D -diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c ---- linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 17:39:40.241617700 -0500 +diff -urNp linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/avr32/mach-at32ap/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -176,7 +176,7 @@ out: return 0; } @@ -488,9 +539,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c linux-2.6.32.7/arch/avr32/ .valid = avr32_pm_valid_state, .enter = avr32_pm_enter, }; -diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c linux-2.6.32.7/arch/avr32/mm/fault.c ---- linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 17:39:40.241617700 -0500 +diff -urNp linux-2.6.32.9/arch/avr32/mm/fault.c linux-2.6.32.9/arch/avr32/mm/fault.c +--- linux-2.6.32.9/arch/avr32/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/avr32/mm/fault.c 2010-02-23 17:09:53.071672140 -0500 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -532,9 +583,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c linux-2.6.32.7/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.32.7/arch/blackfin/kernel/kgdb.c linux-2.6.32.7/arch/blackfin/kernel/kgdb.c ---- linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 17:39:40.242404070 -0500 +diff -urNp linux-2.6.32.9/arch/blackfin/kernel/kgdb.c linux-2.6.32.9/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/blackfin/kernel/kgdb.c 2010-02-23 17:09:53.071672140 -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 */ } @@ -544,9 +595,9 @@ diff -urNp linux-2.6.32.7/arch/blackfin/kernel/kgdb.c linux-2.6.32.7/arch/blackf .gdb_bpt_instr = {0xa1}, #ifdef CONFIG_SMP .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, -diff -urNp linux-2.6.32.7/arch/blackfin/mach-common/pm.c linux-2.6.32.7/arch/blackfin/mach-common/pm.c ---- linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 17:39:40.254403041 -0500 +diff -urNp linux-2.6.32.9/arch/blackfin/mach-common/pm.c linux-2.6.32.9/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/blackfin/mach-common/pm.c 2010-02-23 17:09:53.071672140 -0500 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } @@ -556,9 +607,9 @@ diff -urNp linux-2.6.32.7/arch/blackfin/mach-common/pm.c linux-2.6.32.7/arch/bla .enter = bfin_pm_enter, .valid = bfin_pm_valid, }; -diff -urNp linux-2.6.32.7/arch/frv/include/asm/kmap_types.h linux-2.6.32.7/arch/frv/include/asm/kmap_types.h ---- linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 17:39:40.254403041 -0500 +diff -urNp linux-2.6.32.9/arch/frv/include/asm/kmap_types.h linux-2.6.32.9/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/frv/include/asm/kmap_types.h 2010-02-23 17:09:53.071672140 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -567,9 +618,9 @@ diff -urNp linux-2.6.32.7/arch/frv/include/asm/kmap_types.h linux-2.6.32.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c ---- linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 17:39:40.254403041 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/hp/common/hwsw_iommu.c 2010-02-23 17:09:53.071672140 -0500 @@ -17,7 +17,7 @@ #include <linux/swiotlb.h> #include <asm/machvec.h> @@ -588,9 +639,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.7/arch/i { if (use_swiotlb(dev)) return &swiotlb_dma_ops; -diff -urNp linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c ---- linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/hp/common/sba_iommu.c 2010-02-23 17:09:53.075664142 -0500 @@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d }, }; @@ -609,9 +660,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.7/arch/ia .alloc_coherent = sba_alloc_coherent, .free_coherent = sba_free_coherent, .map_page = sba_map_page, -diff -urNp linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/ia32/binfmt_elf32.c 2010-02-23 17:09:53.075664142 -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)) @@ -626,9 +677,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.7/arch/ia64 /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -diff -urNp linux-2.6.32.7/arch/ia64/ia32/ia32priv.h linux-2.6.32.7/arch/ia64/ia32/ia32priv.h ---- linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/ia32/ia32priv.h linux-2.6.32.9/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/ia32/ia32priv.h 2010-02-23 17:09:53.075664142 -0500 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -645,9 +696,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/ia32/ia32priv.h linux-2.6.32.7/arch/ia64/ia3 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h ---- linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/include/asm/dma-mapping.h 2010-02-23 17:09:53.075664142 -0500 @@ -12,7 +12,7 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK @@ -691,9 +742,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.7/arc return ops->dma_supported(dev, mask); } -diff -urNp linux-2.6.32.7/arch/ia64/include/asm/elf.h linux-2.6.32.7/arch/ia64/include/asm/elf.h ---- linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/include/asm/elf.h linux-2.6.32.9/arch/ia64/include/asm/elf.h +--- linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/include/asm/elf.h 2010-02-23 17:09:53.075664142 -0500 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -708,9 +759,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/elf.h linux-2.6.32.7/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.32.7/arch/ia64/include/asm/machvec.h linux-2.6.32.7/arch/ia64/include/asm/machvec.h ---- linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 17:39:40.255155838 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/include/asm/machvec.h linux-2.6.32.9/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/include/asm/machvec.h 2010-02-23 17:09:53.075664142 -0500 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event /* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void); @@ -729,9 +780,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/machvec.h linux-2.6.32.7/arch/ia /* * Define default versions so we can extend machvec for new platforms without having -diff -urNp linux-2.6.32.7/arch/ia64/include/asm/pgtable.h linux-2.6.32.7/arch/ia64/include/asm/pgtable.h ---- linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 17:39:40.256405587 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/include/asm/pgtable.h linux-2.6.32.9/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/include/asm/pgtable.h 2010-02-23 17:09:53.075664142 -0500 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -750,9 +801,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/pgtable.h linux-2.6.32.7/arch/ia #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.32.7/arch/ia64/include/asm/uaccess.h linux-2.6.32.7/arch/ia64/include/asm/uaccess.h ---- linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 17:39:40.256405587 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/include/asm/uaccess.h linux-2.6.32.9/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/include/asm/uaccess.h 2010-02-23 17:09:53.075664142 -0500 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -771,9 +822,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/uaccess.h linux-2.6.32.7/arch/ia __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c ---- linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 17:39:40.256405587 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/dma-mapping.c 2010-02-23 17:09:53.075664142 -0500 @@ -3,7 +3,7 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; @@ -792,9 +843,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c linux-2.6.32.7/arch/ia6 { return dma_ops; } -diff -urNp linux-2.6.32.7/arch/ia64/kernel/module.c linux-2.6.32.7/arch/ia64/kernel/module.c ---- linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 17:39:40.256405587 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/module.c linux-2.6.32.9/arch/ia64/kernel/module.c +--- linux-2.6.32.9/arch/ia64/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/module.c 2010-02-23 17:09:53.075664142 -0500 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -883,9 +934,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/module.c linux-2.6.32.7/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-dma.c linux-2.6.32.7/arch/ia64/kernel/pci-dma.c ---- linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 17:39:40.256405587 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/pci-dma.c linux-2.6.32.9/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/pci-dma.c 2010-02-23 17:09:53.075664142 -0500 @@ -43,7 +43,7 @@ struct device fallback_dev = { .dma_mask = &fallback_dev.coherent_dma_mask, }; @@ -895,9 +946,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-dma.c linux-2.6.32.7/arch/ia64/ke static int __init pci_iommu_init(void) { -diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c ---- linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/pci-swiotlb.c 2010-02-23 17:09:53.075664142 -0500 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); } @@ -907,9 +958,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.7/arch/ia6 .alloc_coherent = ia64_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, .map_page = swiotlb_map_page, -diff -urNp linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/sys_ia64.c 2010-02-23 17:09:53.075664142 -0500 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -936,9 +987,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c linux-2.6.32.7/arch/ia64/k goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.32.7/arch/ia64/kernel/topology.c linux-2.6.32.7/arch/ia64/kernel/topology.c ---- linux-2.6.32.7/arch/ia64/kernel/topology.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/topology.c 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/topology.c linux-2.6.32.9/arch/ia64/kernel/topology.c +--- linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/topology.c 2010-02-23 17:09:53.075664142 -0500 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -948,9 +999,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/topology.c linux-2.6.32.7/arch/ia64/k .show = cache_show }; -diff -urNp linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/kernel/vmlinux.lds.S 2010-02-23 17:09:53.075664142 -0500 @@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -960,9 +1011,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.7/arch/ia6 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.32.7/arch/ia64/mm/fault.c linux-2.6.32.7/arch/ia64/mm/fault.c ---- linux-2.6.32.7/arch/ia64/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/mm/fault.c 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/mm/fault.c linux-2.6.32.9/arch/ia64/mm/fault.c +--- linux-2.6.32.9/arch/ia64/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/mm/fault.c 2010-02-23 17:09:53.075664142 -0500 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1012,9 +1063,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/mm/fault.c linux-2.6.32.7/arch/ia64/mm/fault survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.7/arch/ia64/mm/init.c linux-2.6.32.7/arch/ia64/mm/init.c ---- linux-2.6.32.7/arch/ia64/mm/init.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/mm/init.c 2010-01-25 17:39:40.257491087 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/mm/init.c linux-2.6.32.9/arch/ia64/mm/init.c +--- linux-2.6.32.9/arch/ia64/mm/init.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/mm/init.c 2010-02-23 17:09:53.075664142 -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; @@ -1035,9 +1086,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/mm/init.c linux-2.6.32.7/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c ---- linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/ia64/sn/pci/pci_dma.c 2010-02-23 17:09:53.075664142 -0500 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * return ret; } @@ -1047,9 +1098,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.7/arch/ia64/sn .alloc_coherent = sn_dma_alloc_coherent, .free_coherent = sn_dma_free_coherent, .map_page = sn_dma_map_page, -diff -urNp linux-2.6.32.7/arch/m32r/lib/usercopy.c linux-2.6.32.7/arch/m32r/lib/usercopy.c ---- linux-2.6.32.7/arch/m32r/lib/usercopy.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/m32r/lib/usercopy.c 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/m32r/lib/usercopy.c linux-2.6.32.9/arch/m32r/lib/usercopy.c +--- linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/m32r/lib/usercopy.c 2010-02-23 17:09:53.075664142 -0500 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1070,9 +1121,9 @@ diff -urNp linux-2.6.32.7/arch/m32r/lib/usercopy.c linux-2.6.32.7/arch/m32r/lib/ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c ---- linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/alchemy/devboards/pm.c 2010-02-23 17:09:53.075664142 -0500 @@ -78,7 +78,7 @@ static void db1x_pm_end(void) } @@ -1082,9 +1133,9 @@ diff -urNp linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c linux-2.6.32.7/arch/m .valid = suspend_valid_only_mem, .begin = db1x_pm_begin, .enter = db1x_pm_enter, -diff -urNp linux-2.6.32.7/arch/mips/include/asm/elf.h linux-2.6.32.7/arch/mips/include/asm/elf.h ---- linux-2.6.32.7/arch/mips/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/include/asm/elf.h 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/mips/include/asm/elf.h linux-2.6.32.9/arch/mips/include/asm/elf.h +--- linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/include/asm/elf.h 2010-02-23 17:09:53.075664142 -0500 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1097,9 +1148,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/elf.h linux-2.6.32.7/arch/mips/i +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.32.7/arch/mips/include/asm/page.h linux-2.6.32.7/arch/mips/include/asm/page.h ---- linux-2.6.32.7/arch/mips/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/include/asm/page.h 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/mips/include/asm/page.h linux-2.6.32.9/arch/mips/include/asm/page.h +--- linux-2.6.32.9/arch/mips/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/include/asm/page.h 2010-02-23 17:09:53.075664142 -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; @@ -1109,9 +1160,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/page.h linux-2.6.32.7/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.32.7/arch/mips/include/asm/system.h linux-2.6.32.7/arch/mips/include/asm/system.h ---- linux-2.6.32.7/arch/mips/include/asm/system.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/include/asm/system.h 2010-01-25 17:39:40.258405199 -0500 +diff -urNp linux-2.6.32.9/arch/mips/include/asm/system.h linux-2.6.32.9/arch/mips/include/asm/system.h +--- linux-2.6.32.9/arch/mips/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/include/asm/system.h 2010-02-23 17:09:53.075664142 -0500 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1120,9 +1171,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/system.h linux-2.6.32.7/arch/mip +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfn32.c 2010-02-23 17:09:53.075664142 -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) @@ -1137,9 +1188,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.7/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/kernel/binfmt_elfo32.c 2010-02-23 17:09:53.075664142 -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) @@ -1154,9 +1205,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.7/arch/m #include <asm/processor.h> /* -diff -urNp linux-2.6.32.7/arch/mips/kernel/kgdb.c linux-2.6.32.7/arch/mips/kernel/kgdb.c ---- linux-2.6.32.7/arch/mips/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/kernel/kgdb.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/kernel/kgdb.c linux-2.6.32.9/arch/mips/kernel/kgdb.c +--- linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/kernel/kgdb.c 2010-02-23 17:09:53.079699812 -0500 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto return -1; } @@ -1165,9 +1216,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/kgdb.c linux-2.6.32.7/arch/mips/kerne struct kgdb_arch arch_kgdb_ops; /* -diff -urNp linux-2.6.32.7/arch/mips/kernel/process.c linux-2.6.32.7/arch/mips/kernel/process.c ---- linux-2.6.32.7/arch/mips/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/kernel/process.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/kernel/process.c linux-2.6.32.9/arch/mips/kernel/process.c +--- linux-2.6.32.9/arch/mips/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/kernel/process.c 2010-02-23 17:09:53.079699812 -0500 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1184,9 +1235,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/process.c linux-2.6.32.7/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.32.7/arch/mips/kernel/syscall.c linux-2.6.32.7/arch/mips/kernel/syscall.c ---- linux-2.6.32.7/arch/mips/kernel/syscall.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/kernel/syscall.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/kernel/syscall.c linux-2.6.32.9/arch/mips/kernel/syscall.c +--- linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/kernel/syscall.c 2010-02-23 17:09:53.079699812 -0500 @@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1208,9 +1259,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/syscall.c linux-2.6.32.7/arch/mips/ke if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.32.7/arch/mips/mm/fault.c linux-2.6.32.7/arch/mips/mm/fault.c ---- linux-2.6.32.7/arch/mips/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/mips/mm/fault.c 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/mips/mm/fault.c linux-2.6.32.9/arch/mips/mm/fault.c +--- linux-2.6.32.9/arch/mips/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/mips/mm/fault.c 2010-02-23 17:09:53.079699812 -0500 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1235,9 +1286,9 @@ diff -urNp linux-2.6.32.7/arch/mips/mm/fault.c linux-2.6.32.7/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.32.7/arch/parisc/include/asm/elf.h linux-2.6.32.7/arch/parisc/include/asm/elf.h ---- linux-2.6.32.7/arch/parisc/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/include/asm/elf.h 2010-01-25 17:39:40.259407304 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/include/asm/elf.h linux-2.6.32.9/arch/parisc/include/asm/elf.h +--- linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/include/asm/elf.h 2010-02-23 17:09:53.079699812 -0500 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1252,9 +1303,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/include/asm/elf.h linux-2.6.32.7/arch/pari /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.32.7/arch/parisc/include/asm/pgtable.h linux-2.6.32.7/arch/parisc/include/asm/pgtable.h ---- linux-2.6.32.7/arch/parisc/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/include/asm/pgtable.h 2010-01-25 17:39:40.260411489 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/include/asm/pgtable.h linux-2.6.32.9/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/include/asm/pgtable.h 2010-02-23 17:09:53.079699812 -0500 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1273,9 +1324,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/include/asm/pgtable.h linux-2.6.32.7/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.32.7/arch/parisc/kernel/module.c linux-2.6.32.7/arch/parisc/kernel/module.c ---- linux-2.6.32.7/arch/parisc/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/kernel/module.c 2010-01-25 17:39:40.260411489 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/kernel/module.c linux-2.6.32.9/arch/parisc/kernel/module.c +--- linux-2.6.32.9/arch/parisc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/kernel/module.c 2010-02-23 17:09:53.079699812 -0500 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1376,9 +1427,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/module.c linux-2.6.32.7/arch/parisc DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c 2010-01-25 17:39:40.260411489 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/kernel/sys_parisc.c 2010-02-23 17:09:53.079699812 -0500 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1388,9 +1439,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c linux-2.6.32.7/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.32.7/arch/parisc/kernel/traps.c linux-2.6.32.7/arch/parisc/kernel/traps.c ---- linux-2.6.32.7/arch/parisc/kernel/traps.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/kernel/traps.c 2010-01-25 17:39:40.260411489 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/kernel/traps.c linux-2.6.32.9/arch/parisc/kernel/traps.c +--- linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/kernel/traps.c 2010-02-23 17:09:53.079699812 -0500 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1402,9 +1453,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/traps.c linux-2.6.32.7/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.32.7/arch/parisc/mm/fault.c linux-2.6.32.7/arch/parisc/mm/fault.c ---- linux-2.6.32.7/arch/parisc/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/parisc/mm/fault.c 2010-01-25 17:39:40.261410306 -0500 +diff -urNp linux-2.6.32.9/arch/parisc/mm/fault.c linux-2.6.32.9/arch/parisc/mm/fault.c +--- linux-2.6.32.9/arch/parisc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/parisc/mm/fault.c 2010-02-23 17:09:53.079699812 -0500 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1574,9 +1625,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/mm/fault.c linux-2.6.32.7/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/device.h linux-2.6.32.7/arch/powerpc/include/asm/device.h ---- linux-2.6.32.7/arch/powerpc/include/asm/device.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/device.h 2010-01-25 17:39:40.261410306 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/device.h linux-2.6.32.9/arch/powerpc/include/asm/device.h +--- linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/device.h 2010-02-23 17:09:53.079699812 -0500 @@ -14,7 +14,7 @@ struct dev_archdata { struct device_node *of_node; @@ -1586,15 +1637,12 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/device.h linux-2.6.32.7/arch/ /* * When an iommu is in use, dma_data is used as a ptr to the base of the -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h ---- linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h 2010-01-25 17:39:40.261410306 -0500 -@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma - * Available generic sets of operations - */ +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/dma-mapping.h 2010-02-23 17:09:53.079699812 -0500 +@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma #ifdef CONFIG_PPC64 --extern struct dma_map_ops dma_iommu_ops; -+extern const struct dma_map_ops dma_iommu_ops; + extern struct dma_map_ops dma_iommu_ops; #endif -extern struct dma_map_ops dma_direct_ops; +extern const struct dma_map_ops dma_direct_ops; @@ -1658,9 +1706,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.7/ if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/powerpc/include/asm/elf.h ---- linux-2.6.32.7/arch/powerpc/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/elf.h 2010-01-25 17:39:40.261410306 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/elf.h linux-2.6.32.9/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/elf.h 2010-02-23 17:09:53.079699812 -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. */ @@ -1683,7 +1731,7 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/pow /* * Our registers are always unsigned longs, whether we're a 32 bit -@@ -279,9 +290,6 @@ extern int arch_setup_additional_pages(s +@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(s (0x7ff >> (PAGE_SHIFT - 12)) : \ (0x3ffff >> (PAGE_SHIFT - 12))) @@ -1693,9 +1741,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/pow #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/iommu.h linux-2.6.32.7/arch/powerpc/include/asm/iommu.h ---- linux-2.6.32.7/arch/powerpc/include/asm/iommu.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/iommu.h 2010-01-25 17:39:40.261410306 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/iommu.h linux-2.6.32.9/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/iommu.h 2010-02-23 17:09:53.079699812 -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); @@ -1706,9 +1754,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/iommu.h linux-2.6.32.7/arch/p #ifdef CONFIG_PCI extern void pci_iommu_init(void); extern void pci_direct_iommu_init(void); -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h 2010-01-25 17:39:40.261410306 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/kmap_types.h 2010-02-23 17:09:53.079699812 -0500 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1717,9 +1765,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.7/a KM_TYPE_NR }; -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page_64.h linux-2.6.32.7/arch/powerpc/include/asm/page_64.h ---- linux-2.6.32.7/arch/powerpc/include/asm/page_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/page_64.h 2010-01-25 17:39:40.262409905 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/page_64.h linux-2.6.32.9/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/page_64.h 2010-02-23 17:09:53.079699812 -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. @@ -1741,9 +1789,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page_64.h linux-2.6.32.7/arch #include <asm-generic/getorder.h> -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page.h linux-2.6.32.7/arch/powerpc/include/asm/page.h ---- linux-2.6.32.7/arch/powerpc/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/page.h 2010-01-25 17:39:40.262409905 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/page.h linux-2.6.32.9/arch/powerpc/include/asm/page.h +--- linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/page.h 2010-02-23 17:09:53.079699812 -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. @@ -1756,9 +1804,19 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page.h linux-2.6.32.7/arch/po #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pci.h linux-2.6.32.7/arch/powerpc/include/asm/pci.h ---- linux-2.6.32.7/arch/powerpc/include/asm/pci.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/pci.h 2010-01-25 17:39:40.262409905 -0500 +@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr; + #define is_kernel_addr(x) ((x) >= PAGE_OFFSET) + #endif + ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) ++ + #ifndef __ASSEMBLY__ + + #undef STRICT_MM_TYPECHECKS +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/pci.h linux-2.6.32.9/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/pci.h 2010-02-23 17:09:53.079699812 -0500 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq } @@ -1770,38 +1828,20 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pci.h linux-2.6.32.7/arch/pow #else /* CONFIG_PCI */ #define set_pci_dma_ops(d) #define get_pci_dma_ops() NULL -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h ---- linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h 2010-01-25 17:39:40.262409905 -0500 -@@ -123,11 +123,11 @@ extern unsigned long bad_call_to_PMD_PAG - */ - #define PAGE_NONE __pgprot(_PAGE_BASE) - #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW) --#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC) -+#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | _PAGE_EXEC | _PAGE_HWEXEC) - #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER) --#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) -+#define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC) - #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER) --#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC) -+#define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC) - - #define __P000 PAGE_NONE - #define __P001 PAGE_READONLY -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h 2010-01-25 17:39:40.262409905 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/pte-hash32.h 2010-02-23 17:09:53.079699812 -0500 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ -+#define _PAGE_HWEXEC _PAGE_GUARDED ++#define _PAGE_EXEC _PAGE_GUARDED #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.7/arch/powerpc/include/asm/reg.h linux-2.6.32.7/arch/powerpc/include/asm/reg.h ---- linux-2.6.32.7/arch/powerpc/include/asm/reg.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/reg.h 2010-01-25 17:39:40.262409905 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/reg.h linux-2.6.32.9/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/reg.h 2010-02-23 17:09:53.079699812 -0500 @@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -1810,9 +1850,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/reg.h linux-2.6.32.7/arch/pow #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.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h ---- linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/swiotlb.h 2010-02-23 17:09:53.079699812 -0500 @@ -13,7 +13,7 @@ #include <linux/swiotlb.h> @@ -1822,9 +1862,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.7/arch static inline void dma_mark_clean(void *addr, size_t size) {} -diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/include/asm/uaccess.h 2010-02-23 17:09:53.079699812 -0500 @@ -327,52 +327,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -1993,9 +2033,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h linux-2.6.32.7/arch 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.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/cacheinfo.c 2010-02-23 17:09:53.083571404 -0500 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2005,9 +2045,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.7/arch/po .show = cache_index_show, }; -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma.c linux-2.6.32.7/arch/powerpc/kernel/dma.c ---- linux-2.6.32.7/arch/powerpc/kernel/dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/dma.c 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma.c linux-2.6.32.9/arch/powerpc/kernel/dma.c +--- linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/dma.c 2010-02-23 17:09:53.083571404 -0500 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl } #endif @@ -2017,9 +2057,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma.c linux-2.6.32.7/arch/powerpc/ .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = dma_direct_map_sg, -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c ---- linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/dma-iommu.c 2010-02-23 17:09:53.083571404 -0500 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de } @@ -2029,18 +2069,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.7/arch/po { struct iommu_table *tbl = get_iommu_table_base(dev); -@@ -89,7 +89,7 @@ static int dma_iommu_dma_supported(struc - return 1; - } - --struct dma_map_ops dma_iommu_ops = { -+const struct dma_map_ops dma_iommu_ops = { - .alloc_coherent = dma_iommu_alloc_coherent, - .free_coherent = dma_iommu_free_coherent, - .map_sg = dma_iommu_map_sg, -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c ---- linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c 2010-01-25 17:39:40.263419284 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/dma-swiotlb.c 2010-02-23 17:09:53.083571404 -0500 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; * map_page, and unmap_page on highmem, use normal dma_ops * for everything else. @@ -2050,9 +2081,45 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.7/arch/ .alloc_coherent = dma_direct_alloc_coherent, .free_coherent = dma_direct_free_coherent, .map_sg = swiotlb_map_sg_attrs, -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c ---- linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c 2010-01-25 17:39:40.264411227 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64e.S 2010-02-23 17:09:53.083571404 -0500 +@@ -455,6 +455,7 @@ storage_fault_common: + std r14,_DAR(r1) + std r15,_DSISR(r1) + addi r3,r1,STACK_FRAME_OVERHEAD ++ bl .save_nvgprs + mr r4,r14 + mr r5,r15 + ld r14,PACA_EXGEN+EX_R14(r13) +@@ -464,8 +465,7 @@ storage_fault_common: + cmpdi r3,0 + bne- 1f + b .ret_from_except_lite +-1: bl .save_nvgprs +- mr r5,r3 ++1: mr r5,r3 + addi r3,r1,STACK_FRAME_OVERHEAD + ld r4,_DAR(r1) + bl .bad_page_fault +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/exceptions-64s.S 2010-02-23 17:09:53.083571404 -0500 +@@ -818,10 +818,10 @@ handle_page_fault: + 11: ld r4,_DAR(r1) + ld r5,_DSISR(r1) + addi r3,r1,STACK_FRAME_OVERHEAD ++ bl .save_nvgprs + bl .do_page_fault + cmpdi r3,0 + beq+ 13f +- bl .save_nvgprs + mr r5,r3 + addi r3,r1,STACK_FRAME_OVERHEAD + lwz r4,_DAR(r1) +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/ibmebus.c 2010-02-23 17:09:53.083571404 -0500 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct return 1; } @@ -2062,9 +2129,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c linux-2.6.32.7/arch/powe .alloc_coherent = ibmebus_alloc_coherent, .free_coherent = ibmebus_free_coherent, .map_sg = ibmebus_map_sg, -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/kgdb.c linux-2.6.32.7/arch/powerpc/kernel/kgdb.c ---- linux-2.6.32.7/arch/powerpc/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/kgdb.c 2010-01-25 17:39:40.264411227 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/kgdb.c linux-2.6.32.9/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/kgdb.c 2010-02-23 17:09:53.083571404 -0500 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) return 0; @@ -2083,9 +2150,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/kgdb.c linux-2.6.32.7/arch/powerpc .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, }; -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/module_32.c linux-2.6.32.7/arch/powerpc/kernel/module_32.c ---- linux-2.6.32.7/arch/powerpc/kernel/module_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/module_32.c 2010-01-25 17:39:40.264411227 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/module_32.c linux-2.6.32.9/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/module_32.c 2010-02-23 17:09:53.083571404 -0500 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2115,9 +2182,51 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/module_32.c linux-2.6.32.7/arch/po /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/pci-common.c linux-2.6.32.7/arch/powerpc/kernel/pci-common.c ---- linux-2.6.32.7/arch/powerpc/kernel/pci-common.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/pci-common.c 2010-01-25 17:39:40.264411227 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/module.c linux-2.6.32.9/arch/powerpc/kernel/module.c +--- linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/module.c 2010-02-23 17:09:53.083571404 -0500 +@@ -31,11 +31,24 @@ + + LIST_HEAD(module_bug_list); + ++#ifdef CONFIG_PAX_KERNEXEC + void *module_alloc(unsigned long size) + { + if (size == 0) + return NULL; + ++ return vmalloc(size); ++} ++ ++void *module_alloc_exec(unsigned long size) ++#else ++void *module_alloc(unsigned long size) ++#endif ++ ++{ ++ if (size == 0) ++ return NULL; ++ + return vmalloc_exec(size); + } + +@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi + vfree(module_region); + } + ++#ifdef CONFIG_PAX_KERNEXEC ++void module_free_exec(struct module *mod, void *module_region) ++{ ++ module_free(mod, module_region); ++} ++#endif ++ + static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, + const Elf_Shdr *sechdrs, + const char *name) +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/pci-common.c linux-2.6.32.9/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/pci-common.c 2010-02-23 17:09:53.083571404 -0500 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base; unsigned int ppc_pci_flags = 0; @@ -2136,10 +2245,10 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/pci-common.c linux-2.6.32.7/arch/p { return pci_dma_ops; } -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/process.c linux-2.6.32.7/arch/powerpc/kernel/process.c ---- linux-2.6.32.7/arch/powerpc/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/process.c 2010-01-25 17:39:40.265431637 -0500 -@@ -1153,51 +1153,3 @@ unsigned long arch_align_stack(unsigned +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/process.c linux-2.6.32.9/arch/powerpc/kernel/process.c +--- linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/process.c 2010-02-23 17:09:53.083571404 -0500 +@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; } @@ -2191,9 +2300,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/process.c linux-2.6.32.7/arch/powe - - return ret; -} -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_32.c linux-2.6.32.7/arch/powerpc/kernel/signal_32.c ---- linux-2.6.32.7/arch/powerpc/kernel/signal_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/signal_32.c 2010-01-25 17:39:40.265431637 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/signal_32.c linux-2.6.32.9/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/signal_32.c 2010-02-23 17:09:53.083571404 -0500 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2203,9 +2312,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_32.c linux-2.6.32.7/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_64.c linux-2.6.32.7/arch/powerpc/kernel/signal_64.c ---- linux-2.6.32.7/arch/powerpc/kernel/signal_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/signal_64.c 2010-01-25 17:39:40.265431637 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/signal_64.c linux-2.6.32.9/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/signal_64.c 2010-02-23 17:09:53.083571404 -0500 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2215,9 +2324,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_64.c linux-2.6.32.7/arch/po regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c 2010-01-25 17:39:40.265431637 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/sys_ppc32.c 2010-02-23 17:09:53.083571404 -0500 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2231,9 +2340,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.7/arch/po } return error; } -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vdso.c linux-2.6.32.7/arch/powerpc/kernel/vdso.c ---- linux-2.6.32.7/arch/powerpc/kernel/vdso.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/vdso.c 2010-01-25 17:39:40.265431637 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/vdso.c linux-2.6.32.9/arch/powerpc/kernel/vdso.c +--- linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/vdso.c 2010-02-23 17:09:53.083571404 -0500 @@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> @@ -2260,9 +2369,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vdso.c linux-2.6.32.7/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vio.c linux-2.6.32.7/arch/powerpc/kernel/vio.c ---- linux-2.6.32.7/arch/powerpc/kernel/vio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/kernel/vio.c 2010-01-25 17:39:40.266406212 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/kernel/vio.c linux-2.6.32.9/arch/powerpc/kernel/vio.c +--- linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/kernel/vio.c 2010-02-23 17:09:53.083571404 -0500 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc vio_cmo_dealloc(viodev, alloc_size); } @@ -2285,9 +2394,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vio.c linux-2.6.32.7/arch/powerpc/ viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; } -diff -urNp linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c 2010-01-25 17:39:40.266406212 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/lib/usercopy_64.c 2010-02-23 17:09:53.083571404 -0500 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2319,9 +2428,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c linux-2.6.32.7/arch/pow -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.32.7/arch/powerpc/mm/fault.c linux-2.6.32.7/arch/powerpc/mm/fault.c ---- linux-2.6.32.7/arch/powerpc/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/mm/fault.c 2010-01-25 17:39:40.266406212 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/mm/fault.c linux-2.6.32.9/arch/powerpc/mm/fault.c +--- linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/mm/fault.c 2010-02-23 17:09:53.083571404 -0500 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -2363,7 +2472,7 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/fault.c linux-2.6.32.7/arch/powerpc/mm + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 5; i++) { + unsigned int c; -+ if (get_user(c, (unsigned int *)pc+i)) ++ if (get_user(c, (unsigned int __user *)pc+i)) + printk(KERN_CONT "???????? "); + else + printk(KERN_CONT "%08x ", c); @@ -2426,9 +2535,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/fault.c linux-2.6.32.7/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.32.7/arch/powerpc/mm/mmap_64.c linux-2.6.32.7/arch/powerpc/mm/mmap_64.c ---- linux-2.6.32.7/arch/powerpc/mm/mmap_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/mm/mmap_64.c 2010-01-25 17:39:40.266406212 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/mm/mmap_64.c linux-2.6.32.9/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/mm/mmap_64.c 2010-02-23 17:09:53.083571404 -0500 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2452,9 +2561,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/mmap_64.c linux-2.6.32.7/arch/powerpc/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.7/arch/powerpc/mm/slice.c linux-2.6.32.7/arch/powerpc/mm/slice.c ---- linux-2.6.32.7/arch/powerpc/mm/slice.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/mm/slice.c 2010-01-25 17:39:40.267414851 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/mm/slice.c linux-2.6.32.9/arch/powerpc/mm/slice.c +--- linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/mm/slice.c 2010-02-23 17:09:53.083571404 -0500 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2467,9 +2576,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/slice.c linux-2.6.32.7/arch/powerpc/mm /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c ---- linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-01-25 17:39:40.267414851 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-23 17:09:53.083571404 -0500 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void) lite5200_pm_target_state = PM_SUSPEND_ON; } @@ -2479,9 +2588,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32 .valid = lite5200_pm_valid, .begin = lite5200_pm_begin, .prepare = lite5200_pm_prepare, -diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c ---- linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-01-25 17:39:40.267414851 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-23 17:09:53.083571404 -0500 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) iounmap(mbar); } @@ -2491,9 +2600,9 @@ diff -urNp linux-2.6.32.7/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.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c ---- linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c 2010-01-25 17:39:40.267414851 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/83xx/suspend.c 2010-02-23 17:09:53.088041045 -0500 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) return ret; } @@ -2503,9 +2612,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.7/a .valid = mpc83xx_suspend_valid, .begin = mpc83xx_suspend_begin, .enter = mpc83xx_suspend_enter, -diff -urNp linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c ---- linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c 2010-01-25 17:39:40.268213794 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/cell/iommu.c 2010-02-23 17:09:53.088041045 -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); @@ -2515,9 +2624,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.7/arc .alloc_coherent = dma_fixed_alloc_coherent, .free_coherent = dma_fixed_free_coherent, .map_sg = dma_fixed_map_sg, -diff -urNp linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c ---- linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c 2010-01-25 17:39:40.268213794 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/ps3/system-bus.c 2010-02-23 17:09:53.088041045 -0500 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi return mask >= DMA_BIT_MASK(32); } @@ -2536,9 +2645,57 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.7 .alloc_coherent = ps3_alloc_coherent, .free_coherent = ps3_free_coherent, .map_sg = ps3_ioc0_map_sg, -diff -urNp linux-2.6.32.7/arch/s390/include/asm/uaccess.h linux-2.6.32.7/arch/s390/include/asm/uaccess.h ---- linux-2.6.32.7/arch/s390/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/s390/include/asm/uaccess.h 2010-01-25 17:39:40.268213794 -0500 +diff -urNp linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/powerpc/platforms/pseries/Kconfig 2010-02-23 17:09:53.088041045 -0500 +@@ -2,6 +2,8 @@ config PPC_PSERIES + depends on PPC64 && PPC_BOOK3S + bool "IBM pSeries & new (POWER5-based) iSeries" + select MPIC ++ select PCI_MSI ++ select XICS + select PPC_I8259 + select PPC_RTAS + select RTAS_ERROR_LOGGING +diff -urNp linux-2.6.32.9/arch/s390/include/asm/elf.h linux-2.6.32.9/arch/s390/include/asm/elf.h +--- linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/include/asm/elf.h 2010-02-23 17:09:53.088041045 -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) + ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) ++#endif ++ + /* This yields a mask that user programs can use to figure out what + instruction set this CPU supports. */ + +diff -urNp linux-2.6.32.9/arch/s390/include/asm/setup.h linux-2.6.32.9/arch/s390/include/asm/setup.h +--- linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/include/asm/setup.h 2010-02-23 17:09:53.088041045 -0500 +@@ -50,13 +50,13 @@ extern unsigned long memory_end; + void detect_memory_layout(struct mem_chunk chunk[]); + + #ifdef CONFIG_S390_SWITCH_AMODE +-extern unsigned int switch_amode; ++#define switch_amode (1) + #else + #define switch_amode (0) + #endif + + #ifdef CONFIG_S390_EXEC_PROTECT +-extern unsigned int s390_noexec; ++#define s390_noexec (1) + #else + #define s390_noexec (0) + #endif +diff -urNp linux-2.6.32.9/arch/s390/include/asm/uaccess.h linux-2.6.32.9/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/include/asm/uaccess.h 2010-02-23 17:09:53.088041045 -0500 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2571,9 +2728,49 @@ diff -urNp linux-2.6.32.7/arch/s390/include/asm/uaccess.h linux-2.6.32.7/arch/s3 if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.32.7/arch/s390/kernel/module.c linux-2.6.32.7/arch/s390/kernel/module.c ---- linux-2.6.32.7/arch/s390/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/s390/kernel/module.c 2010-01-25 17:39:40.268213794 -0500 +diff -urNp linux-2.6.32.9/arch/s390/Kconfig linux-2.6.32.9/arch/s390/Kconfig +--- linux-2.6.32.9/arch/s390/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/Kconfig 2010-02-23 17:09:53.088041045 -0500 +@@ -194,28 +194,26 @@ config AUDIT_ARCH + + config S390_SWITCH_AMODE + bool "Switch kernel/user addressing modes" ++ default y + help + This option allows to switch the addressing modes of kernel and user +- space. The kernel parameter switch_amode=on will enable this feature, +- default is disabled. Enabling this (via kernel parameter) on machines +- earlier than IBM System z9-109 EC/BC will reduce system performance. ++ space. Enabling this on machines earlier than IBM System z9-109 EC/BC ++ will reduce system performance. + + Note that this option will also be selected by selecting the execute +- protection option below. Enabling the execute protection via the +- noexec kernel parameter will also switch the addressing modes, +- independent of the switch_amode kernel parameter. ++ protection option below. Enabling the execute protection will also ++ switch the addressing modes, independent of this option. + + + config S390_EXEC_PROTECT + bool "Data execute protection" ++ default y + select S390_SWITCH_AMODE + help + This option allows to enable a buffer overflow protection for user + space programs and it also selects the addressing mode option above. +- The kernel parameter noexec=on will enable this feature and also +- switch the addressing modes, default is disabled. Enabling this (via +- kernel parameter) on machines earlier than IBM System z9-109 EC/BC +- will reduce system performance. ++ Enabling this on machines earlier than IBM System z9-109 EC/BC will ++ reduce system performance. + + comment "Code generation options" + +diff -urNp linux-2.6.32.9/arch/s390/kernel/module.c linux-2.6.32.9/arch/s390/kernel/module.c +--- linux-2.6.32.9/arch/s390/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/kernel/module.c 2010-02-23 17:09:53.088041045 -0500 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2645,9 +2842,114 @@ diff -urNp linux-2.6.32.7/arch/s390/kernel/module.c linux-2.6.32.7/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c ---- linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c 2010-01-25 17:39:40.268213794 -0500 +diff -urNp linux-2.6.32.9/arch/s390/kernel/setup.c linux-2.6.32.9/arch/s390/kernel/setup.c +--- linux-2.6.32.9/arch/s390/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/kernel/setup.c 2010-02-23 17:09:53.088041045 -0500 +@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * + early_param("mem", early_parse_mem); + + #ifdef CONFIG_S390_SWITCH_AMODE +-unsigned int switch_amode = 0; +-EXPORT_SYMBOL_GPL(switch_amode); +- + static int set_amode_and_uaccess(unsigned long user_amode, + unsigned long user32_amode) + { +@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigne + return 0; + } + } +- +-/* +- * Switch kernel/user addressing modes? +- */ +-static int __init early_parse_switch_amode(char *p) +-{ +- switch_amode = 1; +- return 0; +-} +-early_param("switch_amode", early_parse_switch_amode); +- + #else /* CONFIG_S390_SWITCH_AMODE */ + static inline int set_amode_and_uaccess(unsigned long user_amode, + unsigned long user32_amode) +@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess( + } + #endif /* CONFIG_S390_SWITCH_AMODE */ + +-#ifdef CONFIG_S390_EXEC_PROTECT +-unsigned int s390_noexec = 0; +-EXPORT_SYMBOL_GPL(s390_noexec); +- +-/* +- * Enable execute protection? +- */ +-static int __init early_parse_noexec(char *p) +-{ +- if (!strncmp(p, "off", 3)) +- return 0; +- switch_amode = 1; +- s390_noexec = 1; +- return 0; +-} +-early_param("noexec", early_parse_noexec); +-#endif /* CONFIG_S390_EXEC_PROTECT */ +- + static void setup_addressing_mode(void) + { + if (s390_noexec) { +diff -urNp linux-2.6.32.9/arch/s390/mm/mmap.c linux-2.6.32.9/arch/s390/mm/mmap.c +--- linux-2.6.32.9/arch/s390/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/s390/mm/mmap.c 2010-02-23 17:09:53.088041045 -0500 +@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str + */ + if (mmap_is_legacy()) { + mm->mmap_base = TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base += mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area = arch_get_unmapped_area; + mm->unmap_area = arch_unmap_area; + } else { + mm->mmap_base = mmap_base(); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -= mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area = arch_get_unmapped_area_topdown; + mm->unmap_area = arch_unmap_area_topdown; + } +@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_str + */ + if (mmap_is_legacy()) { + mm->mmap_base = TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base += mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area = s390_get_unmapped_area; + mm->unmap_area = arch_unmap_area; + } else { + mm->mmap_base = mmap_base(); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -= mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area = s390_get_unmapped_area_topdown; + mm->unmap_area = arch_unmap_area_topdown; + } +diff -urNp linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sh/boards/mach-hp6xx/pm.c 2010-02-23 17:09:53.088041045 -0500 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ return 0; } @@ -2657,9 +2959,9 @@ diff -urNp linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.7/arch/sh/ .enter = hp6x0_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c 2010-01-25 17:39:40.269407003 -0500 +diff -urNp linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sh/kernel/cpu/sh4/sq.c 2010-02-23 17:09:53.088041045 -0500 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -2669,9 +2971,9 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.7/arch/sh/ker .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c ---- linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-01-25 17:39:40.269407003 -0500 +diff -urNp linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-23 17:09:53.088041045 -0500 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s return 0; } @@ -2681,9 +2983,9 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.7/arch/s .enter = sh_pm_enter, .valid = suspend_valid_only_mem, }; -diff -urNp linux-2.6.32.7/arch/sh/kernel/kgdb.c linux-2.6.32.7/arch/sh/kernel/kgdb.c ---- linux-2.6.32.7/arch/sh/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sh/kernel/kgdb.c 2010-01-25 17:39:40.269407003 -0500 +diff -urNp linux-2.6.32.9/arch/sh/kernel/kgdb.c linux-2.6.32.9/arch/sh/kernel/kgdb.c +--- linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sh/kernel/kgdb.c 2010-02-23 17:09:53.088041045 -0500 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void) { } @@ -2693,21 +2995,33 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/kgdb.c linux-2.6.32.7/arch/sh/kernel/kg /* Breakpoint instruction: trapa #0x3c */ #ifdef CONFIG_CPU_LITTLE_ENDIAN .gdb_bpt_instr = { 0x3c, 0xc3 }, -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h 2010-01-25 17:39:40.269407003 -0500 -@@ -14,18 +14,26 @@ +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/atomic_64.h 2010-02-23 17:09:53.088041045 -0500 +@@ -14,18 +14,38 @@ #define ATOMIC64_INIT(i) { (i) } #define atomic_read(v) ((v)->counter) -+#define atomic_read_unchecked(v) ((v)->counter) ++static inline int atomic_read_unchecked(const atomic_unchecked_t *v) ++{ ++ return v->counter; ++} #define atomic64_read(v) ((v)->counter) -+#define atomic64_read_unchecked(v) ((v)->counter) ++static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v) ++{ ++ return v->counter; ++} #define atomic_set(v, i) (((v)->counter) = i) -+#define atomic_set_unchecked(v, i) (((v)->counter) = i) ++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) ++{ ++ v->counter = i; ++} #define atomic64_set(v, i) (((v)->counter) = i) -+#define atomic64_set_unchecked(v, i) (((v)->counter) = i) ++static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i) ++{ ++ v->counter = i; ++} extern void atomic_add(int, atomic_t *); +extern void atomic_add_unchecked(int, atomic_unchecked_t *); @@ -2723,7 +3037,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch extern int atomic_sub_ret(int, atomic_t *); extern int atomic64_sub_ret(int, atomic64_t *); -@@ -34,6 +42,7 @@ extern int atomic64_sub_ret(int, atomic6 +@@ -34,6 +54,7 @@ extern int atomic64_sub_ret(int, atomic6 #define atomic_inc_return(v) atomic_add_ret(1, v) #define atomic64_inc_return(v) atomic64_add_ret(1, v) @@ -2731,17 +3045,23 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch #define atomic_sub_return(i, v) atomic_sub_ret(i, v) #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) -@@ -59,7 +68,9 @@ extern int atomic64_sub_ret(int, atomic6 +@@ -59,7 +80,15 @@ extern int atomic64_sub_ret(int, atomic6 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0) #define atomic_inc(v) atomic_add(1, v) -+#define atomic_inc_unchecked(v) atomic_add_unchecked(1, v) ++static inline void atomic_inc_unchecked(atomic_unchecked_t *v) ++{ ++ atomic_add_unchecked(1, v); ++} #define atomic64_inc(v) atomic64_add(1, v) -+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, v) ++static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v) ++{ ++ atomic64_add_unchecked(1, v); ++} #define atomic_dec(v) atomic_sub(1, v) #define atomic64_dec(v) atomic64_sub(1, v) -@@ -72,17 +83,28 @@ extern int atomic64_sub_ret(int, atomic6 +@@ -72,17 +101,28 @@ extern int atomic64_sub_ret(int, atomic6 static inline int atomic_add_unless(atomic_t *v, int a, int u) { @@ -2774,7 +3094,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -@@ -93,17 +115,28 @@ static inline int atomic_add_unless(atom +@@ -93,17 +133,28 @@ static inline int atomic_add_unless(atom static inline int atomic64_add_unless(atomic64_t *v, long a, long u) { @@ -2807,9 +3127,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h ---- linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h 2010-01-25 17:39:40.269407003 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/dma-mapping.h 2010-02-23 17:09:53.088041045 -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) @@ -2841,9 +3161,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.7/ar 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.7/arch/sparc/include/asm/elf_32.h linux-2.6.32.7/arch/sparc/include/asm/elf_32.h ---- linux-2.6.32.7/arch/sparc/include/asm/elf_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/elf_32.h 2010-01-25 17:39:40.270305658 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/elf_32.h linux-2.6.32.9/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/elf_32.h 2010-02-23 17:09:53.088041045 -0500 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -2858,9 +3178,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_32.h linux-2.6.32.7/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_64.h linux-2.6.32.7/arch/sparc/include/asm/elf_64.h ---- linux-2.6.32.7/arch/sparc/include/asm/elf_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/elf_64.h 2010-01-25 17:39:40.270305658 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/elf_64.h linux-2.6.32.9/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/elf_64.h 2010-02-23 17:09:53.088041045 -0500 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -2868,15 +3188,15 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_64.h linux-2.6.32.7/arch/sp +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL) + -+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28 ) -+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29 ) ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29) +#endif /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h 2010-01-25 17:39:40.270305658 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/pgtable_32.h 2010-02-23 17:09:53.088041045 -0500 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -2908,9 +3228,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.7/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h 2010-01-25 17:39:40.270305658 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/pgtsrmmu.h 2010-02-23 17:09:53.088041045 -0500 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -2925,9 +3245,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.7/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h 2010-01-25 17:39:40.270305658 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/spinlock_64.h 2010-02-23 17:09:53.091669311 -0500 @@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -2979,9 +3299,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h 2010-01-25 17:39:40.271168771 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_32.h 2010-02-23 17:09:53.091669311 -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) @@ -3033,9 +3353,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.7/arc return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h 2010-01-25 17:39:40.271168771 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/include/asm/uaccess_64.h 2010-02-23 17:09:53.091669311 -0500 @@ -9,6 +9,7 @@ #include <linux/compiler.h> #include <linux/string.h> @@ -3086,9 +3406,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.7/arc if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); return ret; -diff -urNp linux-2.6.32.7/arch/sparc/kernel/iommu.c linux-2.6.32.7/arch/sparc/kernel/iommu.c ---- linux-2.6.32.7/arch/sparc/kernel/iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/iommu.c 2010-01-25 17:39:40.271168771 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/iommu.c linux-2.6.32.9/arch/sparc/kernel/iommu.c +--- linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/iommu.c 2010-02-23 17:09:53.091669311 -0500 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3107,9 +3427,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/iommu.c linux-2.6.32.7/arch/sparc/ke EXPORT_SYMBOL(dma_ops); extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); -diff -urNp linux-2.6.32.7/arch/sparc/kernel/ioport.c linux-2.6.32.7/arch/sparc/kernel/ioport.c ---- linux-2.6.32.7/arch/sparc/kernel/ioport.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/ioport.c 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/ioport.c linux-2.6.32.9/arch/sparc/kernel/ioport.c +--- linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/ioport.c 2010-02-23 17:09:53.091669311 -0500 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru BUG(); } @@ -3137,9 +3457,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/ioport.c linux-2.6.32.7/arch/sparc/k .alloc_coherent = pci32_alloc_coherent, .free_coherent = pci32_free_coherent, .map_page = pci32_map_page, -diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c ---- linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/kgdb_32.c 2010-02-23 17:09:53.091669311 -0500 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void) { } @@ -3149,9 +3469,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c linux-2.6.32.7/arch/sparc/ /* Breakpoint instruction: ta 0x7d */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, }; -diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c ---- linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/kgdb_64.c 2010-02-23 17:09:53.091669311 -0500 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void) { } @@ -3161,9 +3481,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c linux-2.6.32.7/arch/sparc/ /* Breakpoint instruction: ta 0x72 */ .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, }; -diff -urNp linux-2.6.32.7/arch/sparc/kernel/Makefile linux-2.6.32.7/arch/sparc/kernel/Makefile ---- linux-2.6.32.7/arch/sparc/kernel/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/Makefile 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/Makefile linux-2.6.32.9/arch/sparc/kernel/Makefile +--- linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/Makefile 2010-02-23 17:09:53.091669311 -0500 @@ -3,7 +3,7 @@ # @@ -3173,9 +3493,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/Makefile linux-2.6.32.7/arch/sparc/k extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c ---- linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/pci_sun4v.c 2010-02-23 17:09:53.091669311 -0500 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic spin_unlock_irqrestore(&iommu->lock, flags); } @@ -3185,9 +3505,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.7/arch/spar .alloc_coherent = dma_4v_alloc_coherent, .free_coherent = dma_4v_free_coherent, .map_page = dma_4v_map_page, -diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c 2010-01-25 17:39:40.272167371 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_32.c 2010-02-23 17:09:53.091669311 -0500 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3197,9 +3517,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.7/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c 2010-01-25 17:39:40.273112460 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/sys_sparc_64.c 2010-02-23 17:09:53.091669311 -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. @@ -3278,9 +3598,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.7/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.32.7/arch/sparc/kernel/traps_64.c linux-2.6.32.7/arch/sparc/kernel/traps_64.c ---- linux-2.6.32.7/arch/sparc/kernel/traps_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/kernel/traps_64.c 2010-01-25 17:39:40.273112460 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/traps_64.c linux-2.6.32.9/arch/sparc/kernel/traps_64.c +--- linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/traps_64.c 2010-02-23 17:09:53.091669311 -0500 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3312,9 +3632,27 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/traps_64.c linux-2.6.32.7/arch/sparc dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.32.7/arch/sparc/lib/atomic_64.S linux-2.6.32.7/arch/sparc/lib/atomic_64.S ---- linux-2.6.32.7/arch/sparc/lib/atomic_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/lib/atomic_64.S 2010-01-25 17:39:40.273112460 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/kernel/tsb.S linux-2.6.32.9/arch/sparc/kernel/tsb.S +--- linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/kernel/tsb.S 2010-02-23 17:09:53.091669311 -0500 +@@ -191,10 +191,12 @@ tsb_dtlb_load: + + tsb_itlb_load: + /* Executable bit must be set. */ +-661: andcc %g5, _PAGE_EXEC_4U, %g0 +- .section .sun4v_1insn_patch, "ax" ++661: sethi %hi(_PAGE_EXEC_4U), %g4 ++ andcc %g5, %g4, %g0 ++ .section .sun4v_2insn_patch, "ax" + .word 661b + andcc %g5, _PAGE_EXEC_4V, %g0 ++ nop + .previous + + be,pn %xcc, tsb_do_fault +diff -urNp linux-2.6.32.9/arch/sparc/lib/atomic_64.S linux-2.6.32.9/arch/sparc/lib/atomic_64.S +--- linux-2.6.32.9/arch/sparc/lib/atomic_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/lib/atomic_64.S 2010-02-23 17:09:53.091669311 -0500 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3508,9 +3846,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/atomic_64.S linux-2.6.32.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.32.7/arch/sparc/lib/ksyms.c linux-2.6.32.7/arch/sparc/lib/ksyms.c ---- linux-2.6.32.7/arch/sparc/lib/ksyms.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/lib/ksyms.c 2010-01-25 17:39:40.273112460 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/lib/ksyms.c linux-2.6.32.9/arch/sparc/lib/ksyms.c +--- linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/lib/ksyms.c 2010-02-23 17:09:53.091669311 -0500 @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3522,9 +3860,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/ksyms.c linux-2.6.32.7/arch/sparc/lib/k EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.32.7/arch/sparc/lib/rwsem_64.S linux-2.6.32.7/arch/sparc/lib/rwsem_64.S ---- linux-2.6.32.7/arch/sparc/lib/rwsem_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/lib/rwsem_64.S 2010-01-25 17:39:40.273112460 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/lib/rwsem_64.S linux-2.6.32.9/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/lib/rwsem_64.S 2010-02-23 17:09:53.091669311 -0500 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -3623,9 +3961,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/rwsem_64.S linux-2.6.32.7/arch/sparc/li cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.32.7/arch/sparc/Makefile linux-2.6.32.7/arch/sparc/Makefile ---- linux-2.6.32.7/arch/sparc/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/Makefile 2010-01-25 17:39:40.274409873 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/Makefile linux-2.6.32.9/arch/sparc/Makefile +--- linux-2.6.32.9/arch/sparc/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/Makefile 2010-02-23 17:09:53.091669311 -0500 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -3635,9 +3973,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/Makefile linux-2.6.32.7/arch/sparc/Makefile VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_32.c linux-2.6.32.7/arch/sparc/mm/fault_32.c ---- linux-2.6.32.7/arch/sparc/mm/fault_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/mm/fault_32.c 2010-01-25 17:39:40.274409873 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_32.c linux-2.6.32.9/arch/sparc/mm/fault_32.c +--- linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/mm/fault_32.c 2010-02-23 17:09:53.091669311 -0500 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -3902,7 +4240,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_32.c linux-2.6.32.7/arch/sparc/mm/ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); -+ for (i = 0; i < 5; i++) { ++ for (i = 0; i < 8; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); @@ -3941,9 +4279,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_32.c linux-2.6.32.7/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/fault_64.c ---- linux-2.6.32.7/arch/sparc/mm/fault_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/mm/fault_64.c 2010-01-25 17:39:40.274409873 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/mm/fault_64.c linux-2.6.32.9/arch/sparc/mm/fault_64.c +--- linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/mm/fault_64.c 2010-02-23 17:11:24.403715775 -0500 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -3954,7 +4292,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ #include <asm/page.h> #include <asm/pgtable.h> -@@ -249,6 +252,416 @@ static void noinline bogus_32bit_fault_a +@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_a show_regs(regs); } @@ -4097,16 +4435,18 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + } while (0); + + do { /* PaX: patched PLT emulation #4 */ -+ unsigned int mov1, call, mov2; ++ unsigned int sethi, mov1, call, mov2; + -+ err = get_user(mov1, (unsigned int *)regs->tpc); -+ err |= get_user(call, (unsigned int *)(regs->tpc+4)); -+ err |= get_user(mov2, (unsigned int *)(regs->tpc+8)); ++ err = get_user(sethi, (unsigned int *)regs->tpc); ++ err |= get_user(mov1, (unsigned int *)(regs->tpc+4)); ++ err |= get_user(call, (unsigned int *)(regs->tpc+8)); ++ err |= get_user(mov2, (unsigned int *)(regs->tpc+12)); + + if (err) + break; + -+ if (mov1 == 0x8210000FU && ++ if ((sethi & 0xFFC00000U) == 0x03000000U && ++ mov1 == 0x8210000FU && + (call & 0xC0000000U) == 0x40000000U && + mov2 == 0x9E100001U) + { @@ -4125,24 +4465,26 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + } while (0); + + do { /* PaX: patched PLT emulation #5 */ -+ unsigned int sethi1, sethi2, or1, or2, sllx, jmpl, nop; ++ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop; + -+ err = get_user(sethi1, (unsigned int *)regs->tpc); -+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4)); -+ err |= get_user(or1, (unsigned int *)(regs->tpc+8)); -+ err |= get_user(or2, (unsigned int *)(regs->tpc+12)); -+ err |= get_user(sllx, (unsigned int *)(regs->tpc+16)); -+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20)); -+ err |= get_user(nop, (unsigned int *)(regs->tpc+24)); ++ err = get_user(sethi, (unsigned int *)regs->tpc); ++ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4)); ++ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8)); ++ err |= get_user(or1, (unsigned int *)(regs->tpc+12)); ++ err |= get_user(or2, (unsigned int *)(regs->tpc+16)); ++ err |= get_user(sllx, (unsigned int *)(regs->tpc+20)); ++ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24)); ++ err |= get_user(nop, (unsigned int *)(regs->tpc+28)); + + if (err) + break; + -+ if ((sethi1 & 0xFFC00000U) == 0x03000000U && ++ if ((sethi & 0xFFC00000U) == 0x03000000U && ++ (sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x0B000000U && + (or1 & 0xFFFFE000U) == 0x82106000U && + (or2 & 0xFFFFE000U) == 0x8A116000U && -+ sllx == 0x83287020 && ++ sllx == 0x83287020U && + jmpl == 0x81C04005U && + nop == 0x01000000U) + { @@ -4159,21 +4501,23 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + } while (0); + + do { /* PaX: patched PLT emulation #6 */ -+ unsigned int sethi1, sethi2, sllx, or, jmpl, nop; ++ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop; + -+ err = get_user(sethi1, (unsigned int *)regs->tpc); -+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4)); -+ err |= get_user(sllx, (unsigned int *)(regs->tpc+8)); -+ err |= get_user(or, (unsigned int *)(regs->tpc+12)); -+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+16)); -+ err |= get_user(nop, (unsigned int *)(regs->tpc+20)); ++ err = get_user(sethi, (unsigned int *)regs->tpc); ++ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4)); ++ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8)); ++ err |= get_user(sllx, (unsigned int *)(regs->tpc+12)); ++ err |= get_user(or, (unsigned int *)(regs->tpc+16)); ++ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20)); ++ err |= get_user(nop, (unsigned int *)(regs->tpc+24)); + + if (err) + break; + -+ if ((sethi1 & 0xFFC00000U) == 0x03000000U && ++ if ((sethi & 0xFFC00000U) == 0x03000000U && ++ (sethi1 & 0xFFC00000U) == 0x03000000U && + (sethi2 & 0xFFC00000U) == 0x0B000000U && -+ sllx == 0x83287020 && ++ sllx == 0x83287020U && + (or & 0xFFFFE000U) == 0x8A116000U && + jmpl == 0x81C04005U && + nop == 0x01000000U) @@ -4206,6 +4550,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + { + unsigned long addr; + unsigned int save, call; ++ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl; + + if ((ba & 0xFFC00000U) == 0x30800000U) + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2); @@ -4288,6 +4633,39 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + regs->tnpc = addr+4; + return 3; + } ++ ++ /* PaX: 64-bit PLT stub */ ++ err = get_user(sethi1, (unsigned int *)addr); ++ err |= get_user(sethi2, (unsigned int *)(addr+4)); ++ err |= get_user(or1, (unsigned int *)(addr+8)); ++ err |= get_user(or2, (unsigned int *)(addr+12)); ++ err |= get_user(sllx, (unsigned int *)(addr+16)); ++ err |= get_user(add, (unsigned int *)(addr+20)); ++ err |= get_user(jmpl, (unsigned int *)(addr+24)); ++ err |= get_user(nop, (unsigned int *)(addr+28)); ++ if (err) ++ break; ++ ++ if ((sethi1 & 0xFFC00000U) == 0x09000000U && ++ (sethi2 & 0xFFC00000U) == 0x0B000000U && ++ (or1 & 0xFFFFE000U) == 0x88112000U && ++ (or2 & 0xFFFFE000U) == 0x8A116000U && ++ sllx == 0x89293020U && ++ add == 0x8A010005U && ++ jmpl == 0x89C14000U && ++ nop == 0x01000000U) ++ { ++ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU); ++ regs->u_regs[UREG_G4] <<= 32; ++ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU); ++ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4]; ++ regs->u_regs[UREG_G4] = addr + 24; ++ addr = regs->u_regs[UREG_G5]; ++ regs->tpc = addr; ++ regs->tnpc = addr+4; ++ return 3; ++ } + } + } while (0); + @@ -4357,7 +4735,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ + unsigned long i; + + printk(KERN_ERR "PAX: bytes at PC: "); -+ for (i = 0; i < 5; i++) { ++ for (i = 0; i < 8; i++) { + unsigned int c; + if (get_user(c, (unsigned int *)pc+i)) + printk(KERN_CONT "???????? "); @@ -4371,7 +4749,7 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) { struct mm_struct *mm = current->mm; -@@ -315,6 +728,29 @@ asmlinkage void __kprobes do_sparc64_fau +@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fau if (!vma) goto bad_area; @@ -4401,9 +4779,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.32.7/arch/sparc/mm/init_32.c linux-2.6.32.7/arch/sparc/mm/init_32.c ---- linux-2.6.32.7/arch/sparc/mm/init_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/mm/init_32.c 2010-01-25 17:39:40.274409873 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/mm/init_32.c linux-2.6.32.9/arch/sparc/mm/init_32.c +--- linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/mm/init_32.c 2010-02-23 17:09:53.095660904 -0500 @@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4438,9 +4816,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/init_32.c linux-2.6.32.7/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.32.7/arch/sparc/mm/Makefile linux-2.6.32.7/arch/sparc/mm/Makefile ---- linux-2.6.32.7/arch/sparc/mm/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/mm/Makefile 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/mm/Makefile linux-2.6.32.9/arch/sparc/mm/Makefile +--- linux-2.6.32.9/arch/sparc/mm/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/mm/Makefile 2010-02-23 17:09:53.095660904 -0500 @@ -2,7 +2,7 @@ # @@ -4450,9 +4828,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/Makefile linux-2.6.32.7/arch/sparc/mm/Ma obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.32.7/arch/sparc/mm/srmmu.c linux-2.6.32.7/arch/sparc/mm/srmmu.c ---- linux-2.6.32.7/arch/sparc/mm/srmmu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/sparc/mm/srmmu.c 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/sparc/mm/srmmu.c linux-2.6.32.9/arch/sparc/mm/srmmu.c +--- linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/sparc/mm/srmmu.c 2010-02-23 17:09:53.095660904 -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)); @@ -4467,9 +4845,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/srmmu.c linux-2.6.32.7/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.32.7/arch/um/include/asm/kmap_types.h linux-2.6.32.7/arch/um/include/asm/kmap_types.h ---- linux-2.6.32.7/arch/um/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/um/include/asm/kmap_types.h 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/um/include/asm/kmap_types.h linux-2.6.32.9/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/um/include/asm/kmap_types.h 2010-02-23 17:09:53.095660904 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4478,9 +4856,9 @@ diff -urNp linux-2.6.32.7/arch/um/include/asm/kmap_types.h linux-2.6.32.7/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.32.7/arch/um/include/asm/page.h linux-2.6.32.7/arch/um/include/asm/page.h ---- linux-2.6.32.7/arch/um/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/um/include/asm/page.h 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/um/include/asm/page.h linux-2.6.32.9/arch/um/include/asm/page.h +--- linux-2.6.32.9/arch/um/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/um/include/asm/page.h 2010-02-23 17:09:53.095660904 -0500 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4491,9 +4869,9 @@ diff -urNp linux-2.6.32.7/arch/um/include/asm/page.h linux-2.6.32.7/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.32.7/arch/um/sys-i386/syscalls.c linux-2.6.32.7/arch/um/sys-i386/syscalls.c ---- linux-2.6.32.7/arch/um/sys-i386/syscalls.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/um/sys-i386/syscalls.c 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/um/sys-i386/syscalls.c linux-2.6.32.9/arch/um/sys-i386/syscalls.c +--- linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/um/sys-i386/syscalls.c 2010-02-23 17:09:53.095660904 -0500 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4516,9 +4894,9 @@ diff -urNp linux-2.6.32.7/arch/um/sys-i386/syscalls.c linux-2.6.32.7/arch/um/sys /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.32.7/arch/x86/boot/bitops.h linux-2.6.32.7/arch/x86/boot/bitops.h ---- linux-2.6.32.7/arch/x86/boot/bitops.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/bitops.h 2010-01-25 17:39:40.275413253 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/bitops.h linux-2.6.32.9/arch/x86/boot/bitops.h +--- linux-2.6.32.9/arch/x86/boot/bitops.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/bitops.h 2010-02-23 17:09:53.095660904 -0500 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -4537,9 +4915,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/bitops.h linux-2.6.32.7/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.32.7/arch/x86/boot/boot.h linux-2.6.32.7/arch/x86/boot/boot.h ---- linux-2.6.32.7/arch/x86/boot/boot.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/boot.h 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/boot.h linux-2.6.32.9/arch/x86/boot/boot.h +--- linux-2.6.32.9/arch/x86/boot/boot.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/boot.h 2010-02-23 17:09:53.095660904 -0500 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -4558,9 +4936,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/boot.h linux-2.6.32.7/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_32.S linux-2.6.32.7/arch/x86/boot/compressed/head_32.S ---- linux-2.6.32.7/arch/x86/boot/compressed/head_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/compressed/head_32.S 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_32.S linux-2.6.32.9/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/compressed/head_32.S 2010-02-23 17:09:53.095660904 -0500 @@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4589,9 +4967,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_32.S linux-2.6.32.7/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_64.S linux-2.6.32.7/arch/x86/boot/compressed/head_64.S ---- linux-2.6.32.7/arch/x86/boot/compressed/head_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/compressed/head_64.S 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/head_64.S linux-2.6.32.9/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/compressed/head_64.S 2010-02-23 17:09:53.095660904 -0500 @@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4610,9 +4988,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_64.S linux-2.6.32.7/arch #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/misc.c linux-2.6.32.7/arch/x86/boot/compressed/misc.c ---- linux-2.6.32.7/arch/x86/boot/compressed/misc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/compressed/misc.c 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/misc.c linux-2.6.32.9/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/compressed/misc.c 2010-02-23 17:09:53.095660904 -0500 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -4631,9 +5009,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/misc.c linux-2.6.32.7/arch/x8 error("Wrong destination address"); #endif -diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/compressed/mkpiggy.c 2010-02-23 17:09:53.095660904 -0500 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -4643,9 +5021,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.7/arch offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/x86/boot/compressed/relocs.c ---- linux-2.6.32.7/arch/x86/boot/compressed/relocs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/compressed/relocs.c 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/compressed/relocs.c linux-2.6.32.9/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/compressed/relocs.c 2010-02-23 17:09:53.095660904 -0500 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -4817,7 +5195,7 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/ + +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ -+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext")) ++ if (!strcmp(sec_name(sym->st_shndx), ".data") && !strcmp(sym_name(sym_strtab, sym), "_etext")) + continue; + if (!strcmp(sec_name(sym->st_shndx), ".init.text")) + continue; @@ -4846,9 +5224,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.32.7/arch/x86/boot/cpucheck.c linux-2.6.32.7/arch/x86/boot/cpucheck.c ---- linux-2.6.32.7/arch/x86/boot/cpucheck.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/cpucheck.c 2010-01-25 17:39:40.276403852 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/cpucheck.c linux-2.6.32.9/arch/x86/boot/cpucheck.c +--- linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/cpucheck.c 2010-02-23 17:09:53.095660904 -0500 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -4944,9 +5322,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/cpucheck.c linux-2.6.32.7/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.32.7/arch/x86/boot/header.S linux-2.6.32.7/arch/x86/boot/header.S ---- linux-2.6.32.7/arch/x86/boot/header.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/header.S 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/header.S linux-2.6.32.9/arch/x86/boot/header.S +--- linux-2.6.32.9/arch/x86/boot/header.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/header.S 2010-02-23 17:09:53.095660904 -0500 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -4956,9 +5334,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/header.S linux-2.6.32.7/arch/x86/boot/he #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.7/arch/x86/boot/video-vesa.c linux-2.6.32.7/arch/x86/boot/video-vesa.c ---- linux-2.6.32.7/arch/x86/boot/video-vesa.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/boot/video-vesa.c 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/boot/video-vesa.c linux-2.6.32.9/arch/x86/boot/video-vesa.c +--- linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/boot/video-vesa.c 2010-02-23 17:09:53.095660904 -0500 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -4967,9 +5345,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/video-vesa.c linux-2.6.32.7/arch/x86/boo } /* -diff -urNp linux-2.6.32.7/arch/x86/ia32/ia32_signal.c linux-2.6.32.7/arch/x86/ia32/ia32_signal.c ---- linux-2.6.32.7/arch/x86/ia32/ia32_signal.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/ia32/ia32_signal.c 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/ia32/ia32_signal.c linux-2.6.32.9/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/ia32/ia32_signal.c 2010-02-23 17:09:53.095660904 -0500 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -4988,9 +5366,9 @@ diff -urNp linux-2.6.32.7/arch/x86/ia32/ia32_signal.c linux-2.6.32.7/arch/x86/ia }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/alternative.h linux-2.6.32.7/arch/x86/include/asm/alternative.h ---- linux-2.6.32.7/arch/x86/include/asm/alternative.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/alternative.h 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/alternative.h linux-2.6.32.9/arch/x86/include/asm/alternative.h +--- linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/alternative.h 2010-02-23 17:09:53.095660904 -0500 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5000,9 +5378,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/alternative.h linux-2.6.32.7/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.32.7/arch/x86/include/asm/apm.h linux-2.6.32.7/arch/x86/include/asm/apm.h ---- linux-2.6.32.7/arch/x86/include/asm/apm.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/apm.h 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/apm.h linux-2.6.32.9/arch/x86/include/asm/apm.h +--- linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/apm.h 2010-02-23 17:09:53.095660904 -0500 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5021,9 +5399,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/apm.h linux-2.6.32.7/arch/x86/inc "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_32.h linux-2.6.32.7/arch/x86/include/asm/atomic_32.h ---- linux-2.6.32.7/arch/x86/include/asm/atomic_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/atomic_32.h 2010-01-25 17:39:40.277417530 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_32.h linux-2.6.32.9/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/atomic_32.h 2010-02-23 17:09:53.095660904 -0500 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5354,9 +5732,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_32.h linux-2.6.32.7/arch/x #define ATOMIC64_INIT(val) { (val) } extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_64.h linux-2.6.32.7/arch/x86/include/asm/atomic_64.h ---- linux-2.6.32.7/arch/x86/include/asm/atomic_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/atomic_64.h 2010-01-25 17:39:40.278401098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/atomic_64.h linux-2.6.32.9/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/atomic_64.h 2010-02-23 17:09:53.099748973 -0500 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -5934,9 +6312,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_64.h linux-2.6.32.7/arch/x } /** -diff -urNp linux-2.6.32.7/arch/x86/include/asm/boot.h linux-2.6.32.7/arch/x86/include/asm/boot.h ---- linux-2.6.32.7/arch/x86/include/asm/boot.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/boot.h 2010-01-25 17:39:40.278401098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/boot.h linux-2.6.32.9/arch/x86/include/asm/boot.h +--- linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/boot.h 2010-02-23 17:09:53.099748973 -0500 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -5954,9 +6332,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/boot.h linux-2.6.32.7/arch/x86/in /* 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.7/arch/x86/include/asm/cache.h linux-2.6.32.7/arch/x86/include/asm/cache.h ---- linux-2.6.32.7/arch/x86/include/asm/cache.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/cache.h 2010-01-25 17:39:40.278401098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/cache.h linux-2.6.32.9/arch/x86/include/asm/cache.h +--- linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/cache.h 2010-02-23 17:09:53.099748973 -0500 @@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -5965,9 +6343,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/cache.h linux-2.6.32.7/arch/x86/i #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/checksum_32.h linux-2.6.32.7/arch/x86/include/asm/checksum_32.h ---- linux-2.6.32.7/arch/x86/include/asm/checksum_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/checksum_32.h 2010-01-25 17:39:40.278401098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/checksum_32.h linux-2.6.32.9/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/checksum_32.h 2010-02-23 17:09:53.099748973 -0500 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6001,9 +6379,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/checksum_32.h linux-2.6.32.7/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.32.7/arch/x86/include/asm/desc.h linux-2.6.32.7/arch/x86/include/asm/desc.h ---- linux-2.6.32.7/arch/x86/include/asm/desc.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/desc.h 2010-01-25 17:39:40.278401098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/desc.h linux-2.6.32.9/arch/x86/include/asm/desc.h +--- linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/desc.h 2010-02-23 17:09:53.099748973 -0500 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -6114,9 +6492,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/desc.h linux-2.6.32.7/arch/x86/in +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/device.h linux-2.6.32.7/arch/x86/include/asm/device.h ---- linux-2.6.32.7/arch/x86/include/asm/device.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/device.h 2010-01-25 17:39:40.279405074 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/device.h linux-2.6.32.9/arch/x86/include/asm/device.h +--- linux-2.6.32.9/arch/x86/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/device.h 2010-02-23 17:09:53.099748973 -0500 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6126,9 +6504,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/device.h linux-2.6.32.7/arch/x86/ #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h 2010-01-25 17:39:40.279405074 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/dma-mapping.h 2010-02-23 17:09:53.099748973 -0500 @@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6168,9 +6546,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h linux-2.6.32.7/arch WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/e820.h linux-2.6.32.7/arch/x86/include/asm/e820.h ---- linux-2.6.32.7/arch/x86/include/asm/e820.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/e820.h 2010-01-25 17:39:40.279405074 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/e820.h linux-2.6.32.9/arch/x86/include/asm/e820.h +--- linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/e820.h 2010-02-23 17:09:53.099748973 -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) @@ -6180,10 +6558,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/e820.h linux-2.6.32.7/arch/x86/in #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/include/asm/elf.h ---- linux-2.6.32.7/arch/x86/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/elf.h 2010-01-25 17:39:40.279405074 -0500 -@@ -263,7 +263,25 @@ extern int force_personality32; +diff -urNp linux-2.6.32.9/arch/x86/include/asm/elf.h linux-2.6.32.9/arch/x86/include/asm/elf.h +--- linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/elf.h 2010-02-23 17:09:53.099748973 -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. */ @@ -6209,7 +6587,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/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, -@@ -317,8 +335,7 @@ do { \ +@@ -311,8 +329,7 @@ do { \ #define ARCH_DLINFO \ do { \ if (vdso_enabled) \ @@ -6219,7 +6597,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc } while (0) #define AT_SYSINFO 32 -@@ -329,7 +346,7 @@ do { \ +@@ -323,7 +340,7 @@ do { \ #endif /* !CONFIG_X86_32 */ @@ -6228,7 +6606,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc #define VDSO_ENTRY \ ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) -@@ -343,7 +360,4 @@ extern int arch_setup_additional_pages(s +@@ -337,7 +354,4 @@ extern int arch_setup_additional_pages(s extern int syscall32_setup_pages(struct linux_binprm *, int exstack); #define compat_arch_setup_additional_pages syscall32_setup_pages @@ -6236,9 +6614,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/futex.h linux-2.6.32.7/arch/x86/include/asm/futex.h ---- linux-2.6.32.7/arch/x86/include/asm/futex.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/futex.h 2010-01-25 17:39:40.279405074 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/futex.h linux-2.6.32.9/arch/x86/include/asm/futex.h +--- linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/futex.h 2010-02-23 17:09:53.099748973 -0500 @@ -11,6 +11,40 @@ #include <asm/processor.h> #include <asm/system.h> @@ -6350,9 +6728,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/futex.h linux-2.6.32.7/arch/x86/i : "memory" ); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/i387.h linux-2.6.32.7/arch/x86/include/asm/i387.h ---- linux-2.6.32.7/arch/x86/include/asm/i387.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/i387.h 2010-01-25 17:39:40.279405074 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/i387.h linux-2.6.32.9/arch/x86/include/asm/i387.h +--- linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/i387.h 2010-02-23 17:09:53.099748973 -0500 @@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc } @@ -6369,9 +6747,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/i387.h linux-2.6.32.7/arch/x86/in /* * These must be called with preempt disabled -diff -urNp linux-2.6.32.7/arch/x86/include/asm/io_64.h linux-2.6.32.7/arch/x86/include/asm/io_64.h ---- linux-2.6.32.7/arch/x86/include/asm/io_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/io_64.h 2010-01-25 17:39:55.228950835 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/io_64.h linux-2.6.32.9/arch/x86/include/asm/io_64.h +--- linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/io_64.h 2010-02-23 17:09:53.099748973 -0500 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -6390,9 +6768,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/io_64.h linux-2.6.32.7/arch/x86/i #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/iommu.h linux-2.6.32.7/arch/x86/include/asm/iommu.h ---- linux-2.6.32.7/arch/x86/include/asm/iommu.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/iommu.h 2010-01-25 17:39:40.280404200 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/iommu.h linux-2.6.32.9/arch/x86/include/asm/iommu.h +--- linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/iommu.h 2010-02-23 17:09:53.099748973 -0500 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -6402,28 +6780,29 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/iommu.h linux-2.6.32.7/arch/x86/i extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.32.7/arch/x86/include/asm/irqflags.h linux-2.6.32.7/arch/x86/include/asm/irqflags.h ---- linux-2.6.32.7/arch/x86/include/asm/irqflags.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/irqflags.h 2010-01-25 17:39:40.280404200 -0500 -@@ -146,6 +146,27 @@ static inline unsigned long __raw_local_ +diff -urNp linux-2.6.32.9/arch/x86/include/asm/irqflags.h linux-2.6.32.9/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/irqflags.h 2010-02-23 17:09:53.099748973 -0500 +@@ -146,6 +146,28 @@ static inline unsigned long __raw_local_ #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit #define GET_CR0_INTO_EAX movl %cr0, %eax + +/* PaX: special register usage in entry_32.S, beware */ +#ifdef CONFIG_PAX_KERNEXEC -+#define PAX_EXIT_KERNEL \ -+ bt $16, %esi; \ -+ jc 1f; \ -+ movl %esi, %cr0; \ ++#define PAX_EXIT_KERNEL \ ++ cmpw $__KERNEXEC_KERNEL_CS, PT_CS(%esp);\ ++ jnz 1f; \ ++ movl %cr0, %esi; \ ++ btc $16, %esi; \ ++ movl %esi, %cr0; \ +1: + -+#define PAX_ENTER_KERNEL \ -+ movl %cr0, %esi; \ -+ movl %esi, %edx; \ -+ bts $16, %edx; \ -+ jc 1f; \ -+ movl %edx, %cr0; \ ++#define PAX_ENTER_KERNEL \ ++ movl %cr0, %esi; \ ++ bts $16, %esi; \ ++ jc 1f; \ ++ movl %esi, %cr0; \ +1: +#else +#define PAX_EXIT_KERNEL @@ -6433,10 +6812,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/irqflags.h linux-2.6.32.7/arch/x8 #endif -diff -urNp linux-2.6.32.7/arch/x86/include/asm/kvm_host.h linux-2.6.32.7/arch/x86/include/asm/kvm_host.h ---- linux-2.6.32.7/arch/x86/include/asm/kvm_host.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/kvm_host.h 2010-01-25 17:39:40.280404200 -0500 -@@ -530,7 +530,7 @@ struct kvm_x86_ops { +diff -urNp linux-2.6.32.9/arch/x86/include/asm/kvm_host.h linux-2.6.32.9/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/kvm_host.h 2010-02-23 17:09:53.099748973 -0500 +@@ -531,7 +531,7 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; @@ -6445,9 +6824,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/kvm_host.h linux-2.6.32.7/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/local.h linux-2.6.32.7/arch/x86/include/asm/local.h ---- linux-2.6.32.7/arch/x86/include/asm/local.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/local.h 2010-01-25 17:39:40.280404200 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/local.h linux-2.6.32.9/arch/x86/include/asm/local.h +--- linux-2.6.32.9/arch/x86/include/asm/local.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/local.h 2010-02-23 17:09:53.099748973 -0500 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -6672,9 +7051,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/local.h linux-2.6.32.7/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.32.7/arch/x86/include/asm/microcode.h linux-2.6.32.7/arch/x86/include/asm/microcode.h ---- linux-2.6.32.7/arch/x86/include/asm/microcode.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/microcode.h 2010-01-25 17:39:40.280404200 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/microcode.h linux-2.6.32.9/arch/x86/include/asm/microcode.h +--- linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/microcode.h 2010-02-23 17:09:53.099748973 -0500 @@ -12,13 +12,13 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; @@ -6715,9 +7094,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/microcode.h linux-2.6.32.7/arch/x { return NULL; } -diff -urNp linux-2.6.32.7/arch/x86/include/asm/mman.h linux-2.6.32.7/arch/x86/include/asm/mman.h ---- linux-2.6.32.7/arch/x86/include/asm/mman.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/mman.h 2010-01-25 17:39:40.280404200 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/mman.h linux-2.6.32.9/arch/x86/include/asm/mman.h +--- linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/mman.h 2010-02-23 17:09:53.099748973 -0500 @@ -5,4 +5,14 @@ #include <asm-generic/mman.h> @@ -6733,9 +7112,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mman.h linux-2.6.32.7/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu_context.h linux-2.6.32.7/arch/x86/include/asm/mmu_context.h ---- linux-2.6.32.7/arch/x86/include/asm/mmu_context.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/mmu_context.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu_context.h linux-2.6.32.9/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/mmu_context.h 2010-02-23 17:09:53.099748973 -0500 @@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { @@ -6801,9 +7180,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu_context.h linux-2.6.32.7/arch } } #endif -diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu.h linux-2.6.32.7/arch/x86/include/asm/mmu.h ---- linux-2.6.32.7/arch/x86/include/asm/mmu.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/mmu.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/mmu.h linux-2.6.32.9/arch/x86/include/asm/mmu.h +--- linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/mmu.h 2010-02-23 17:09:53.099748973 -0500 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -6830,9 +7209,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu.h linux-2.6.32.7/arch/x86/inc } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.7/arch/x86/include/asm/module.h linux-2.6.32.7/arch/x86/include/asm/module.h ---- linux-2.6.32.7/arch/x86/include/asm/module.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/module.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/module.h linux-2.6.32.9/arch/x86/include/asm/module.h +--- linux-2.6.32.9/arch/x86/include/asm/module.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/module.h 2010-02-23 17:09:53.099748973 -0500 @@ -65,7 +65,12 @@ # else # define MODULE_STACKSIZE "" @@ -6847,9 +7226,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/module.h linux-2.6.32.7/arch/x86/ #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_32_types.h linux-2.6.32.7/arch/x86/include/asm/page_32_types.h ---- linux-2.6.32.7/arch/x86/include/asm/page_32_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/page_32_types.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_32_types.h linux-2.6.32.9/arch/x86/include/asm/page_32_types.h +--- linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/page_32_types.h 2010-02-23 17:09:53.099748973 -0500 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -6861,9 +7240,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_32_types.h linux-2.6.32.7/ar #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_64_types.h linux-2.6.32.7/arch/x86/include/asm/page_64_types.h ---- linux-2.6.32.7/arch/x86/include/asm/page_64_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/page_64_types.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/page_64_types.h linux-2.6.32.9/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/page_64_types.h 2010-02-23 17:09:53.099748973 -0500 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -6874,9 +7253,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_64_types.h linux-2.6.32.7/ar /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x86/include/asm/paravirt.h ---- linux-2.6.32.7/arch/x86/include/asm/paravirt.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/paravirt.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt.h linux-2.6.32.9/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/paravirt.h 2010-02-23 17:09:53.103663728 -0500 @@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -6924,10 +7303,11 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x8 + +#ifdef CONFIG_PAX_KERNEXEC +#define PAX_EXIT_KERNEL \ -+ bt $16, %esi; \ -+ jc 1f; \ ++ cmpw $__KERNEXEC_KERNEL_CS, PT_CS(%esp); \ ++ jnz 1f; \ + push %eax; push %ecx; \ -+ movl %esi, %eax; \ ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ ++ btc $16, %eax; \ + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\ + pop %ecx; pop %eax; \ +1: @@ -6935,7 +7315,6 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x8 +#define PAX_ENTER_KERNEL \ + push %eax; push %ecx; \ + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ -+ movl %eax, %esi; \ + bts $16, %eax; \ + jc 1f; \ + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);\ @@ -6949,9 +7328,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x8 #define GET_CR0_INTO_EAX \ push %ecx; push %edx; \ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h ---- linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h 2010-01-25 17:39:40.281476056 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/paravirt_types.h 2010-02-23 17:09:53.103663728 -0500 @@ -316,6 +316,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -6965,9 +7344,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h linux-2.6.32.7/a }; struct raw_spinlock; -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pci_x86.h linux-2.6.32.7/arch/x86/include/asm/pci_x86.h ---- linux-2.6.32.7/arch/x86/include/asm/pci_x86.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pci_x86.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pci_x86.h linux-2.6.32.9/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pci_x86.h 2010-02-23 17:09:53.103663728 -0500 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct extern void (*pcibios_disable_irq)(struct pci_dev *dev); @@ -6990,9 +7369,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pci_x86.h linux-2.6.32.7/arch/x86 extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgalloc.h linux-2.6.32.7/arch/x86/include/asm/pgalloc.h ---- linux-2.6.32.7/arch/x86/include/asm/pgalloc.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgalloc.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgalloc.h linux-2.6.32.9/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgalloc.h 2010-02-23 17:09:53.103663728 -0500 @@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7007,9 +7386,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgalloc.h linux-2.6.32.7/arch/x86 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable-2level.h 2010-02-23 17:09:53.103663728 -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) @@ -7020,9 +7399,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.7/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32.h 2010-02-23 17:09:53.103663728 -0500 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -7064,9 +7443,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h linux-2.6.32.7/arch/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable_32_types.h 2010-02-23 17:09:53.103663728 -0500 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -7096,9 +7475,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.7 #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h 2010-01-25 17:39:40.282415771 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable-3level.h 2010-02-23 17:09:53.103663728 -0500 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7116,9 +7495,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.7/a } /* -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h 2010-01-25 20:01:12.031334490 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable_64.h 2010-02-23 17:09:53.103663728 -0500 @@ -16,9 +16,12 @@ extern pud_t level3_kernel_pgt[512]; @@ -7153,10 +7532,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h linux-2.6.32.7/arch/ } static inline void native_pgd_clear(pgd_t *pgd) -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86/include/asm/pgtable.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable.h 2010-01-25 17:39:40.283404332 -0500 -@@ -74,12 +74,51 @@ extern struct list_head pgd_list; +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable.h linux-2.6.32.9/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable.h 2010-02-23 17:09:53.103663728 -0500 +@@ -74,12 +74,61 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -7176,6 +7555,11 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86 + barrier(); + cr0 = read_cr0(); + BUG_ON(unlikely(!(cr0 & X86_CR0_WP))); ++ ++#ifdef CONFIG_X86_32 ++ asm volatile("ljmp %0,$1f; 1:\n\t" : : "i"(__KERNEXEC_KERNEL_CS), "m"(__force_order)); ++#endif ++ + write_cr0(cr0 & ~X86_CR0_WP); + return cr0; +} @@ -7186,6 +7570,11 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86 + + cr0 = read_cr0(); + BUG_ON(unlikely(cr0 & X86_CR0_WP)); ++ ++#ifdef CONFIG_X86_32 ++ asm volatile("ljmp %0,$1f; 1:\n\t" : : "i"(__KERNEL_CS), "m"(__force_order)); ++#endif ++ + write_cr0(cr0 | X86_CR0_WP); + barrier(); + preempt_enable_no_resched(); @@ -7208,7 +7597,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86 static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; -@@ -167,9 +206,29 @@ static inline pte_t pte_wrprotect(pte_t +@@ -167,9 +216,29 @@ static inline pte_t pte_wrprotect(pte_t return pte_clear_flags(pte, _PAGE_RW); } @@ -7239,7 +7628,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -472,7 +531,7 @@ static inline pud_t *pud_offset(pgd_t *p +@@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *p static inline int pgd_bad(pgd_t pgd) { @@ -7248,20 +7637,24 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86 } static inline int pgd_none(pgd_t pgd) -@@ -613,7 +672,9 @@ static inline void ptep_set_wrprotect(st +@@ -611,9 +680,12 @@ static inline void ptep_set_wrprotect(st + * dst and src can be on the same page, but the range must not overlap, + * and must not cross a page boundary. */ - static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) +-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) ++static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count) { - memcpy(dst, src, count * sizeof(pgd_t)); + pax_open_kernel(); -+ memcpy(dst, src, count * sizeof(pgd_t)); ++ while (count--) ++ *dst++ = *src++; + pax_close_kernel(); } -diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h 2010-01-25 17:39:40.283404332 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/pgtable_types.h 2010-02-23 17:09:53.103663728 -0500 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -7346,9 +7739,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h linux-2.6.32.7/ar #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/processor.h linux-2.6.32.7/arch/x86/include/asm/processor.h ---- linux-2.6.32.7/arch/x86/include/asm/processor.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/processor.h 2010-01-25 17:39:40.290401180 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/processor.h linux-2.6.32.9/arch/x86/include/asm/processor.h +--- linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/processor.h 2010-02-23 17:09:53.103663728 -0500 @@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -7428,9 +7821,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/processor.h linux-2.6.32.7/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/ptrace.h linux-2.6.32.7/arch/x86/include/asm/ptrace.h ---- linux-2.6.32.7/arch/x86/include/asm/ptrace.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/ptrace.h 2010-01-25 17:39:40.290401180 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/ptrace.h linux-2.6.32.9/arch/x86/include/asm/ptrace.h +--- linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/ptrace.h 2010-02-23 17:09:53.103663728 -0500 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -7467,9 +7860,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/ptrace.h linux-2.6.32.7/arch/x86/ #endif } -diff -urNp linux-2.6.32.7/arch/x86/include/asm/reboot.h linux-2.6.32.7/arch/x86/include/asm/reboot.h ---- linux-2.6.32.7/arch/x86/include/asm/reboot.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/reboot.h 2010-01-25 17:39:40.290401180 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/reboot.h linux-2.6.32.9/arch/x86/include/asm/reboot.h +--- linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/reboot.h 2010-02-23 17:09:53.103663728 -0500 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -7479,9 +7872,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/reboot.h linux-2.6.32.7/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/rwsem.h linux-2.6.32.7/arch/x86/include/asm/rwsem.h ---- linux-2.6.32.7/arch/x86/include/asm/rwsem.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/rwsem.h 2010-01-25 17:39:40.291407051 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/rwsem.h linux-2.6.32.9/arch/x86/include/asm/rwsem.h +--- linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/rwsem.h 2010-02-23 17:09:53.103663728 -0500 @@ -106,10 +106,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -7714,10 +8107,30 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/rwsem.h linux-2.6.32.7/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86/include/asm/segment.h ---- linux-2.6.32.7/arch/x86/include/asm/segment.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/segment.h 2010-01-25 17:39:40.291407051 -0500 -@@ -88,7 +88,7 @@ +diff -urNp linux-2.6.32.9/arch/x86/include/asm/segment.h linux-2.6.32.9/arch/x86/include/asm/segment.h +--- linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/segment.h 2010-02-23 17:09:53.103663728 -0500 +@@ -62,8 +62,8 @@ + * 26 - ESPFIX small SS + * 27 - per-cpu [ offset to per-cpu data area ] + * 28 - stack_canary-20 [ for stack protector ] +- * 29 - unused +- * 30 - unused ++ * 29 - PCI BIOS CS ++ * 30 - PCI BIOS DS + * 31 - TSS for double fault handler + */ + #define GDT_ENTRY_TLS_MIN 6 +@@ -77,6 +77,8 @@ + + #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0) + ++#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4) ++ + #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1) + + #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4) +@@ -88,7 +90,7 @@ #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) @@ -7726,7 +8139,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86 #ifdef CONFIG_SMP #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8) #else -@@ -102,6 +102,12 @@ +@@ -102,6 +104,12 @@ #define __KERNEL_STACK_CANARY 0 #endif @@ -7739,7 +8152,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86 #define GDT_ENTRY_DOUBLEFAULT_TSS 31 /* -@@ -139,7 +145,7 @@ +@@ -139,12 +147,13 @@ */ /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */ @@ -7748,9 +8161,23 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86 #else -diff -urNp linux-2.6.32.7/arch/x86/include/asm/spinlock.h linux-2.6.32.7/arch/x86/include/asm/spinlock.h ---- linux-2.6.32.7/arch/x86/include/asm/spinlock.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/spinlock.h 2010-01-25 17:39:40.291407051 -0500 + #include <asm/cache.h> + ++#define GDT_ENTRY_KERNEXEC_KERNEL_CS 0 + #define GDT_ENTRY_KERNEL32_CS 1 + #define GDT_ENTRY_KERNEL_CS 2 + #define GDT_ENTRY_KERNEL_DS 3 +@@ -183,6 +192,7 @@ + #endif + + #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8) ++#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8) + #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.9/arch/x86/include/asm/spinlock.h linux-2.6.32.9/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/spinlock.h 2010-02-23 17:09:53.103663728 -0500 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -7854,9 +8281,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/spinlock.h linux-2.6.32.7/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.32.7/arch/x86/include/asm/system.h linux-2.6.32.7/arch/x86/include/asm/system.h ---- linux-2.6.32.7/arch/x86/include/asm/system.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/system.h 2010-01-25 17:39:40.291407051 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/system.h linux-2.6.32.9/arch/x86/include/asm/system.h +--- linux-2.6.32.9/arch/x86/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/system.h 2010-02-23 17:09:53.103663728 -0500 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -7875,9 +8302,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/system.h linux-2.6.32.7/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h 2010-01-25 17:39:40.291407051 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/uaccess_32.h 2010-02-23 17:09:53.103663728 -0500 @@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) @@ -8007,9 +8434,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h linux-2.6.32.7/arch/ long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h 2010-01-25 17:39:40.291407051 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/uaccess_64.h 2010-02-23 17:09:53.103663728 -0500 @@ -10,6 +10,8 @@ #include <linux/lockdep.h> #include <asm/page.h> @@ -8160,9 +8587,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h linux-2.6.32.7/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess.h linux-2.6.32.7/arch/x86/include/asm/uaccess.h ---- linux-2.6.32.7/arch/x86/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/uaccess.h 2010-01-25 17:39:40.292416759 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/uaccess.h linux-2.6.32.9/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/uaccess.h 2010-02-23 17:09:53.103663728 -0500 @@ -8,8 +8,11 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -8361,9 +8788,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess.h linux-2.6.32.7/arch/x86 #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.32.7/arch/x86/include/asm/vgtod.h linux-2.6.32.7/arch/x86/include/asm/vgtod.h ---- linux-2.6.32.7/arch/x86/include/asm/vgtod.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/vgtod.h 2010-01-25 17:39:40.292416759 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/vgtod.h linux-2.6.32.9/arch/x86/include/asm/vgtod.h +--- linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/vgtod.h 2010-02-23 17:09:53.108051644 -0500 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -8372,9 +8799,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vgtod.h linux-2.6.32.7/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.32.7/arch/x86/include/asm/vmi.h linux-2.6.32.7/arch/x86/include/asm/vmi.h ---- linux-2.6.32.7/arch/x86/include/asm/vmi.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/vmi.h 2010-01-25 17:39:40.292416759 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/vmi.h linux-2.6.32.9/arch/x86/include/asm/vmi.h +--- linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/vmi.h 2010-02-23 17:09:53.108051644 -0500 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -8383,9 +8810,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vmi.h linux-2.6.32.7/arch/x86/inc } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.32.7/arch/x86/include/asm/vsyscall.h linux-2.6.32.7/arch/x86/include/asm/vsyscall.h ---- linux-2.6.32.7/arch/x86/include/asm/vsyscall.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/include/asm/vsyscall.h 2010-01-25 17:39:40.293192103 -0500 +diff -urNp linux-2.6.32.9/arch/x86/include/asm/vsyscall.h linux-2.6.32.9/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/include/asm/vsyscall.h 2010-02-23 17:09:53.108051644 -0500 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -8416,10 +8843,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vsyscall.h linux-2.6.32.7/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig ---- linux-2.6.32.7/arch/x86/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/Kconfig 2010-01-25 17:39:40.293192103 -0500 -@@ -1089,7 +1089,7 @@ config PAGE_OFFSET +diff -urNp linux-2.6.32.9/arch/x86/Kconfig linux-2.6.32.9/arch/x86/Kconfig +--- linux-2.6.32.9/arch/x86/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/Kconfig 2010-02-23 17:09:53.108051644 -0500 +@@ -1083,7 +1083,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G @@ -8428,7 +8855,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 -@@ -1415,7 +1415,7 @@ config ARCH_USES_PG_UNCACHED +@@ -1409,7 +1409,7 @@ config ARCH_USES_PG_UNCACHED config EFI bool "EFI runtime service support" @@ -8437,7 +8864,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig ---help--- This enables the kernel to use EFI runtime services that are available (such as the EFI variable services). -@@ -1502,6 +1502,7 @@ config KEXEC_JUMP +@@ -1496,6 +1496,7 @@ config KEXEC_JUMP config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) default "0x1000000" @@ -8445,7 +8872,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig ---help--- This gives the physical address where the kernel is loaded. -@@ -1566,6 +1567,7 @@ config PHYSICAL_ALIGN +@@ -1560,6 +1561,7 @@ config PHYSICAL_ALIGN hex prompt "Alignment value to which kernel should be aligned" if X86_32 default "0x1000000" @@ -8453,7 +8880,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig range 0x2000 0x1000000 ---help--- This value puts the alignment restrictions on physical address -@@ -1597,9 +1599,10 @@ config HOTPLUG_CPU +@@ -1591,9 +1593,10 @@ config HOTPLUG_CPU Say N if you want to disable CPU hotplug. config COMPAT_VDSO @@ -8465,9 +8892,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.32.7/arch/x86/Kconfig.cpu linux-2.6.32.7/arch/x86/Kconfig.cpu ---- linux-2.6.32.7/arch/x86/Kconfig.cpu 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/Kconfig.cpu 2010-01-25 17:39:40.293192103 -0500 +diff -urNp linux-2.6.32.9/arch/x86/Kconfig.cpu linux-2.6.32.9/arch/x86/Kconfig.cpu +--- linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/Kconfig.cpu 2010-02-23 17:09:53.108051644 -0500 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -8495,9 +8922,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig.cpu linux-2.6.32.7/arch/x86/Kconfig.c config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.32.7/arch/x86/Kconfig.debug linux-2.6.32.7/arch/x86/Kconfig.debug ---- linux-2.6.32.7/arch/x86/Kconfig.debug 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/Kconfig.debug 2010-01-25 17:39:40.293192103 -0500 +diff -urNp linux-2.6.32.9/arch/x86/Kconfig.debug linux-2.6.32.9/arch/x86/Kconfig.debug +--- linux-2.6.32.9/arch/x86/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/Kconfig.debug 2010-02-23 17:09:53.108051644 -0500 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -8507,9 +8934,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig.debug linux-2.6.32.7/arch/x86/Kconfig ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/boot.c linux-2.6.32.7/arch/x86/kernel/acpi/boot.c ---- linux-2.6.32.7/arch/x86/kernel/acpi/boot.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/acpi/boot.c 2010-01-25 17:39:40.294400939 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/boot.c linux-2.6.32.9/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/acpi/boot.c 2010-02-23 17:09:53.108051644 -0500 @@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -8519,9 +8946,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/boot.c linux-2.6.32.7/arch/x86/ke }; /* -diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-01-25 17:39:40.294400939 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-23 17:09:53.108051644 -0500 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -8531,9 +8958,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.7/ wrmsr 1: -diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c 2010-01-25 17:39:40.294400939 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/acpi/sleep.c 2010-02-23 17:09:53.108051644 -0500 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -8578,9 +9005,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c linux-2.6.32.7/arch/x86/k } -diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S 2010-01-25 17:39:40.294400939 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/acpi/wakeup_32.S 2010-02-23 17:09:53.108051644 -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 @@ -8597,9 +9024,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.7/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.32.7/arch/x86/kernel/alternative.c linux-2.6.32.7/arch/x86/kernel/alternative.c ---- linux-2.6.32.7/arch/x86/kernel/alternative.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/alternative.c 2010-01-25 17:39:55.420093098 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/alternative.c linux-2.6.32.9/arch/x86/kernel/alternative.c +--- linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/alternative.c 2010-02-23 17:09:53.108051644 -0500 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); @@ -8672,10 +9099,10 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/alternative.c linux-2.6.32.7/arch/x86/ + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/amd_iommu.c linux-2.6.32.7/arch/x86/kernel/amd_iommu.c ---- linux-2.6.32.7/arch/x86/kernel/amd_iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/amd_iommu.c 2010-01-25 17:39:40.295486806 -0500 -@@ -2073,7 +2073,7 @@ static void prealloc_protection_domains( +diff -urNp linux-2.6.32.9/arch/x86/kernel/amd_iommu.c linux-2.6.32.9/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-02-23 17:04:11.759589893 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/amd_iommu.c 2010-02-23 17:09:53.108051644 -0500 +@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( } } @@ -8684,9 +9111,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/amd_iommu.c linux-2.6.32.7/arch/x86/ke .alloc_coherent = alloc_coherent, .free_coherent = free_coherent, .map_page = map_page, -diff -urNp linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c 2010-01-25 17:39:40.295486806 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-02-23 17:04:11.805135472 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/apic/io_apic.c 2010-02-23 17:09:53.108051644 -0500 @@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); @@ -8723,9 +9150,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c linux-2.6.32.7/arch/x86 { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.32.7/arch/x86/kernel/apm_32.c linux-2.6.32.7/arch/x86/kernel/apm_32.c ---- linux-2.6.32.7/arch/x86/kernel/apm_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/apm_32.c 2010-01-25 17:39:40.296403613 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/apm_32.c linux-2.6.32.9/arch/x86/kernel/apm_32.c +--- linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/apm_32.c 2010-02-23 17:09:53.108051644 -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. @@ -8827,9 +9254,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/apm_32.c linux-2.6.32.7/arch/x86/kerne proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c 2010-01-25 17:39:40.296403613 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_32.c 2010-02-23 17:09:53.112027314 -0500 @@ -115,6 +115,11 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); @@ -8842,9 +9269,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.7/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c 2010-01-25 17:39:40.296403613 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/asm-offsets_64.c 2010-02-23 17:09:53.112027314 -0500 @@ -115,6 +115,7 @@ int main(void) ENTRY(cr8); BLANK(); @@ -8853,9 +9280,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.7/arch/x DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/common.c linux-2.6.32.7/arch/x86/kernel/cpu/common.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/common.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/common.c 2010-01-25 17:39:55.421135702 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/common.c linux-2.6.32.9/arch/x86/kernel/cpu/common.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/common.c 2010-02-23 17:09:53.112027314 -0500 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -8955,9 +9382,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/common.c linux-2.6.32.7/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-01-25 17:39:40.297126533 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-23 17:09:53.112027314 -0500 @@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -8967,9 +9394,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3 }; static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-01-25 17:39:40.297126533 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-23 17:09:53.112027314 -0500 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -8979,9 +9406,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel.c linux-2.6.32.7/arch/x86/kernel/cpu/intel.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/intel.c 2010-01-25 20:04:14.597191200 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/intel.c 2010-01-25 20:04:24.393099599 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel.c linux-2.6.32.9/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/intel.c 2010-02-23 17:09:53.112027314 -0500 @@ -139,7 +139,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. @@ -8991,9 +9418,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel.c linux-2.6.32.7/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-01-25 17:39:40.297126533 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-23 17:09:53.112027314 -0500 @@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9003,9 +9430,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.7/a .show = show, .store = store, }; -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/Makefile linux-2.6.32.7/arch/x86/kernel/cpu/Makefile ---- linux-2.6.32.7/arch/x86/kernel/cpu/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/Makefile 2010-01-25 17:39:40.297126533 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/Makefile linux-2.6.32.9/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/Makefile 2010-02-23 17:09:53.112027314 -0500 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -9017,9 +9444,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/Makefile linux-2.6.32.7/arch/x86/k 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.7/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-01-25 17:39:40.298400595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-23 17:09:53.112027314 -0500 @@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9029,9 +9456,18 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.7/ar .show = show, .store = store, }; -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-01-25 17:39:40.298400595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-23 17:09:53.112027314 -0500 +@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) + !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", + m->cs, m->ip); + +- if (m->cs == __KERNEL_CS) ++ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS) + print_symbol("{%s}", m->ip); + pr_cont("\n"); + } @@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf */ @@ -9075,9 +9511,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.7/arch/x }; /* -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c 2010-01-25 17:39:40.298400595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-23 17:09:53.112027314 -0500 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -9087,9 +9523,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.7/arch/x86 .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c 2010-01-25 17:39:40.298400595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-23 17:09:53.112027314 -0500 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } @@ -9099,9 +9535,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.7/arch .vendor = X86_VENDOR_CENTAUR, .set = centaur_set_mcr, .get = centaur_get_mcr, -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-01-25 17:39:40.298400595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-23 17:09:53.112027314 -0500 @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } @@ -9111,9 +9547,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.7/arch/x .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-01-25 17:39:40.299403598 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-23 17:09:53.112027314 -0500 @@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ @@ -9132,9 +9568,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.7/arch .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c 2010-01-25 17:39:40.299403598 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/main.c 2010-02-23 17:09:53.112027314 -0500 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; static bool mtrr_aps_delayed_init; @@ -9153,9 +9589,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.7/arch/x8 { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-01-25 17:39:40.299403598 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-23 17:09:53.115579436 -0500 @@ -12,19 +12,19 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; @@ -9206,9 +9642,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.7/arch/x8 #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.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-01-25 17:39:40.299403598 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-23 17:09:53.115579436 -0500 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -9242,9 +9678,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.7/ static struct wd_ops intel_arch_wd_ops __read_mostly = { .reserve = single_msr_reserve, .unreserve = single_msr_unreserve, -diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c ---- linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c 2010-01-25 17:39:40.299403598 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/cpu/perf_event.c 2010-02-23 17:09:53.115579436 -0500 @@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs break; @@ -9254,9 +9690,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.7/arch/x } } -diff -urNp linux-2.6.32.7/arch/x86/kernel/crash.c linux-2.6.32.7/arch/x86/kernel/crash.c ---- linux-2.6.32.7/arch/x86/kernel/crash.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/crash.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/crash.c linux-2.6.32.9/arch/x86/kernel/crash.c +--- linux-2.6.32.9/arch/x86/kernel/crash.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/crash.c 2010-02-23 17:09:53.115579436 -0500 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -9266,9 +9702,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/crash.c linux-2.6.32.7/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/doublefault_32.c linux-2.6.32.7/arch/x86/kernel/doublefault_32.c ---- linux-2.6.32.7/arch/x86/kernel/doublefault_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/doublefault_32.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/doublefault_32.c linux-2.6.32.9/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/doublefault_32.c 2010-02-23 17:09:53.115579436 -0500 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -9300,9 +9736,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/doublefault_32.c linux-2.6.32.7/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/dumpstack_32.c 2010-02-23 17:09:53.115579436 -0500 @@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -9347,9 +9783,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c linux-2.6.32.7/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack.c linux-2.6.32.7/arch/x86/kernel/dumpstack.c ---- linux-2.6.32.7/arch/x86/kernel/dumpstack.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/dumpstack.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/dumpstack.c linux-2.6.32.9/arch/x86/kernel/dumpstack.c +--- linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/dumpstack.c 2010-02-23 17:09:53.115579436 -0500 @@ -180,7 +180,7 @@ void dump_stack(void) #endif @@ -9377,9 +9813,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack.c linux-2.6.32.7/arch/x86/ke report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.32.7/arch/x86/kernel/e820.c linux-2.6.32.7/arch/x86/kernel/e820.c ---- linux-2.6.32.7/arch/x86/kernel/e820.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/e820.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/e820.c linux-2.6.32.9/arch/x86/kernel/e820.c +--- linux-2.6.32.9/arch/x86/kernel/e820.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/e820.c 2010-02-23 17:09:53.115579436 -0500 @@ -733,7 +733,10 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -9392,9 +9828,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/e820.c linux-2.6.32.7/arch/x86/kernel/ }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_32.c linux-2.6.32.7/arch/x86/kernel/efi_32.c ---- linux-2.6.32.7/arch/x86/kernel/efi_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/efi_32.c 2010-01-25 17:39:40.300403832 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_32.c linux-2.6.32.9/arch/x86/kernel/efi_32.c +--- linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/efi_32.c 2010-02-23 17:09:53.115579436 -0500 @@ -38,70 +38,38 @@ */ @@ -9475,9 +9911,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_32.c linux-2.6.32.7/arch/x86/kerne /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S 2010-01-25 17:39:40.301405221 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/efi_stub_32.S 2010-02-23 17:09:53.115579436 -0500 @@ -6,6 +6,7 @@ */ @@ -9576,9 +10012,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S linux-2.6.32.7/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_32.S linux-2.6.32.7/arch/x86/kernel/entry_32.S ---- linux-2.6.32.7/arch/x86/kernel/entry_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/entry_32.S 2010-01-25 17:39:40.301405221 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_32.S linux-2.6.32.9/arch/x86/kernel/entry_32.S +--- linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/entry_32.S 2010-02-23 17:09:53.115579436 -0500 @@ -191,7 +191,7 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -9832,9 +10268,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_32.S linux-2.6.32.7/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_64.S linux-2.6.32.7/arch/x86/kernel/entry_64.S ---- linux-2.6.32.7/arch/x86/kernel/entry_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/entry_64.S 2010-01-25 17:39:40.301405221 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/entry_64.S linux-2.6.32.9/arch/x86/kernel/entry_64.S +--- linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/entry_64.S 2010-02-23 17:09:53.115579436 -0500 @@ -1068,7 +1068,12 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ @@ -9849,9 +10285,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_64.S linux-2.6.32.7/arch/x86/ker subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) -diff -urNp linux-2.6.32.7/arch/x86/kernel/ftrace.c linux-2.6.32.7/arch/x86/kernel/ftrace.c ---- linux-2.6.32.7/arch/x86/kernel/ftrace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/ftrace.c 2010-01-25 17:39:40.302407595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/ftrace.c linux-2.6.32.9/arch/x86/kernel/ftrace.c +--- linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/ftrace.c 2010-02-23 17:09:53.115579436 -0500 @@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) { if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { @@ -9917,9 +10353,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ftrace.c linux-2.6.32.7/arch/x86/kerne if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) return -EFAULT; -diff -urNp linux-2.6.32.7/arch/x86/kernel/head32.c linux-2.6.32.7/arch/x86/kernel/head32.c ---- linux-2.6.32.7/arch/x86/kernel/head32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/head32.c 2010-01-25 17:39:40.302407595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/head32.c linux-2.6.32.9/arch/x86/kernel/head32.c +--- linux-2.6.32.9/arch/x86/kernel/head32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/head32.c 2010-02-23 17:09:53.115579436 -0500 @@ -16,6 +16,7 @@ #include <asm/apic.h> #include <asm/io_apic.h> @@ -9937,9 +10373,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head32.c linux-2.6.32.7/arch/x86/kerne #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kernel/head_32.S ---- linux-2.6.32.7/arch/x86/kernel/head_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/head_32.S 2010-01-25 17:39:40.302407595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/head_32.S linux-2.6.32.9/arch/x86/kernel/head_32.S +--- linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/head_32.S 2010-02-23 17:09:53.115579436 -0500 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -9998,7 +10434,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern ENTRY(startup_32) /* test KEEP_SEGMENTS flag to see if the bootloader is asking us to not reload segments */ -@@ -97,6 +113,52 @@ ENTRY(startup_32) +@@ -97,6 +113,55 @@ ENTRY(startup_32) movl %eax,%gs 2: @@ -10040,9 +10476,12 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern + addl $__PAGE_OFFSET,%eax +1: + movw %ax,__KERNEL_CS + 2(%edi) ++ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi) + rorl $16,%eax + movb %al,__KERNEL_CS + 4(%edi) ++ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi) + movb %ah,__KERNEL_CS + 7(%edi) ++ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi) + rorl $16,%eax + addl $PAGE_SIZE_asm,%edi + loop 1b @@ -10051,7 +10490,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern /* * Clear BSS first so that there are no surprises... */ -@@ -140,9 +202,7 @@ ENTRY(startup_32) +@@ -140,9 +205,7 @@ ENTRY(startup_32) cmpl $num_subarch_entries, %eax jae bad_subarch @@ -10062,7 +10501,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern bad_subarch: WEAK(lguest_entry) -@@ -154,10 +214,10 @@ WEAK(xen_entry) +@@ -154,10 +217,10 @@ WEAK(xen_entry) __INITDATA subarch_entries: @@ -10077,7 +10516,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern num_subarch_entries = (. - subarch_entries) / 4 .previous #endif /* CONFIG_PARAVIRT */ -@@ -218,8 +278,11 @@ default_entry: +@@ -218,8 +281,11 @@ default_entry: movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ @@ -10091,7 +10530,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern #else /* Not PAE */ page_pde_offset = (__PAGE_OFFSET >> 20); -@@ -249,8 +312,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); +@@ -249,8 +315,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ @@ -10105,7 +10544,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern #endif jmp 3f /* -@@ -297,6 +363,7 @@ ENTRY(startup_32_smp) +@@ -297,6 +366,7 @@ ENTRY(startup_32_smp) orl %edx,%eax movl %eax,%cr4 @@ -10113,7 +10552,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern btl $5, %eax # check if PAE is enabled jnc 6f -@@ -312,13 +379,17 @@ ENTRY(startup_32_smp) +@@ -312,13 +382,17 @@ ENTRY(startup_32_smp) jnc 6f /* Setup EFER (Extended Feature Enable Register) */ @@ -10132,7 +10571,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern 6: /* -@@ -344,9 +415,7 @@ ENTRY(startup_32_smp) +@@ -344,9 +418,7 @@ ENTRY(startup_32_smp) #ifdef CONFIG_SMP cmpb $0, ready @@ -10143,7 +10582,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern #endif /* CONFIG_SMP */ /* -@@ -424,7 +493,7 @@ is386: movl $2,%ecx # set MP +@@ -424,7 +496,7 @@ is386: movl $2,%ecx # set MP 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. @@ -10152,7 +10591,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern movl %eax,%ds movl %eax,%es -@@ -438,8 +507,11 @@ is386: movl $2,%ecx # set MP +@@ -438,8 +510,11 @@ is386: movl $2,%ecx # set MP */ cmpb $0,ready jne 1f @@ -10165,7 +10604,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) shrl $16, %ecx movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) -@@ -457,10 +529,6 @@ is386: movl $2,%ecx # set MP +@@ -457,10 +532,6 @@ is386: movl $2,%ecx # set MP #ifdef CONFIG_SMP movb ready, %cl movb $1, ready @@ -10176,7 +10615,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern #endif /* CONFIG_SMP */ jmp *(initial_code) -@@ -546,22 +614,22 @@ early_page_fault: +@@ -546,22 +617,22 @@ early_page_fault: jmp early_fault early_fault: @@ -10204,7 +10643,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern hlt_loop: hlt jmp hlt_loop -@@ -569,8 +637,11 @@ hlt_loop: +@@ -569,8 +640,11 @@ hlt_loop: /* This is the default interrupt "handler" :-) */ ALIGN ignore_int: @@ -10217,7 +10656,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern pushl %eax pushl %ecx pushl %edx -@@ -579,9 +650,6 @@ ignore_int: +@@ -579,9 +653,6 @@ ignore_int: movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es @@ -10227,7 +10666,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern pushl 16(%esp) pushl 24(%esp) pushl 32(%esp) -@@ -608,27 +676,37 @@ ENTRY(initial_code) +@@ -608,27 +679,37 @@ ENTRY(initial_code) /* * BSS section */ @@ -10270,7 +10709,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern ENTRY(swapper_pg_dir) .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ # if KPMDS == 3 -@@ -651,11 +729,12 @@ ENTRY(swapper_pg_dir) +@@ -651,11 +732,12 @@ ENTRY(swapper_pg_dir) .data ENTRY(stack_start) @@ -10284,7 +10723,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern early_recursion_flag: .long 0 -@@ -691,7 +770,7 @@ fault_msg: +@@ -691,7 +773,7 @@ fault_msg: .word 0 # 32 bit align gdt_desc.address boot_gdt_descr: .word __BOOT_DS+7 @@ -10293,7 +10732,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern .word 0 # 32-bit align idt_desc.address idt_descr: -@@ -702,7 +781,7 @@ idt_descr: +@@ -702,7 +784,7 @@ idt_descr: .word 0 # 32 bit align gdt_desc.address ENTRY(early_gdt_descr) .word GDT_ENTRIES*8-1 @@ -10302,7 +10741,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern /* * The boot_gdt must mirror the equivalent in setup.S and is -@@ -711,5 +790,59 @@ ENTRY(early_gdt_descr) +@@ -711,5 +793,65 @@ ENTRY(early_gdt_descr) .align L1_CACHE_BYTES ENTRY(boot_gdt) .fill GDT_ENTRY_BOOT_CS,8,0 @@ -10318,7 +10757,13 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern + .quad 0x0000000000000000 /* 0x0b reserved */ + .quad 0x0000000000000000 /* 0x13 reserved */ + .quad 0x0000000000000000 /* 0x1b reserved */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */ ++#else + .quad 0x0000000000000000 /* 0x20 unused */ ++#endif ++ + .quad 0x0000000000000000 /* 0x28 unused */ + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */ + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */ @@ -10364,9 +10809,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kernel/head_64.S ---- linux-2.6.32.7/arch/x86/kernel/head_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/head_64.S 2010-01-25 17:39:55.421135702 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/head_64.S linux-2.6.32.9/arch/x86/kernel/head_64.S +--- linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/head_64.S 2010-02-23 17:09:53.115579436 -0500 @@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) @@ -10479,7 +10924,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern #define NEXT_PAGE(name) \ .balign PAGE_SIZE; \ ENTRY(name) -@@ -350,13 +350,35 @@ NEXT_PAGE(init_level4_pgt) +@@ -350,13 +350,29 @@ NEXT_PAGE(init_level4_pgt) .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE @@ -10491,12 +10936,6 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */ .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE -+#ifdef CONFIG_PAX_MEMORY_UDEREF -+ .rept NR_CPUS - 1 -+ .fill 512,8,0 -+ .endr -+#endif -+ NEXT_PAGE(level3_ident_pgt) .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE +#ifdef CONFIG_XEN @@ -10515,7 +10954,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern NEXT_PAGE(level3_kernel_pgt) .fill L3_START_KERNEL,8,0 -@@ -364,20 +386,23 @@ NEXT_PAGE(level3_kernel_pgt) +@@ -364,20 +380,23 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE @@ -10547,7 +10986,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern NEXT_PAGE(level2_kernel_pgt) /* -@@ -390,33 +415,49 @@ NEXT_PAGE(level2_kernel_pgt) +@@ -390,33 +409,49 @@ NEXT_PAGE(level2_kernel_pgt) * If you want to increase this then increase MODULES_VADDR * too.) */ @@ -10607,9 +11046,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c 2010-01-25 17:39:40.302407595 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/i386_ksyms_32.c 2010-02-23 17:09:53.115579436 -0500 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); #endif @@ -10631,9 +11070,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.7/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.32.7/arch/x86/kernel/init_task.c linux-2.6.32.7/arch/x86/kernel/init_task.c ---- linux-2.6.32.7/arch/x86/kernel/init_task.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/init_task.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/init_task.c linux-2.6.32.9/arch/x86/kernel/init_task.c +--- linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/init_task.c 2010-02-23 17:09:53.115579436 -0500 @@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. @@ -10642,9 +11081,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/init_task.c linux-2.6.32.7/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.32.7/arch/x86/kernel/ioport.c linux-2.6.32.7/arch/x86/kernel/ioport.c ---- linux-2.6.32.7/arch/x86/kernel/ioport.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/ioport.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/ioport.c linux-2.6.32.9/arch/x86/kernel/ioport.c +--- linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/ioport.c 2010-02-23 17:09:53.120037276 -0500 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -10689,9 +11128,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ioport.c linux-2.6.32.7/arch/x86/kerne } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.32.7/arch/x86/kernel/irq_32.c linux-2.6.32.7/arch/x86/kernel/irq_32.c ---- linux-2.6.32.7/arch/x86/kernel/irq_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/irq_32.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/irq_32.c linux-2.6.32.9/arch/x86/kernel/irq_32.c +--- linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/irq_32.c 2010-02-23 17:09:53.120037276 -0500 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -10710,9 +11149,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/irq_32.c linux-2.6.32.7/arch/x86/kerne call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.32.7/arch/x86/kernel/kgdb.c linux-2.6.32.7/arch/x86/kernel/kgdb.c ---- linux-2.6.32.7/arch/x86/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/kgdb.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/kgdb.c linux-2.6.32.9/arch/x86/kernel/kgdb.c +--- linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/kgdb.c 2010-02-23 17:09:53.120037276 -0500 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -10722,9 +11161,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/kgdb.c linux-2.6.32.7/arch/x86/kernel/ /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.32.7/arch/x86/kernel/kprobes.c linux-2.6.32.7/arch/x86/kernel/kprobes.c ---- linux-2.6.32.7/arch/x86/kernel/kprobes.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/kprobes.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/kprobes.c linux-2.6.32.9/arch/x86/kernel/kprobes.c +--- linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/kprobes.c 2010-02-23 17:09:53.120037276 -0500 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -10807,9 +11246,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/kprobes.c linux-2.6.32.7/arch/x86/kern return ret; switch (val) { -diff -urNp linux-2.6.32.7/arch/x86/kernel/ldt.c linux-2.6.32.7/arch/x86/kernel/ldt.c ---- linux-2.6.32.7/arch/x86/kernel/ldt.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/ldt.c 2010-01-25 17:39:40.303404542 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/ldt.c linux-2.6.32.9/arch/x86/kernel/ldt.c +--- linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/ldt.c 2010-02-23 17:09:53.120037276 -0500 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -10874,9 +11313,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ldt.c linux-2.6.32.7/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c 2010-01-25 17:39:40.304403861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/machine_kexec_32.c 2010-02-23 17:09:53.120037276 -0500 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -10904,9 +11343,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.7/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_amd.c linux-2.6.32.7/arch/x86/kernel/microcode_amd.c ---- linux-2.6.32.7/arch/x86/kernel/microcode_amd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/microcode_amd.c 2010-01-25 17:39:40.304403861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_amd.c linux-2.6.32.9/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/microcode_amd.c 2010-02-23 17:09:53.120037276 -0500 @@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -10925,9 +11364,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_amd.c linux-2.6.32.7/arch/x8 { return µcode_amd_ops; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_core.c linux-2.6.32.7/arch/x86/kernel/microcode_core.c ---- linux-2.6.32.7/arch/x86/kernel/microcode_core.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/microcode_core.c 2010-01-25 17:39:40.304403861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_core.c linux-2.6.32.9/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/microcode_core.c 2010-02-23 17:09:53.120037276 -0500 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -10937,9 +11376,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_core.c linux-2.6.32.7/arch/x /* * Synchronization. -diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_intel.c linux-2.6.32.7/arch/x86/kernel/microcode_intel.c ---- linux-2.6.32.7/arch/x86/kernel/microcode_intel.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/microcode_intel.c 2010-01-25 17:39:40.304403861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/microcode_intel.c linux-2.6.32.9/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/microcode_intel.c 2010-02-23 17:09:53.120037276 -0500 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -10974,9 +11413,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_intel.c linux-2.6.32.7/arch/ { return µcode_intel_ops; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kernel/module.c ---- linux-2.6.32.7/arch/x86/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/module.c 2010-01-25 17:39:40.304403861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/module.c linux-2.6.32.9/arch/x86/kernel/module.c +--- linux-2.6.32.9/arch/x86/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/module.c 2010-02-23 17:09:53.120037276 -0500 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -10986,7 +11425,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne { struct vm_struct *area; -@@ -48,9 +48,90 @@ void *module_alloc(unsigned long size) +@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size) if (!area) return NULL; @@ -10995,13 +11434,24 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne + return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot); +} + -+#ifdef CONFIG_PAX_KERNEXEC -+#ifdef CONFIG_X86_32 +void *module_alloc(unsigned long size) +{ ++ ++#ifdef CONFIG_PAX_KERNEXEC + return __module_alloc(size, PAGE_KERNEL); -+} -+ ++#else ++ return __module_alloc(size, PAGE_KERNEL_EXEC); ++#endif ++ + } + + /* Free memory returned from module_alloc */ +@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi + vfree(module_region); + } + ++#ifdef CONFIG_PAX_KERNEXEC ++#ifdef CONFIG_X86_32 +void *module_alloc_exec(unsigned long size) +{ + struct vm_struct *area; @@ -11010,58 +11460,20 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne + return NULL; + + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END); -+ if (area) -+ return area->addr; -+ -+ return NULL; ++ return area ? area->addr : NULL; +} +EXPORT_SYMBOL(module_alloc_exec); + +void module_free_exec(struct module *mod, void *module_region) +{ -+ struct vm_struct **p, *tmp; -+ -+ if (!module_region) -+ return; -+ -+ if ((PAGE_SIZE-1) & (unsigned long)module_region) { -+ printk(KERN_ERR "Trying to module_free_exec() bad address (%p)\n", module_region); -+ WARN_ON(1); -+ return; -+ } -+ -+ write_lock(&vmlist_lock); -+ for (p = &vmlist; (tmp = *p) != NULL; p = &tmp->next) -+ if (tmp->addr == module_region) -+ break; -+ -+ if (tmp) { -+ pax_open_kernel(); -+ memset(tmp->addr, 0xCC, tmp->size); -+ pax_close_kernel(); -+ -+ *p = tmp->next; -+ kfree(tmp); -+ } -+ write_unlock(&vmlist_lock); -+ -+ if (!tmp) { -+ printk(KERN_ERR "Trying to module_free_exec() nonexistent vm area (%p)\n", -+ module_region); -+ WARN_ON(1); -+ } ++ vunmap(module_region); +} +EXPORT_SYMBOL(module_free_exec); +#else -+void *module_alloc(unsigned long size) -+{ -+ return __module_alloc(size, PAGE_KERNEL); -+} -+ +void module_free_exec(struct module *mod, void *module_region) +{ + module_free(mod, module_region); - } ++} +EXPORT_SYMBOL(module_free_exec); + +void *module_alloc_exec(unsigned long size) @@ -11070,16 +11482,12 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne +} +EXPORT_SYMBOL(module_alloc_exec); +#endif -+#else -+void *module_alloc(unsigned long size) -+{ -+ return __module_alloc(size, PAGE_KERNEL_EXEC); -+} +#endif - - /* Free memory returned from module_alloc */ - void module_free(struct module *mod, void *module_region) -@@ -77,14 +158,16 @@ int apply_relocate(Elf32_Shdr *sechdrs, ++ + /* We don't need anything special. */ + int module_frob_arch_sections(Elf_Ehdr *hdr, + Elf_Shdr *sechdrs, +@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs, unsigned int i; Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr; Elf32_Sym *sym; @@ -11099,7 +11507,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne /* This is the symbol it is referring to. Note that all undefined symbols have been resolved. */ sym = (Elf32_Sym *)sechdrs[symindex].sh_addr -@@ -93,11 +176,15 @@ int apply_relocate(Elf32_Shdr *sechdrs, +@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs, switch (ELF32_R_TYPE(rel[i].r_info)) { case R_386_32: /* We add the value into the location given */ @@ -11117,7 +11525,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne break; default: printk(KERN_ERR "module %s: Unknown relocation: %u\n", -@@ -153,21 +240,30 @@ int apply_relocate_add(Elf64_Shdr *sechd +@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd case R_X86_64_NONE: break; case R_X86_64_64: @@ -11148,9 +11556,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt.c linux-2.6.32.7/arch/x86/kernel/paravirt.c ---- linux-2.6.32.7/arch/x86/kernel/paravirt.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/paravirt.c 2010-01-25 17:39:40.305402009 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt.c linux-2.6.32.9/arch/x86/kernel/paravirt.c +--- linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/paravirt.c 2010-02-23 17:09:53.120037276 -0500 @@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu /* Neat trick to map patch type back to the call within the @@ -11255,9 +11663,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt.c linux-2.6.32.7/arch/x86/ker }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c 2010-01-25 17:39:40.305402009 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/paravirt-spinlocks.c 2010-02-23 17:09:53.120037276 -0500 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -11267,9 +11675,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.7/ar #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c ---- linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c 2010-01-25 17:39:40.305402009 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/pci-calgary_64.c 2010-02-23 17:09:53.120037276 -0500 @@ -472,7 +472,7 @@ static void calgary_free_coherent(struct free_pages((unsigned long)vaddr, get_order(size)); } @@ -11279,9 +11687,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.7/arch/x .alloc_coherent = calgary_alloc_coherent, .free_coherent = calgary_free_coherent, .map_sg = calgary_map_sg, -diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-dma.c linux-2.6.32.7/arch/x86/kernel/pci-dma.c ---- linux-2.6.32.7/arch/x86/kernel/pci-dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/pci-dma.c 2010-01-25 17:39:40.305402009 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-dma.c linux-2.6.32.9/arch/x86/kernel/pci-dma.c +--- linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/pci-dma.c 2010-02-23 17:09:53.120037276 -0500 @@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -11300,9 +11708,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-dma.c linux-2.6.32.7/arch/x86/kern #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c ---- linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c 2010-01-25 17:39:40.306401380 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/pci-gart_64.c 2010-02-23 17:09:53.120037276 -0500 @@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag return -1; } @@ -11312,9 +11720,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c linux-2.6.32.7/arch/x86/ .map_sg = gart_map_sg, .unmap_sg = gart_unmap_sg, .map_page = gart_map_page, -diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-nommu.c linux-2.6.32.7/arch/x86/kernel/pci-nommu.c ---- linux-2.6.32.7/arch/x86/kernel/pci-nommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/pci-nommu.c 2010-01-25 17:39:40.306401380 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-nommu.c linux-2.6.32.9/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/pci-nommu.c 2010-02-23 17:09:53.120037276 -0500 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str flush_write_buffers(); } @@ -11324,9 +11732,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-nommu.c linux-2.6.32.7/arch/x86/ke .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c ---- linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c 2010-01-25 17:39:40.306401380 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/pci-swiotlb.c 2010-02-23 17:09:53.120037276 -0500 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); } @@ -11336,9 +11744,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.7/arch/x86/ .mapping_error = swiotlb_dma_mapping_error, .alloc_coherent = x86_swiotlb_alloc_coherent, .free_coherent = swiotlb_free_coherent, -diff -urNp linux-2.6.32.7/arch/x86/kernel/process_32.c linux-2.6.32.7/arch/x86/kernel/process_32.c ---- linux-2.6.32.7/arch/x86/kernel/process_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/process_32.c 2010-01-25 17:39:40.306401380 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/process_32.c linux-2.6.32.9/arch/x86/kernel/process_32.c +--- linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/process_32.c 2010-02-23 17:09:53.120037276 -0500 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -11433,9 +11841,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_32.c linux-2.6.32.7/arch/x86/k + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/kernel/process_64.c ---- linux-2.6.32.7/arch/x86/kernel/process_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/process_64.c 2010-01-25 17:39:40.306401380 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/process_64.c linux-2.6.32.9/arch/x86/kernel/process_64.c +--- linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/process_64.c 2010-02-23 17:09:53.120037276 -0500 @@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -11463,7 +11871,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/k unsigned fsindex, gsindex; bool preload_fpu; -@@ -549,12 +549,11 @@ unsigned long get_wchan(struct task_stru +@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); @@ -11478,9 +11886,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/k return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kernel/process.c ---- linux-2.6.32.7/arch/x86/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/process.c 2010-01-25 17:39:40.315113155 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/process.c linux-2.6.32.9/arch/x86/kernel/process.c +--- linux-2.6.32.9/arch/x86/kernel/process.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/process.c 2010-02-23 17:09:53.123619300 -0500 @@ -73,7 +73,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -11490,7 +11898,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern t->io_bitmap_ptr = NULL; clear_thread_flag(TIF_IO_BITMAP); -@@ -105,6 +105,9 @@ void flush_thread(void) +@@ -93,6 +93,9 @@ void flush_thread(void) clear_tsk_thread_flag(tsk, TIF_DEBUG); @@ -11500,7 +11908,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern tsk->thread.debugreg0 = 0; tsk->thread.debugreg1 = 0; tsk->thread.debugreg2 = 0; -@@ -596,17 +599,3 @@ static int __init idle_setup(char *str) +@@ -584,17 +587,3 @@ static int __init idle_setup(char *str) return 0; } early_param("idle", idle_setup); @@ -11518,9 +11926,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.32.7/arch/x86/kernel/ptrace.c linux-2.6.32.7/arch/x86/kernel/ptrace.c ---- linux-2.6.32.7/arch/x86/kernel/ptrace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/ptrace.c 2010-01-25 17:39:40.315113155 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/ptrace.c linux-2.6.32.9/arch/x86/kernel/ptrace.c +--- linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/ptrace.c 2010-02-23 17:09:53.123619300 -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) { @@ -11589,9 +11997,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ptrace.c linux-2.6.32.7/arch/x86/kerne /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kernel/reboot.c ---- linux-2.6.32.7/arch/x86/kernel/reboot.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/reboot.c 2010-01-25 17:39:40.315113155 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/reboot.c linux-2.6.32.9/arch/x86/kernel/reboot.c +--- linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/reboot.c 2010-02-23 17:09:53.123619300 -0500 @@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -11601,7 +12009,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne enum reboot_type reboot_type = BOOT_KBD; int reboot_force; -@@ -267,7 +267,7 @@ static struct dmi_system_id __initdata r +@@ -276,7 +276,7 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_BOARD_NAME, "P4S800"), }, }, @@ -11610,7 +12018,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne }; static int __init reboot_init(void) -@@ -283,12 +283,12 @@ core_initcall(reboot_init); +@@ -292,12 +292,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ @@ -11628,7 +12036,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne }; static const struct desc_ptr -@@ -337,7 +337,7 @@ static const unsigned char jump_to_bios +@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios * specified by the code and length parameters. * We assume that length will aways be less that 100! */ @@ -11637,7 +12045,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne { local_irq_disable(); -@@ -357,8 +357,8 @@ void machine_real_restart(const unsigned +@@ -366,8 +366,8 @@ void machine_real_restart(const unsigned /* Remap the kernel at virtual address zero, as well as offset zero from the kernel segment. This assumes the kernel segment starts at virtual address PAGE_OFFSET. */ @@ -11648,7 +12056,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne /* * Use `swapper_pg_dir' as our page directory. -@@ -370,16 +370,15 @@ void machine_real_restart(const unsigned +@@ -379,16 +379,15 @@ void machine_real_restart(const unsigned boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -11668,10 +12076,10 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.32.7/arch/x86/kernel/setup.c linux-2.6.32.7/arch/x86/kernel/setup.c ---- linux-2.6.32.7/arch/x86/kernel/setup.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/setup.c 2010-01-25 17:39:40.316230553 -0500 -@@ -763,14 +763,14 @@ void __init setup_arch(char **cmdline_p) +diff -urNp linux-2.6.32.9/arch/x86/kernel/setup.c linux-2.6.32.9/arch/x86/kernel/setup.c +--- linux-2.6.32.9/arch/x86/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/setup.c 2010-02-23 17:09:53.123619300 -0500 +@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY; @@ -11691,9 +12099,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/setup.c linux-2.6.32.7/arch/x86/kernel data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.32.7/arch/x86/kernel/setup_percpu.c linux-2.6.32.7/arch/x86/kernel/setup_percpu.c ---- linux-2.6.32.7/arch/x86/kernel/setup_percpu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/setup_percpu.c 2010-01-25 17:39:40.316230553 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/setup_percpu.c linux-2.6.32.9/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/setup_percpu.c 2010-02-23 17:09:53.123619300 -0500 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -11764,9 +12172,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/setup_percpu.c linux-2.6.32.7/arch/x86 /* * 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.7/arch/x86/kernel/signal.c linux-2.6.32.7/arch/x86/kernel/signal.c ---- linux-2.6.32.7/arch/x86/kernel/signal.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/signal.c 2010-01-25 17:39:40.316230553 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/signal.c linux-2.6.32.9/arch/x86/kernel/signal.c +--- linux-2.6.32.9/arch/x86/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/signal.c 2010-02-23 17:09:53.123619300 -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. @@ -11838,9 +12246,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/signal.c linux-2.6.32.7/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.32.7/arch/x86/kernel/smpboot.c linux-2.6.32.7/arch/x86/kernel/smpboot.c ---- linux-2.6.32.7/arch/x86/kernel/smpboot.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/smpboot.c 2010-01-25 17:39:40.316230553 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/smpboot.c linux-2.6.32.9/arch/x86/kernel/smpboot.c +--- linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/smpboot.c 2010-02-23 17:09:53.123619300 -0500 @@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; @@ -11853,9 +12261,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/smpboot.c linux-2.6.32.7/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start.sp = (void *) c_idle.idle->thread.sp; -diff -urNp linux-2.6.32.7/arch/x86/kernel/step.c linux-2.6.32.7/arch/x86/kernel/step.c ---- linux-2.6.32.7/arch/x86/kernel/step.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/step.c 2010-01-25 17:39:40.317128786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/step.c linux-2.6.32.9/arch/x86/kernel/step.c +--- linux-2.6.32.9/arch/x86/kernel/step.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/step.c 2010-02-23 17:09:53.123619300 -0500 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc struct desc_struct *desc; unsigned long base; @@ -11888,17 +12296,17 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/step.c linux-2.6.32.7/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S 2010-01-25 17:39:40.317128786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/syscall_table_32.S 2010-02-23 17:09:53.123619300 -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.7/arch/x86/kernel/sys_i386_32.c linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c 2010-01-25 17:55:33.503413891 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/sys_i386_32.c 2010-02-23 17:09:53.123619300 -0500 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -12145,9 +12553,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c linux-2.6.32.7/arch/x86/ } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c 2010-01-25 17:39:40.317128786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/sys_x86_64.c 2010-02-23 17:09:53.123619300 -0500 @@ -32,8 +32,8 @@ out: return error; } @@ -12229,9 +12637,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c linux-2.6.32.7/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.32.7/arch/x86/kernel/time.c linux-2.6.32.7/arch/x86/kernel/time.c ---- linux-2.6.32.7/arch/x86/kernel/time.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/time.c 2010-01-25 17:39:40.318098268 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/time.c linux-2.6.32.9/arch/x86/kernel/time.c +--- linux-2.6.32.9/arch/x86/kernel/time.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/time.c 2010-02-23 17:09:53.123619300 -0500 @@ -26,17 +26,13 @@ int timer_ack; #endif @@ -12270,9 +12678,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/time.c linux-2.6.32.7/arch/x86/kernel/ } return pc; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/tls.c linux-2.6.32.7/arch/x86/kernel/tls.c ---- linux-2.6.32.7/arch/x86/kernel/tls.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/tls.c 2010-01-25 17:39:40.318098268 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/tls.c linux-2.6.32.9/arch/x86/kernel/tls.c +--- linux-2.6.32.9/arch/x86/kernel/tls.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/tls.c 2010-02-23 17:09:53.123619300 -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; @@ -12285,9 +12693,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/tls.c linux-2.6.32.7/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.32.7/arch/x86/kernel/trampoline_32.S linux-2.6.32.7/arch/x86/kernel/trampoline_32.S ---- linux-2.6.32.7/arch/x86/kernel/trampoline_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/trampoline_32.S 2010-01-25 17:39:40.318098268 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/trampoline_32.S linux-2.6.32.9/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/trampoline_32.S 2010-02-23 17:09:53.123619300 -0500 @@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -12310,9 +12718,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/trampoline_32.S linux-2.6.32.7/arch/x8 # 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.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel/traps.c ---- linux-2.6.32.7/arch/x86/kernel/traps.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/traps.c 2010-01-25 17:39:40.318098268 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/traps.c linux-2.6.32.9/arch/x86/kernel/traps.c +--- linux-2.6.32.9/arch/x86/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/traps.c 2010-02-23 17:09:53.123619300 -0500 @@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -12326,7 +12734,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); -@@ -112,7 +106,7 @@ static inline void preempt_conditional_c +@@ -112,19 +106,19 @@ static inline void preempt_conditional_c static inline void die_if_kernel(const char *str, struct pt_regs *regs, long err) { @@ -12335,7 +12743,12 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel die(str, regs, err); } #endif -@@ -124,7 +118,7 @@ do_trap(int trapnr, int signr, char *str + + static void __kprobes +-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, ++do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs, + long error_code, siginfo_t *info) + { struct task_struct *tsk = current; #ifdef CONFIG_X86_32 @@ -12362,8 +12775,16 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); printk("\n"); -@@ -177,6 +171,12 @@ kernel_trap: +@@ -175,8 +169,20 @@ kernel_trap: + if (!fixup_exception(regs)) { + tsk->thread.error_code = error_code; tsk->thread.trap_no = trapnr; ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)) ++ str = "PAX: suspicious stack segment fault"; ++#endif ++ die(str, regs, error_code); } + @@ -12375,7 +12796,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel return; #ifdef CONFIG_X86_32 -@@ -265,14 +265,30 @@ do_general_protection(struct pt_regs *re +@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *re conditional_sti(regs); #ifdef CONFIG_X86_32 @@ -12408,13 +12829,13 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; -@@ -305,6 +321,13 @@ gp_in_kernel: +@@ -305,6 +327,13 @@ gp_in_kernel: if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) return; + +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) -+ if ((regs->cs & 0xFFFF) == __KERNEL_CS) ++ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS) + die("PAX: suspicious general protection fault", regs, error_code); + else +#endif @@ -12422,7 +12843,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel die("general protection fault", regs, error_code); } -@@ -558,7 +581,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -558,7 +587,7 @@ dotraplinkage void __kprobes do_debug(st } #ifdef CONFIG_X86_32 @@ -12431,7 +12852,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel goto debug_vm86; #endif -@@ -570,7 +593,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -570,7 +599,7 @@ dotraplinkage void __kprobes do_debug(st * kernel space (but re-enable TF when returning to user mode). */ if (condition & DR_STEP) { @@ -12440,7 +12861,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel goto clear_TF_reenable; } -@@ -757,7 +780,7 @@ do_simd_coprocessor_error(struct pt_regs +@@ -757,7 +786,7 @@ do_simd_coprocessor_error(struct pt_regs * Handle strange cache flush from user space exception * in all other cases. This is undocumented behaviour. */ @@ -12449,9 +12870,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -diff -urNp linux-2.6.32.7/arch/x86/kernel/tsc.c linux-2.6.32.7/arch/x86/kernel/tsc.c ---- linux-2.6.32.7/arch/x86/kernel/tsc.c 2010-01-25 20:04:14.629580263 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/tsc.c 2010-01-25 20:04:24.394132856 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/tsc.c linux-2.6.32.9/arch/x86/kernel/tsc.c +--- linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/tsc.c 2010-02-23 17:09:53.123619300 -0500 @@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -12461,9 +12882,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/tsc.c linux-2.6.32.7/arch/x86/kernel/t }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.32.7/arch/x86/kernel/vm86_32.c linux-2.6.32.7/arch/x86/kernel/vm86_32.c ---- linux-2.6.32.7/arch/x86/kernel/vm86_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/vm86_32.c 2010-01-25 17:39:40.319407931 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/vm86_32.c linux-2.6.32.9/arch/x86/kernel/vm86_32.c +--- linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/vm86_32.c 2010-02-23 17:09:53.123619300 -0500 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -12528,9 +12949,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vm86_32.c linux-2.6.32.7/arch/x86/kern if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.32.7/arch/x86/kernel/vmi_32.c linux-2.6.32.7/arch/x86/kernel/vmi_32.c ---- linux-2.6.32.7/arch/x86/kernel/vmi_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/vmi_32.c 2010-01-25 17:39:40.319407931 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/vmi_32.c linux-2.6.32.9/arch/x86/kernel/vmi_32.c +--- linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/vmi_32.c 2010-02-23 17:09:53.123619300 -0500 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -12690,9 +13111,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vmi_32.c linux-2.6.32.7/arch/x86/kerne return; local_irq_save(flags); -diff -urNp linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S 2010-01-25 20:01:12.031334490 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/vmlinux.lds.S 2010-02-23 17:09:53.127681323 -0500 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -12822,7 +13243,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.7/arch/x86/ +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES) + MODULES_EXEC_VADDR = .; + BYTE(0) -+ . += (8 * 1024 * 1024); ++ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); + . = ALIGN(PMD_SIZE); + MODULES_EXEC_END = . - 1; +#endif @@ -12980,9 +13401,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.7/arch/x86/ "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c 2010-01-25 17:39:40.319407931 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/vsyscall_64.c 2010-02-23 17:09:53.127681323 -0500 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -13016,9 +13437,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c linux-2.6.32.7/arch/x86/ }; #endif -diff -urNp linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c 2010-01-25 17:39:40.319407931 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/x8664_ksyms_64.c 2010-02-23 17:09:53.127681323 -0500 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -13028,9 +13449,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.7/arch/x EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.32.7/arch/x86/kernel/xsave.c linux-2.6.32.7/arch/x86/kernel/xsave.c ---- linux-2.6.32.7/arch/x86/kernel/xsave.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kernel/xsave.c 2010-01-25 17:39:40.320404823 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kernel/xsave.c linux-2.6.32.9/arch/x86/kernel/xsave.c +--- linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kernel/xsave.c 2010-02-23 17:09:53.127681323 -0500 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -13058,9 +13479,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/xsave.c linux-2.6.32.7/arch/x86/kernel buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.32.7/arch/x86/kvm/emulate.c linux-2.6.32.7/arch/x86/kvm/emulate.c ---- linux-2.6.32.7/arch/x86/kvm/emulate.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kvm/emulate.c 2010-01-25 17:39:40.320404823 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kvm/emulate.c linux-2.6.32.9/arch/x86/kvm/emulate.c +--- linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kvm/emulate.c 2010-02-23 17:09:53.127681323 -0500 @@ -389,6 +389,7 @@ static u32 group2_table[] = { #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ @@ -13086,9 +13507,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/emulate.c linux-2.6.32.7/arch/x86/kvm/emu switch ((_dst).bytes) { \ case 1: \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.32.7/arch/x86/kvm/svm.c linux-2.6.32.7/arch/x86/kvm/svm.c ---- linux-2.6.32.7/arch/x86/kvm/svm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kvm/svm.c 2010-01-25 17:39:40.321202861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kvm/svm.c linux-2.6.32.9/arch/x86/kvm/svm.c +--- linux-2.6.32.9/arch/x86/kvm/svm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kvm/svm.c 2010-02-23 17:09:53.127681323 -0500 @@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -13112,9 +13533,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/svm.c linux-2.6.32.7/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.7/arch/x86/kvm/vmx.c linux-2.6.32.7/arch/x86/kvm/vmx.c ---- linux-2.6.32.7/arch/x86/kvm/vmx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/kvm/vmx.c 2010-01-25 17:39:40.321202861 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kvm/vmx.c linux-2.6.32.9/arch/x86/kvm/vmx.c +--- linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/kvm/vmx.c 2010-02-23 17:09:53.127681323 -0500 @@ -566,7 +566,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -13193,9 +13614,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/vmx.c linux-2.6.32.7/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.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c ---- linux-2.6.32.7/arch/x86/kvm/x86.c 2010-01-25 20:04:14.662248250 -0500 -+++ linux-2.6.32.7/arch/x86/kvm/x86.c 2010-01-25 20:04:24.398096271 -0500 +diff -urNp linux-2.6.32.9/arch/x86/kvm/x86.c linux-2.6.32.9/arch/x86/kvm/x86.c +--- linux-2.6.32.9/arch/x86/kvm/x86.c 2010-02-23 17:04:11.867584476 -0500 ++++ linux-2.6.32.9/arch/x86/kvm/x86.c 2010-02-23 17:09:53.127681323 -0500 @@ -81,45 +81,45 @@ static void update_cr8_intercept(struct static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, struct kvm_cpuid_entry2 __user *entries); @@ -13275,7 +13696,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c { NULL } }; -@@ -1657,7 +1657,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1658,7 +1658,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -13284,7 +13705,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -3131,10 +3131,10 @@ static struct notifier_block kvmclock_cp +@@ -3170,10 +3170,10 @@ static struct notifier_block kvmclock_cp .notifier_call = kvmclock_cpufreq_notifier }; @@ -13297,9 +13718,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/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.7/arch/x86/lib/checksum_32.S linux-2.6.32.7/arch/x86/lib/checksum_32.S ---- linux-2.6.32.7/arch/x86/lib/checksum_32.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/checksum_32.S 2010-01-25 17:39:40.323113786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/checksum_32.S linux-2.6.32.9/arch/x86/lib/checksum_32.S +--- linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/checksum_32.S 2010-02-23 17:09:53.127681323 -0500 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -13545,9 +13966,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/checksum_32.S linux-2.6.32.7/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.32.7/arch/x86/lib/clear_page_64.S linux-2.6.32.7/arch/x86/lib/clear_page_64.S ---- linux-2.6.32.7/arch/x86/lib/clear_page_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/clear_page_64.S 2010-01-25 17:39:40.323113786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/clear_page_64.S linux-2.6.32.9/arch/x86/lib/clear_page_64.S +--- linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/clear_page_64.S 2010-02-23 17:09:53.127681323 -0500 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -13557,9 +13978,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/clear_page_64.S linux-2.6.32.7/arch/x86/l 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.7/arch/x86/lib/copy_page_64.S linux-2.6.32.7/arch/x86/lib/copy_page_64.S ---- linux-2.6.32.7/arch/x86/lib/copy_page_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/copy_page_64.S 2010-01-25 17:39:40.323113786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/copy_page_64.S linux-2.6.32.9/arch/x86/lib/copy_page_64.S +--- linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/copy_page_64.S 2010-02-23 17:09:53.127681323 -0500 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -13569,9 +13990,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/copy_page_64.S linux-2.6.32.7/arch/x86/li 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.7/arch/x86/lib/copy_user_64.S linux-2.6.32.7/arch/x86/lib/copy_user_64.S ---- linux-2.6.32.7/arch/x86/lib/copy_user_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/copy_user_64.S 2010-01-25 17:39:40.323113786 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/copy_user_64.S linux-2.6.32.9/arch/x86/lib/copy_user_64.S +--- linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/copy_user_64.S 2010-02-23 17:09:53.127681323 -0500 @@ -21,7 +21,7 @@ .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ @@ -13623,9 +14044,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/copy_user_64.S linux-2.6.32.7/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.32.7/arch/x86/lib/getuser.S linux-2.6.32.7/arch/x86/lib/getuser.S ---- linux-2.6.32.7/arch/x86/lib/getuser.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/getuser.S 2010-01-25 20:04:47.636320675 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/getuser.S linux-2.6.32.9/arch/x86/lib/getuser.S +--- linux-2.6.32.9/arch/x86/lib/getuser.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/getuser.S 2010-02-23 17:09:53.127681323 -0500 @@ -33,14 +33,28 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -13718,9 +14139,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/getuser.S linux-2.6.32.7/arch/x86/lib/get xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.32.7/arch/x86/lib/memcpy_64.S linux-2.6.32.7/arch/x86/lib/memcpy_64.S ---- linux-2.6.32.7/arch/x86/lib/memcpy_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/memcpy_64.S 2010-01-25 17:39:40.324402082 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/memcpy_64.S linux-2.6.32.9/arch/x86/lib/memcpy_64.S +--- linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/memcpy_64.S 2010-02-23 17:09:53.127681323 -0500 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -13730,9 +14151,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/memcpy_64.S linux-2.6.32.7/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.7/arch/x86/lib/memset_64.S linux-2.6.32.7/arch/x86/lib/memset_64.S ---- linux-2.6.32.7/arch/x86/lib/memset_64.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/memset_64.S 2010-01-25 17:39:40.324402082 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/memset_64.S linux-2.6.32.9/arch/x86/lib/memset_64.S +--- linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/memset_64.S 2010-02-23 17:09:53.127681323 -0500 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -13742,9 +14163,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/memset_64.S linux-2.6.32.7/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.32.7/arch/x86/lib/mmx_32.c linux-2.6.32.7/arch/x86/lib/mmx_32.c ---- linux-2.6.32.7/arch/x86/lib/mmx_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/mmx_32.c 2010-01-25 17:39:40.324402082 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/mmx_32.c linux-2.6.32.9/arch/x86/lib/mmx_32.c +--- linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/mmx_32.c 2010-02-23 17:09:53.127681323 -0500 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -14060,9 +14481,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/mmx_32.c linux-2.6.32.7/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.32.7/arch/x86/lib/putuser.S linux-2.6.32.7/arch/x86/lib/putuser.S ---- linux-2.6.32.7/arch/x86/lib/putuser.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/putuser.S 2010-01-25 17:39:40.324402082 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/putuser.S linux-2.6.32.9/arch/x86/lib/putuser.S +--- linux-2.6.32.9/arch/x86/lib/putuser.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/putuser.S 2010-02-23 17:09:53.127681323 -0500 @@ -15,6 +15,7 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -14166,9 +14587,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/putuser.S linux-2.6.32.7/arch/x86/lib/put movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.32.7/arch/x86/lib/usercopy_32.c linux-2.6.32.7/arch/x86/lib/usercopy_32.c ---- linux-2.6.32.7/arch/x86/lib/usercopy_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/lib/usercopy_32.c 2010-01-25 17:39:40.325506692 -0500 +diff -urNp linux-2.6.32.9/arch/x86/lib/usercopy_32.c linux-2.6.32.9/arch/x86/lib/usercopy_32.c +--- linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/lib/usercopy_32.c 2010-02-23 17:09:53.132248096 -0500 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -15137,9 +15558,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/usercopy_32.c linux-2.6.32.7/arch/x86/lib +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.32.7/arch/x86/Makefile linux-2.6.32.7/arch/x86/Makefile ---- linux-2.6.32.7/arch/x86/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/Makefile 2010-01-25 17:39:40.325506692 -0500 +diff -urNp linux-2.6.32.9/arch/x86/Makefile linux-2.6.32.9/arch/x86/Makefile +--- linux-2.6.32.9/arch/x86/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/Makefile 2010-02-23 17:09:53.132248096 -0500 @@ -189,3 +189,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -15153,9 +15574,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Makefile linux-2.6.32.7/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.32.7/arch/x86/mm/extable.c linux-2.6.32.7/arch/x86/mm/extable.c ---- linux-2.6.32.7/arch/x86/mm/extable.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/extable.c 2010-01-25 17:39:40.325506692 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/extable.c linux-2.6.32.9/arch/x86/mm/extable.c +--- linux-2.6.32.9/arch/x86/mm/extable.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/extable.c 2010-02-23 17:09:53.132248096 -0500 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -15229,9 +15650,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/extable.c linux-2.6.32.7/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c ---- linux-2.6.32.7/arch/x86/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/fault.c 2010-01-25 17:39:40.326401486 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/fault.c linux-2.6.32.9/arch/x86/mm/fault.c +--- linux-2.6.32.9/arch/x86/mm/fault.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/fault.c 2010-02-23 17:09:53.132248096 -0500 @@ -11,10 +11,14 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ @@ -15759,7 +16180,7 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c + printk("\n"); + + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long)); -+ for (i = -1; i < 80 / sizeof(long); i++) { ++ for (i = -1; i < 80 / (long)sizeof(long); i++) { + unsigned long c; + if (get_user(c, (__force unsigned long __user *)sp+i)) +#ifdef CONFIG_X86_32 @@ -15798,9 +16219,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c + + return ret ? -EFAULT : 0; +} -diff -urNp linux-2.6.32.7/arch/x86/mm/gup.c linux-2.6.32.7/arch/x86/mm/gup.c ---- linux-2.6.32.7/arch/x86/mm/gup.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/gup.c 2010-01-25 17:39:40.326401486 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/gup.c linux-2.6.32.9/arch/x86/mm/gup.c +--- linux-2.6.32.9/arch/x86/mm/gup.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/gup.c 2010-02-23 17:09:53.132248096 -0500 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -15810,9 +16231,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/gup.c linux-2.6.32.7/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.32.7/arch/x86/mm/highmem_32.c linux-2.6.32.7/arch/x86/mm/highmem_32.c ---- linux-2.6.32.7/arch/x86/mm/highmem_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/highmem_32.c 2010-01-25 17:39:40.326401486 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/highmem_32.c linux-2.6.32.9/arch/x86/mm/highmem_32.c +--- linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/highmem_32.c 2010-02-23 17:09:53.132248096 -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); @@ -15824,9 +16245,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/highmem_32.c linux-2.6.32.7/arch/x86/mm/hi return (void *)vaddr; } -diff -urNp linux-2.6.32.7/arch/x86/mm/hugetlbpage.c linux-2.6.32.7/arch/x86/mm/hugetlbpage.c ---- linux-2.6.32.7/arch/x86/mm/hugetlbpage.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/hugetlbpage.c 2010-01-25 17:39:40.326401486 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/hugetlbpage.c linux-2.6.32.9/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/hugetlbpage.c 2010-02-23 17:09:53.132248096 -0500 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -15961,9 +16382,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/hugetlbpage.c linux-2.6.32.7/arch/x86/mm/h (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.32.7/arch/x86/mm/init_32.c linux-2.6.32.7/arch/x86/mm/init_32.c ---- linux-2.6.32.7/arch/x86/mm/init_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/init_32.c 2010-01-25 17:39:40.327488230 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/init_32.c linux-2.6.32.9/arch/x86/mm/init_32.c +--- linux-2.6.32.9/arch/x86/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/init_32.c 2010-02-23 17:09:53.132248096 -0500 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -16245,9 +16666,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init_32.c linux-2.6.32.7/arch/x86/mm/init_ 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.7/arch/x86/mm/init_64.c linux-2.6.32.7/arch/x86/mm/init_64.c ---- linux-2.6.32.7/arch/x86/mm/init_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/init_64.c 2010-01-25 17:39:40.327488230 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/init_64.c linux-2.6.32.9/arch/x86/mm/init_64.c +--- linux-2.6.32.9/arch/x86/mm/init_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/init_64.c 2010-02-23 17:09:53.132248096 -0500 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -16295,9 +16716,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init_64.c linux-2.6.32.7/arch/x86/mm/init_ return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.32.7/arch/x86/mm/init.c linux-2.6.32.7/arch/x86/mm/init.c ---- linux-2.6.32.7/arch/x86/mm/init.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/init.c 2010-01-25 17:39:40.327488230 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/init.c linux-2.6.32.9/arch/x86/mm/init.c +--- linux-2.6.32.9/arch/x86/mm/init.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/init.c 2010-02-23 17:09:53.132248096 -0500 @@ -331,7 +331,13 @@ unsigned long __init_refok init_memory_m */ int devmem_is_allowed(unsigned long pagenr) @@ -16397,9 +16818,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init.c linux-2.6.32.7/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.7/arch/x86/mm/iomap_32.c linux-2.6.32.7/arch/x86/mm/iomap_32.c ---- linux-2.6.32.7/arch/x86/mm/iomap_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/iomap_32.c 2010-01-25 17:39:40.327488230 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/iomap_32.c linux-2.6.32.9/arch/x86/mm/iomap_32.c +--- linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/iomap_32.c 2010-02-23 17:09:53.132248096 -0500 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -16412,9 +16833,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/iomap_32.c linux-2.6.32.7/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/ioremap.c ---- linux-2.6.32.7/arch/x86/mm/ioremap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/ioremap.c 2010-01-25 17:39:55.421135702 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/ioremap.c linux-2.6.32.9/arch/x86/mm/ioremap.c +--- linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/ioremap.c 2010-02-23 17:09:53.132248096 -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. @@ -16426,7 +16847,7 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/iorem return 0; for (i = 0; i < e820.nr_map; i++) { -@@ -137,10 +137,7 @@ static void __iomem *__ioremap_caller(re +@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re /* * Don't allow anybody to remap normal RAM that we're using.. */ @@ -16437,7 +16858,11 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/iorem + for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) { int is_ram = page_is_ram(pfn); - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) +- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) ++ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn)))) + return NULL; + WARN_ON_ONCE(is_ram); + } @@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se early_param("early_ioremap_debug", early_ioremap_debug_setup); @@ -16457,9 +16882,24 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.32.7/arch/x86/mm/mmap.c linux-2.6.32.7/arch/x86/mm/mmap.c ---- linux-2.6.32.7/arch/x86/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/mmap.c 2010-01-25 17:39:40.328401736 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/kmemcheck/kmemcheck.c 2010-02-23 17:09:53.132248096 -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. + */ +- if (regs->flags & X86_VM_MASK) ++ if (v8086_mode(regs)) + return false; +- if (regs->cs != __KERNEL_CS) ++ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS) + return false; + + pte = kmemcheck_pte_lookup(address); +diff -urNp linux-2.6.32.9/arch/x86/mm/mmap.c linux-2.6.32.9/arch/x86/mm/mmap.c +--- linux-2.6.32.9/arch/x86/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/mmap.c 2010-02-23 17:09:53.132248096 -0500 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -16541,9 +16981,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/mmap.c linux-2.6.32.7/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.7/arch/x86/mm/numa_32.c linux-2.6.32.7/arch/x86/mm/numa_32.c ---- linux-2.6.32.7/arch/x86/mm/numa_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/numa_32.c 2010-01-25 17:39:40.328401736 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/numa_32.c linux-2.6.32.9/arch/x86/mm/numa_32.c +--- linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/numa_32.c 2010-02-23 17:09:53.136027747 -0500 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -16552,9 +16992,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/numa_32.c linux-2.6.32.7/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr.c linux-2.6.32.7/arch/x86/mm/pageattr.c ---- linux-2.6.32.7/arch/x86/mm/pageattr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/pageattr.c 2010-01-25 17:39:40.328401736 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr.c linux-2.6.32.9/arch/x86/mm/pageattr.c +--- linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/pageattr.c 2010-02-23 17:09:53.136027747 -0500 @@ -268,9 +268,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping @@ -16586,9 +17026,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr.c linux-2.6.32.7/arch/x86/mm/page #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr-test.c linux-2.6.32.7/arch/x86/mm/pageattr-test.c ---- linux-2.6.32.7/arch/x86/mm/pageattr-test.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/pageattr-test.c 2010-01-25 17:39:40.328401736 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/pageattr-test.c linux-2.6.32.9/arch/x86/mm/pageattr-test.c +--- linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/pageattr-test.c 2010-02-23 17:09:53.136027747 -0500 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -16598,9 +17038,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr-test.c linux-2.6.32.7/arch/x86/mm } struct split_state { -diff -urNp linux-2.6.32.7/arch/x86/mm/pat.c linux-2.6.32.7/arch/x86/mm/pat.c ---- linux-2.6.32.7/arch/x86/mm/pat.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/pat.c 2010-01-25 17:39:40.329405548 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/pat.c linux-2.6.32.9/arch/x86/mm/pat.c +--- linux-2.6.32.9/arch/x86/mm/pat.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/pat.c 2010-02-23 17:09:53.136027747 -0500 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -16637,9 +17077,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pat.c linux-2.6.32.7/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -diff -urNp linux-2.6.32.7/arch/x86/mm/pgtable_32.c linux-2.6.32.7/arch/x86/mm/pgtable_32.c ---- linux-2.6.32.7/arch/x86/mm/pgtable_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/pgtable_32.c 2010-01-25 17:39:40.329405548 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/pgtable_32.c linux-2.6.32.9/arch/x86/mm/pgtable_32.c +--- linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/pgtable_32.c 2010-02-23 17:09:53.136027747 -0500 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -16654,9 +17094,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pgtable_32.c linux-2.6.32.7/arch/x86/mm/pg /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.32.7/arch/x86/mm/setup_nx.c linux-2.6.32.7/arch/x86/mm/setup_nx.c ---- linux-2.6.32.7/arch/x86/mm/setup_nx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/setup_nx.c 2010-01-25 17:39:40.329405548 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/setup_nx.c linux-2.6.32.9/arch/x86/mm/setup_nx.c +--- linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/setup_nx.c 2010-02-23 17:09:53.136027747 -0500 @@ -4,11 +4,10 @@ #include <asm/pgtable.h> @@ -16722,9 +17162,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/setup_nx.c linux-2.6.32.7/arch/x86/mm/setu __supported_pte_mask &= ~_PAGE_NX; } #endif -diff -urNp linux-2.6.32.7/arch/x86/mm/tlb.c linux-2.6.32.7/arch/x86/mm/tlb.c ---- linux-2.6.32.7/arch/x86/mm/tlb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/mm/tlb.c 2010-01-25 17:39:40.329405548 -0500 +diff -urNp linux-2.6.32.9/arch/x86/mm/tlb.c linux-2.6.32.9/arch/x86/mm/tlb.c +--- linux-2.6.32.9/arch/x86/mm/tlb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/mm/tlb.c 2010-02-23 17:09:53.136027747 -0500 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -16734,9 +17174,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/tlb.c linux-2.6.32.7/arch/x86/mm/tlb.c /* * Smarter SMP flushing macros. -diff -urNp linux-2.6.32.7/arch/x86/oprofile/backtrace.c linux-2.6.32.7/arch/x86/oprofile/backtrace.c ---- linux-2.6.32.7/arch/x86/oprofile/backtrace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/oprofile/backtrace.c 2010-01-25 17:39:40.330164343 -0500 +diff -urNp linux-2.6.32.9/arch/x86/oprofile/backtrace.c linux-2.6.32.9/arch/x86/oprofile/backtrace.c +--- linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/oprofile/backtrace.c 2010-02-23 17:09:53.136027747 -0500 @@ -37,7 +37,7 @@ static void backtrace_address(void *data unsigned int *depth = data; @@ -16764,9 +17204,9 @@ diff -urNp linux-2.6.32.7/arch/x86/oprofile/backtrace.c linux-2.6.32.7/arch/x86/ unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c 2010-01-25 17:39:40.330164343 -0500 +diff -urNp linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/oprofile/op_model_p4.c 2010-02-23 17:09:53.136027747 -0500 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -16776,9 +17216,9 @@ diff -urNp linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c linux-2.6.32.7/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.32.7/arch/x86/pci/common.c linux-2.6.32.7/arch/x86/pci/common.c ---- linux-2.6.32.7/arch/x86/pci/common.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/common.c 2010-01-25 17:39:40.330164343 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/common.c linux-2.6.32.9/arch/x86/pci/common.c +--- linux-2.6.32.9/arch/x86/pci/common.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/common.c 2010-02-23 17:09:53.136027747 -0500 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -16799,9 +17239,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/common.c linux-2.6.32.7/arch/x86/pci/comm }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.32.7/arch/x86/pci/direct.c linux-2.6.32.7/arch/x86/pci/direct.c ---- linux-2.6.32.7/arch/x86/pci/direct.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/direct.c 2010-01-25 17:39:40.330164343 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/direct.c linux-2.6.32.9/arch/x86/pci/direct.c +--- linux-2.6.32.9/arch/x86/pci/direct.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/direct.c 2010-02-23 17:09:53.136027747 -0500 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -16829,9 +17269,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/direct.c linux-2.6.32.7/arch/x86/pci/dire { u32 x = 0; int year, devfn; -diff -urNp linux-2.6.32.7/arch/x86/pci/fixup.c linux-2.6.32.7/arch/x86/pci/fixup.c ---- linux-2.6.32.7/arch/x86/pci/fixup.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/fixup.c 2010-01-25 17:39:40.330164343 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/fixup.c linux-2.6.32.9/arch/x86/pci/fixup.c +--- linux-2.6.32.9/arch/x86/pci/fixup.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/fixup.c 2010-02-23 17:09:53.136027747 -0500 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -16850,9 +17290,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/fixup.c linux-2.6.32.7/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.32.7/arch/x86/pci/irq.c linux-2.6.32.7/arch/x86/pci/irq.c ---- linux-2.6.32.7/arch/x86/pci/irq.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/irq.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/irq.c linux-2.6.32.9/arch/x86/pci/irq.c +--- linux-2.6.32.9/arch/x86/pci/irq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/irq.c 2010-02-23 17:09:53.136027747 -0500 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, @@ -16871,9 +17311,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/irq.c linux-2.6.32.7/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_32.c linux-2.6.32.7/arch/x86/pci/mmconfig_32.c ---- linux-2.6.32.7/arch/x86/pci/mmconfig_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/mmconfig_32.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_32.c linux-2.6.32.9/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/mmconfig_32.c 2010-02-23 17:09:53.136027747 -0500 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -16883,9 +17323,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_32.c linux-2.6.32.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_64.c linux-2.6.32.7/arch/x86/pci/mmconfig_64.c ---- linux-2.6.32.7/arch/x86/pci/mmconfig_64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/mmconfig_64.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/mmconfig_64.c linux-2.6.32.9/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/mmconfig_64.c 2010-02-23 17:09:53.136027747 -0500 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -16895,9 +17335,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_64.c linux-2.6.32.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.32.7/arch/x86/pci/numaq_32.c linux-2.6.32.7/arch/x86/pci/numaq_32.c ---- linux-2.6.32.7/arch/x86/pci/numaq_32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/numaq_32.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/numaq_32.c linux-2.6.32.9/arch/x86/pci/numaq_32.c +--- linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/numaq_32.c 2010-02-23 17:09:53.136027747 -0500 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -16907,9 +17347,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/numaq_32.c linux-2.6.32.7/arch/x86/pci/nu .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.32.7/arch/x86/pci/olpc.c linux-2.6.32.7/arch/x86/pci/olpc.c ---- linux-2.6.32.7/arch/x86/pci/olpc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/olpc.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/olpc.c linux-2.6.32.9/arch/x86/pci/olpc.c +--- linux-2.6.32.9/arch/x86/pci/olpc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/olpc.c 2010-02-23 17:09:53.136027747 -0500 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -16919,9 +17359,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/olpc.c linux-2.6.32.7/arch/x86/pci/olpc.c .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.32.7/arch/x86/pci/pcbios.c linux-2.6.32.7/arch/x86/pci/pcbios.c ---- linux-2.6.32.7/arch/x86/pci/pcbios.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/pci/pcbios.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/pci/pcbios.c linux-2.6.32.9/arch/x86/pci/pcbios.c +--- linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/pci/pcbios.c 2010-02-23 17:09:53.136027747 -0500 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -17244,9 +17684,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/pcbios.c linux-2.6.32.7/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.32.7/arch/x86/power/cpu.c linux-2.6.32.7/arch/x86/power/cpu.c ---- linux-2.6.32.7/arch/x86/power/cpu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/power/cpu.c 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/power/cpu.c linux-2.6.32.9/arch/x86/power/cpu.c +--- linux-2.6.32.9/arch/x86/power/cpu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/power/cpu.c 2010-02-23 17:09:53.136027747 -0500 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -17266,9 +17706,9 @@ diff -urNp linux-2.6.32.7/arch/x86/power/cpu.c linux-2.6.32.7/arch/x86/power/cpu syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.32.7/arch/x86/vdso/Makefile linux-2.6.32.7/arch/x86/vdso/Makefile ---- linux-2.6.32.7/arch/x86/vdso/Makefile 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/Makefile 2010-01-25 17:39:40.331177529 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/Makefile linux-2.6.32.9/arch/x86/vdso/Makefile +--- linux-2.6.32.9/arch/x86/vdso/Makefile 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/Makefile 2010-02-23 17:09:53.136027747 -0500 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -17278,9 +17718,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/Makefile linux-2.6.32.7/arch/x86/vdso/Ma GCOV_PROFILE := n # -diff -urNp linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/vclock_gettime.c 2010-02-23 17:09:53.136027747 -0500 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -17379,9 +17819,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c linux-2.6.32.7/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/vdso32-setup.c 2010-02-23 17:09:53.136027747 -0500 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -17482,9 +17922,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c linux-2.6.32.7/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso.lds.S linux-2.6.32.7/arch/x86/vdso/vdso.lds.S ---- linux-2.6.32.7/arch/x86/vdso/vdso.lds.S 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/vdso.lds.S 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/vdso.lds.S linux-2.6.32.9/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/vdso.lds.S 2010-02-23 17:09:53.136027747 -0500 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -17495,9 +17935,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso.lds.S linux-2.6.32.7/arch/x86/vdso/ +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.32.7/arch/x86/vdso/vextern.h linux-2.6.32.7/arch/x86/vdso/vextern.h ---- linux-2.6.32.7/arch/x86/vdso/vextern.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/vextern.h 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/vextern.h linux-2.6.32.9/arch/x86/vdso/vextern.h +--- linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/vextern.h 2010-02-23 17:09:53.136027747 -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. */ @@ -17505,9 +17945,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vextern.h linux-2.6.32.7/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.32.7/arch/x86/vdso/vma.c linux-2.6.32.7/arch/x86/vdso/vma.c ---- linux-2.6.32.7/arch/x86/vdso/vma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/vdso/vma.c 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/vdso/vma.c linux-2.6.32.9/arch/x86/vdso/vma.c +--- linux-2.6.32.9/arch/x86/vdso/vma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/vdso/vma.c 2010-02-23 17:09:53.136027747 -0500 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -17554,9 +17994,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vma.c linux-2.6.32.7/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.32.7/arch/x86/xen/enlighten.c linux-2.6.32.7/arch/x86/xen/enlighten.c ---- linux-2.6.32.7/arch/x86/xen/enlighten.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/xen/enlighten.c 2010-01-25 17:39:40.332419696 -0500 +diff -urNp linux-2.6.32.9/arch/x86/xen/enlighten.c linux-2.6.32.9/arch/x86/xen/enlighten.c +--- linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/xen/enlighten.c 2010-02-23 17:09:53.140103788 -0500 @@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -17589,9 +18029,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/enlighten.c linux-2.6.32.7/arch/x86/xen/e xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.32.7/arch/x86/xen/mmu.c linux-2.6.32.7/arch/x86/xen/mmu.c ---- linux-2.6.32.7/arch/x86/xen/mmu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/xen/mmu.c 2010-01-25 17:39:40.333504249 -0500 +diff -urNp linux-2.6.32.9/arch/x86/xen/mmu.c linux-2.6.32.9/arch/x86/xen/mmu.c +--- linux-2.6.32.9/arch/x86/xen/mmu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/xen/mmu.c 2010-02-23 17:09:53.140103788 -0500 @@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -17612,9 +18052,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/mmu.c linux-2.6.32.7/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.32.7/arch/x86/xen/smp.c linux-2.6.32.7/arch/x86/xen/smp.c ---- linux-2.6.32.7/arch/x86/xen/smp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/xen/smp.c 2010-01-25 17:39:40.333504249 -0500 +diff -urNp linux-2.6.32.9/arch/x86/xen/smp.c linux-2.6.32.9/arch/x86/xen/smp.c +--- linux-2.6.32.9/arch/x86/xen/smp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/xen/smp.c 2010-02-23 17:09:53.140103788 -0500 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -17638,9 +18078,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/smp.c linux-2.6.32.7/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.32.7/arch/x86/xen/xen-ops.h linux-2.6.32.7/arch/x86/xen/xen-ops.h ---- linux-2.6.32.7/arch/x86/xen/xen-ops.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/arch/x86/xen/xen-ops.h 2010-01-25 17:39:40.333504249 -0500 +diff -urNp linux-2.6.32.9/arch/x86/xen/xen-ops.h linux-2.6.32.9/arch/x86/xen/xen-ops.h +--- linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/arch/x86/xen/xen-ops.h 2010-02-23 17:09:53.140103788 -0500 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -17650,9 +18090,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/xen-ops.h linux-2.6.32.7/arch/x86/xen/xen struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.32.7/block/blk-integrity.c linux-2.6.32.7/block/blk-integrity.c ---- linux-2.6.32.7/block/blk-integrity.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/block/blk-integrity.c 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/block/blk-integrity.c linux-2.6.32.9/block/blk-integrity.c +--- linux-2.6.32.9/block/blk-integrity.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/blk-integrity.c 2010-02-23 17:09:53.140103788 -0500 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -17662,9 +18102,21 @@ diff -urNp linux-2.6.32.7/block/blk-integrity.c linux-2.6.32.7/block/blk-integri .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.32.7/block/blk-map.c linux-2.6.32.7/block/blk-map.c ---- linux-2.6.32.7/block/blk-map.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/block/blk-map.c 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/block/blk-iopoll.c linux-2.6.32.9/block/blk-iopoll.c +--- linux-2.6.32.9/block/blk-iopoll.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/blk-iopoll.c 2010-02-23 17:09:53.140103788 -0500 +@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo + } + EXPORT_SYMBOL(blk_iopoll_complete); + +-static void blk_iopoll_softirq(struct softirq_action *h) ++static void blk_iopoll_softirq(void) + { + struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); + int rearm = 0, budget = blk_iopoll_budget; +diff -urNp linux-2.6.32.9/block/blk-map.c linux-2.6.32.9/block/blk-map.c +--- linux-2.6.32.9/block/blk-map.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/blk-map.c 2010-02-23 17:09:53.140103788 -0500 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -17683,9 +18135,21 @@ diff -urNp linux-2.6.32.7/block/blk-map.c linux-2.6.32.7/block/blk-map.c if (do_copy) bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); else -diff -urNp linux-2.6.32.7/block/blk-sysfs.c linux-2.6.32.7/block/blk-sysfs.c ---- linux-2.6.32.7/block/blk-sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/block/blk-sysfs.c 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/block/blk-softirq.c linux-2.6.32.9/block/blk-softirq.c +--- linux-2.6.32.9/block/blk-softirq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/blk-softirq.c 2010-02-23 17:09:53.140103788 -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. + */ +-static void blk_done_softirq(struct softirq_action *h) ++static void blk_done_softirq(void) + { + struct list_head *cpu_list, local_list; + +diff -urNp linux-2.6.32.9/block/blk-sysfs.c linux-2.6.32.9/block/blk-sysfs.c +--- linux-2.6.32.9/block/blk-sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/blk-sysfs.c 2010-02-23 17:09:53.140103788 -0500 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -17695,9 +18159,9 @@ diff -urNp linux-2.6.32.7/block/blk-sysfs.c linux-2.6.32.7/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.32.7/block/elevator.c linux-2.6.32.7/block/elevator.c ---- linux-2.6.32.7/block/elevator.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/block/elevator.c 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/block/elevator.c linux-2.6.32.9/block/elevator.c +--- linux-2.6.32.9/block/elevator.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/block/elevator.c 2010-02-23 17:09:53.140103788 -0500 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -17707,9 +18171,9 @@ diff -urNp linux-2.6.32.7/block/elevator.c linux-2.6.32.7/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.32.7/crypto/lrw.c linux-2.6.32.7/crypto/lrw.c ---- linux-2.6.32.7/crypto/lrw.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/crypto/lrw.c 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/crypto/lrw.c linux-2.6.32.9/crypto/lrw.c +--- linux-2.6.32.9/crypto/lrw.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/crypto/lrw.c 2010-02-23 17:09:53.140103788 -0500 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -17719,9 +18183,9 @@ diff -urNp linux-2.6.32.7/crypto/lrw.c linux-2.6.32.7/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/Documentation/dontdiff ---- linux-2.6.32.7/Documentation/dontdiff 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/Documentation/dontdiff 2010-01-25 17:39:40.334142180 -0500 +diff -urNp linux-2.6.32.9/Documentation/dontdiff linux-2.6.32.9/Documentation/dontdiff +--- linux-2.6.32.9/Documentation/dontdiff 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/Documentation/dontdiff 2010-02-23 17:09:53.140103788 -0500 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -17828,9 +18292,9 @@ diff -urNp linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/Documentation/do zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.32.7/Documentation/kernel-parameters.txt linux-2.6.32.7/Documentation/kernel-parameters.txt ---- linux-2.6.32.7/Documentation/kernel-parameters.txt 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/Documentation/kernel-parameters.txt 2010-01-25 17:39:40.368608699 -0500 +diff -urNp linux-2.6.32.9/Documentation/kernel-parameters.txt linux-2.6.32.9/Documentation/kernel-parameters.txt +--- linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/Documentation/kernel-parameters.txt 2010-02-23 17:09:53.140103788 -0500 @@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -17844,9 +18308,9 @@ diff -urNp linux-2.6.32.7/Documentation/kernel-parameters.txt linux-2.6.32.7/Doc pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.32.7/drivers/acpi/battery.c linux-2.6.32.7/drivers/acpi/battery.c ---- linux-2.6.32.7/drivers/acpi/battery.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/battery.c 2010-01-25 17:39:40.369403392 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/battery.c linux-2.6.32.9/drivers/acpi/battery.c +--- linux-2.6.32.9/drivers/acpi/battery.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/battery.c 2010-02-23 17:09:53.140103788 -0500 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); } @@ -17856,9 +18320,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/battery.c linux-2.6.32.7/drivers/acpi/bat mode_t mode; const char *name; } acpi_battery_file[] = { -diff -urNp linux-2.6.32.7/drivers/acpi/blacklist.c linux-2.6.32.7/drivers/acpi/blacklist.c ---- linux-2.6.32.7/drivers/acpi/blacklist.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/blacklist.c 2010-01-25 17:39:40.369403392 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/blacklist.c linux-2.6.32.9/drivers/acpi/blacklist.c +--- linux-2.6.32.9/drivers/acpi/blacklist.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/blacklist.c 2010-02-23 17:09:53.140103788 -0500 @@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -17868,9 +18332,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/blacklist.c linux-2.6.32.7/drivers/acpi/b }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.32.7/drivers/acpi/dock.c linux-2.6.32.7/drivers/acpi/dock.c ---- linux-2.6.32.7/drivers/acpi/dock.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/dock.c 2010-01-25 17:39:40.369403392 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/dock.c linux-2.6.32.9/drivers/acpi/dock.c +--- linux-2.6.32.9/drivers/acpi/dock.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/dock.c 2010-02-23 17:09:53.140103788 -0500 @@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; @@ -17889,9 +18353,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/dock.c linux-2.6.32.7/drivers/acpi/dock.c void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.32.7/drivers/acpi/osl.c linux-2.6.32.7/drivers/acpi/osl.c ---- linux-2.6.32.7/drivers/acpi/osl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/osl.c 2010-01-25 17:39:40.369403392 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/osl.c linux-2.6.32.9/drivers/acpi/osl.c +--- linux-2.6.32.9/drivers/acpi/osl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/osl.c 2010-02-23 17:09:53.140103788 -0500 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -17910,9 +18374,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/osl.c linux-2.6.32.7/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.32.7/drivers/acpi/processor_core.c linux-2.6.32.7/drivers/acpi/processor_core.c ---- linux-2.6.32.7/drivers/acpi/processor_core.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/processor_core.c 2010-01-25 17:39:40.370403762 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/processor_core.c linux-2.6.32.9/drivers/acpi/processor_core.c +--- linux-2.6.32.9/drivers/acpi/processor_core.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/processor_core.c 2010-02-23 17:09:53.140103788 -0500 @@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -17922,21 +18386,21 @@ diff -urNp linux-2.6.32.7/drivers/acpi/processor_core.c linux-2.6.32.7/drivers/a /* * Buggy BIOS check -diff -urNp linux-2.6.32.7/drivers/acpi/processor_idle.c linux-2.6.32.7/drivers/acpi/processor_idle.c ---- linux-2.6.32.7/drivers/acpi/processor_idle.c 2010-01-25 20:04:14.673608010 -0500 -+++ linux-2.6.32.7/drivers/acpi/processor_idle.c 2010-01-25 20:04:24.410241670 -0500 -@@ -110,7 +110,7 @@ static struct dmi_system_id __cpuinitdat - DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, - (void *)2}, +diff -urNp linux-2.6.32.9/drivers/acpi/processor_idle.c linux-2.6.32.9/drivers/acpi/processor_idle.c +--- linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-02-23 17:04:11.889592859 -0500 ++++ linux-2.6.32.9/drivers/acpi/processor_idle.c 2010-02-23 17:26:35.520309994 -0500 +@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, + (void *)1}, - {}, + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, }; -diff -urNp linux-2.6.32.7/drivers/acpi/sleep.c linux-2.6.32.7/drivers/acpi/sleep.c ---- linux-2.6.32.7/drivers/acpi/sleep.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/sleep.c 2010-01-25 17:39:40.370403762 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/sleep.c linux-2.6.32.9/drivers/acpi/sleep.c +--- linux-2.6.32.9/drivers/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/sleep.c 2010-02-23 17:09:53.140103788 -0500 @@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp } } @@ -17973,9 +18437,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/sleep.c linux-2.6.32.7/drivers/acpi/sleep .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.32.7/drivers/acpi/video.c linux-2.6.32.7/drivers/acpi/video.c ---- linux-2.6.32.7/drivers/acpi/video.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/acpi/video.c 2010-01-25 17:39:40.370403762 -0500 +diff -urNp linux-2.6.32.9/drivers/acpi/video.c linux-2.6.32.9/drivers/acpi/video.c +--- linux-2.6.32.9/drivers/acpi/video.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/acpi/video.c 2010-02-23 17:09:53.144538224 -0500 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -17985,9 +18449,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/video.c linux-2.6.32.7/drivers/acpi/video .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.32.7/drivers/ata/ahci.c linux-2.6.32.7/drivers/ata/ahci.c ---- linux-2.6.32.7/drivers/ata/ahci.c 2010-01-25 20:04:14.695465465 -0500 -+++ linux-2.6.32.7/drivers/ata/ahci.c 2010-01-25 20:04:24.420267700 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/ahci.c linux-2.6.32.9/drivers/ata/ahci.c +--- linux-2.6.32.9/drivers/ata/ahci.c 2010-02-23 17:04:11.996660027 -0500 ++++ linux-2.6.32.9/drivers/ata/ahci.c 2010-02-23 17:09:53.144538224 -0500 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -18027,9 +18491,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ahci.c linux-2.6.32.7/drivers/ata/ahci.c }; -diff -urNp linux-2.6.32.7/drivers/ata/ata_generic.c linux-2.6.32.7/drivers/ata/ata_generic.c ---- linux-2.6.32.7/drivers/ata/ata_generic.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/ata_generic.c 2010-01-25 17:39:40.401404478 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/ata_generic.c linux-2.6.32.9/drivers/ata/ata_generic.c +--- linux-2.6.32.9/drivers/ata/ata_generic.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/ata_generic.c 2010-02-23 17:09:53.144538224 -0500 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -18039,9 +18503,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ata_generic.c linux-2.6.32.7/drivers/ata/a .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.32.7/drivers/ata/ata_piix.c linux-2.6.32.7/drivers/ata/ata_piix.c ---- linux-2.6.32.7/drivers/ata/ata_piix.c 2010-01-25 20:04:14.711342317 -0500 -+++ linux-2.6.32.7/drivers/ata/ata_piix.c 2010-01-25 20:04:24.421172039 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/ata_piix.c linux-2.6.32.9/drivers/ata/ata_piix.c +--- linux-2.6.32.9/drivers/ata/ata_piix.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/ata_piix.c 2010-02-23 17:09:53.144538224 -0500 @@ -291,7 +291,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (PCH) */ @@ -18105,9 +18569,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ata_piix.c linux-2.6.32.7/drivers/ata/ata_ }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.32.7/drivers/ata/libata-acpi.c linux-2.6.32.7/drivers/ata/libata-acpi.c ---- linux-2.6.32.7/drivers/ata/libata-acpi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/libata-acpi.c 2010-01-25 17:39:40.402416755 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/libata-acpi.c linux-2.6.32.9/drivers/ata/libata-acpi.c +--- linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/libata-acpi.c 2010-02-23 17:09:53.144538224 -0500 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -18123,9 +18587,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-acpi.c linux-2.6.32.7/drivers/ata/l .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/libata-core.c ---- linux-2.6.32.7/drivers/ata/libata-core.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/libata-core.c 2010-01-25 17:39:40.404236169 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/libata-core.c linux-2.6.32.9/drivers/ata/libata-core.c +--- linux-2.6.32.9/drivers/ata/libata-core.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/libata-core.c 2010-02-23 17:09:53.144538224 -0500 @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, @@ -18144,7 +18608,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l }; #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4361,7 +4361,7 @@ static const struct ata_blacklist_entry +@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, /* End Marker */ @@ -18153,7 +18617,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -@@ -5937,7 +5937,7 @@ static void ata_host_stop(struct device +@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device * LOCKING: * None. */ @@ -18162,7 +18626,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; -@@ -5949,6 +5949,7 @@ static void ata_finalize_port_ops(struct +@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct return; spin_lock(&lock); @@ -18170,7 +18634,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5962,8 +5963,9 @@ static void ata_finalize_port_ops(struct +@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct if (IS_ERR(*pp)) *pp = NULL; @@ -18181,7 +18645,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l spin_unlock(&lock); } -@@ -6060,7 +6062,7 @@ int ata_host_start(struct ata_host *host +@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host */ /* KILLME - the only user left is ipr */ void ata_host_init(struct ata_host *host, struct device *dev, @@ -18190,7 +18654,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l { spin_lock_init(&host->lock); host->dev = dev; -@@ -6723,7 +6725,7 @@ static void ata_dummy_error_handler(stru +@@ -6747,7 +6749,7 @@ static void ata_dummy_error_handler(stru /* truly dummy */ } @@ -18199,10 +18663,10 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.32.7/drivers/ata/libata-eh.c linux-2.6.32.7/drivers/ata/libata-eh.c ---- linux-2.6.32.7/drivers/ata/libata-eh.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/libata-eh.c 2010-01-25 17:39:40.405295177 -0500 -@@ -3580,7 +3580,7 @@ void ata_do_eh(struct ata_port *ap, ata_ +diff -urNp linux-2.6.32.9/drivers/ata/libata-eh.c linux-2.6.32.9/drivers/ata/libata-eh.c +--- linux-2.6.32.9/drivers/ata/libata-eh.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/libata-eh.c 2010-02-23 17:09:53.148068131 -0500 +@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) { @@ -18211,9 +18675,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-eh.c linux-2.6.32.7/drivers/ata/lib ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.32.7/drivers/ata/libata-pmp.c linux-2.6.32.7/drivers/ata/libata-pmp.c ---- linux-2.6.32.7/drivers/ata/libata-pmp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/libata-pmp.c 2010-01-25 17:39:40.405295177 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/libata-pmp.c linux-2.6.32.9/drivers/ata/libata-pmp.c +--- linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/libata-pmp.c 2010-02-23 17:09:53.148068131 -0500 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) @@ -18223,9 +18687,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-pmp.c linux-2.6.32.7/drivers/ata/li 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.7/drivers/ata/pata_acpi.c linux-2.6.32.7/drivers/ata/pata_acpi.c ---- linux-2.6.32.7/drivers/ata/pata_acpi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_acpi.c 2010-01-25 17:39:40.406413096 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_acpi.c linux-2.6.32.9/drivers/ata/pata_acpi.c +--- linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_acpi.c 2010-02-23 17:09:53.148068131 -0500 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -18235,9 +18699,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_acpi.c linux-2.6.32.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.32.7/drivers/ata/pata_ali.c linux-2.6.32.7/drivers/ata/pata_ali.c ---- linux-2.6.32.7/drivers/ata/pata_ali.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_ali.c 2010-01-25 17:39:40.406413096 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_ali.c linux-2.6.32.9/drivers/ata/pata_ali.c +--- linux-2.6.32.9/drivers/ata/pata_ali.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_ali.c 2010-02-23 17:09:53.148068131 -0500 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -18283,9 +18747,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ali.c linux-2.6.32.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/pata_amd.c linux-2.6.32.7/drivers/ata/pata_amd.c ---- linux-2.6.32.7/drivers/ata/pata_amd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_amd.c 2010-01-25 17:39:40.406413096 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_amd.c linux-2.6.32.9/drivers/ata/pata_amd.c +--- linux-2.6.32.9/drivers/ata/pata_amd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_amd.c 2010-02-23 17:09:53.148068131 -0500 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -18335,9 +18799,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_amd.c linux-2.6.32.7/drivers/ata/pata .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_artop.c linux-2.6.32.7/drivers/ata/pata_artop.c ---- linux-2.6.32.7/drivers/ata/pata_artop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_artop.c 2010-01-25 17:39:40.407117574 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_artop.c linux-2.6.32.9/drivers/ata/pata_artop.c +--- linux-2.6.32.9/drivers/ata/pata_artop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_artop.c 2010-02-23 17:09:53.148068131 -0500 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -18356,9 +18820,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_artop.c linux-2.6.32.7/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_at32.c linux-2.6.32.7/drivers/ata/pata_at32.c ---- linux-2.6.32.7/drivers/ata/pata_at32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_at32.c 2010-01-25 17:39:40.407117574 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_at32.c linux-2.6.32.9/drivers/ata/pata_at32.c +--- linux-2.6.32.9/drivers/ata/pata_at32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_at32.c 2010-02-23 17:09:53.148068131 -0500 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -18368,9 +18832,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_at32.c linux-2.6.32.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_at91.c linux-2.6.32.7/drivers/ata/pata_at91.c ---- linux-2.6.32.7/drivers/ata/pata_at91.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_at91.c 2010-01-25 17:39:40.407117574 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_at91.c linux-2.6.32.9/drivers/ata/pata_at91.c +--- linux-2.6.32.9/drivers/ata/pata_at91.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_at91.c 2010-02-23 17:09:53.148068131 -0500 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -18380,9 +18844,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_at91.c linux-2.6.32.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.32.7/drivers/ata/pata_atiixp.c linux-2.6.32.7/drivers/ata/pata_atiixp.c ---- linux-2.6.32.7/drivers/ata/pata_atiixp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_atiixp.c 2010-01-25 17:39:40.407117574 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_atiixp.c linux-2.6.32.9/drivers/ata/pata_atiixp.c +--- linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_atiixp.c 2010-02-23 17:09:53.148068131 -0500 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18392,9 +18856,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_atiixp.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.7/drivers/ata/pata_atp867x.c linux-2.6.32.7/drivers/ata/pata_atp867x.c ---- linux-2.6.32.7/drivers/ata/pata_atp867x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_atp867x.c 2010-01-25 17:39:40.407117574 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_atp867x.c linux-2.6.32.9/drivers/ata/pata_atp867x.c +--- linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_atp867x.c 2010-02-23 17:09:53.148068131 -0500 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x ATA_BMDMA_SHT(DRV_NAME), }; @@ -18404,9 +18868,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_atp867x.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = atp867x_cable_detect, .set_piomode = atp867x_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_bf54x.c linux-2.6.32.7/drivers/ata/pata_bf54x.c ---- linux-2.6.32.7/drivers/ata/pata_bf54x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_bf54x.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_bf54x.c linux-2.6.32.9/drivers/ata/pata_bf54x.c +--- linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_bf54x.c 2010-02-23 17:09:53.148068131 -0500 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -18416,9 +18880,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_bf54x.c linux-2.6.32.7/drivers/ata/pa .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd640.c linux-2.6.32.7/drivers/ata/pata_cmd640.c ---- linux-2.6.32.7/drivers/ata/pata_cmd640.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cmd640.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd640.c linux-2.6.32.9/drivers/ata/pata_cmd640.c +--- linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cmd640.c 2010-02-23 17:09:53.148068131 -0500 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18428,9 +18892,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd640.c linux-2.6.32.7/drivers/ata/p .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.7/drivers/ata/pata_cmd64x.c linux-2.6.32.7/drivers/ata/pata_cmd64x.c ---- linux-2.6.32.7/drivers/ata/pata_cmd64x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cmd64x.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cmd64x.c linux-2.6.32.9/drivers/ata/pata_cmd64x.c +--- linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cmd64x.c 2010-02-23 17:09:53.148068131 -0500 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -18453,9 +18917,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd64x.c linux-2.6.32.7/drivers/ata/p .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5520.c linux-2.6.32.7/drivers/ata/pata_cs5520.c ---- linux-2.6.32.7/drivers/ata/pata_cs5520.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cs5520.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5520.c linux-2.6.32.9/drivers/ata/pata_cs5520.c +--- linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cs5520.c 2010-02-23 17:09:53.148068131 -0500 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18465,9 +18929,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5520.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5530.c linux-2.6.32.7/drivers/ata/pata_cs5530.c ---- linux-2.6.32.7/drivers/ata/pata_cs5530.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cs5530.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5530.c linux-2.6.32.9/drivers/ata/pata_cs5530.c +--- linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cs5530.c 2010-02-23 17:09:53.148068131 -0500 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18477,9 +18941,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5530.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5535.c linux-2.6.32.7/drivers/ata/pata_cs5535.c ---- linux-2.6.32.7/drivers/ata/pata_cs5535.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cs5535.c 2010-01-25 17:39:40.408115294 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5535.c linux-2.6.32.9/drivers/ata/pata_cs5535.c +--- linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cs5535.c 2010-02-23 17:09:53.148068131 -0500 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18489,9 +18953,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5535.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5536.c linux-2.6.32.7/drivers/ata/pata_cs5536.c ---- linux-2.6.32.7/drivers/ata/pata_cs5536.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cs5536.c 2010-01-25 17:39:40.418336500 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cs5536.c linux-2.6.32.9/drivers/ata/pata_cs5536.c +--- linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cs5536.c 2010-02-23 17:09:53.148068131 -0500 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18501,9 +18965,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5536.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_cypress.c linux-2.6.32.7/drivers/ata/pata_cypress.c ---- linux-2.6.32.7/drivers/ata/pata_cypress.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_cypress.c 2010-01-25 17:39:40.418336500 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_cypress.c linux-2.6.32.9/drivers/ata/pata_cypress.c +--- linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_cypress.c 2010-02-23 17:09:53.148068131 -0500 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -18513,9 +18977,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cypress.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_efar.c linux-2.6.32.7/drivers/ata/pata_efar.c ---- linux-2.6.32.7/drivers/ata/pata_efar.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_efar.c 2010-01-25 17:39:40.418336500 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_efar.c linux-2.6.32.9/drivers/ata/pata_efar.c +--- linux-2.6.32.9/drivers/ata/pata_efar.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_efar.c 2010-02-23 17:09:53.148068131 -0500 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -18525,9 +18989,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_efar.c linux-2.6.32.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt366.c linux-2.6.32.7/drivers/ata/pata_hpt366.c ---- linux-2.6.32.7/drivers/ata/pata_hpt366.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_hpt366.c 2010-01-25 17:39:40.418336500 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt366.c linux-2.6.32.9/drivers/ata/pata_hpt366.c +--- linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_hpt366.c 2010-02-23 17:09:53.148068131 -0500 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -18537,9 +19001,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt366.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt37x.c linux-2.6.32.7/drivers/ata/pata_hpt37x.c ---- linux-2.6.32.7/drivers/ata/pata_hpt37x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_hpt37x.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt37x.c linux-2.6.32.9/drivers/ata/pata_hpt37x.c +--- linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_hpt37x.c 2010-02-23 17:09:53.148068131 -0500 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -18576,9 +19040,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt37x.c linux-2.6.32.7/drivers/ata/p .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_hpt3x2n.c 2010-02-23 17:09:53.148068131 -0500 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -18588,9 +19052,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x3.c linux-2.6.32.7/drivers/ata/pata_hpt3x3.c ---- linux-2.6.32.7/drivers/ata/pata_hpt3x3.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_hpt3x3.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_hpt3x3.c linux-2.6.32.9/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_hpt3x3.c 2010-02-23 17:09:53.148068131 -0500 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18600,9 +19064,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x3.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_icside.c linux-2.6.32.7/drivers/ata/pata_icside.c ---- linux-2.6.32.7/drivers/ata/pata_icside.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_icside.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_icside.c linux-2.6.32.9/drivers/ata/pata_icside.c +--- linux-2.6.32.9/drivers/ata/pata_icside.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_icside.c 2010-02-23 17:09:53.148068131 -0500 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -18612,9 +19076,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_icside.c linux-2.6.32.7/drivers/ata/p .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.7/drivers/ata/pata_isapnp.c linux-2.6.32.7/drivers/ata/pata_isapnp.c ---- linux-2.6.32.7/drivers/ata/pata_isapnp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_isapnp.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_isapnp.c linux-2.6.32.9/drivers/ata/pata_isapnp.c +--- linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_isapnp.c 2010-02-23 17:09:53.152210910 -0500 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -18630,9 +19094,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_isapnp.c linux-2.6.32.7/drivers/ata/p .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.7/drivers/ata/pata_it8213.c linux-2.6.32.7/drivers/ata/pata_it8213.c ---- linux-2.6.32.7/drivers/ata/pata_it8213.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_it8213.c 2010-01-25 17:39:40.419217923 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_it8213.c linux-2.6.32.9/drivers/ata/pata_it8213.c +--- linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_it8213.c 2010-02-23 17:09:53.152210910 -0500 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -18642,9 +19106,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_it8213.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_it821x.c linux-2.6.32.7/drivers/ata/pata_it821x.c ---- linux-2.6.32.7/drivers/ata/pata_it821x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_it821x.c 2010-01-25 17:39:40.420372432 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_it821x.c linux-2.6.32.9/drivers/ata/pata_it821x.c +--- linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_it821x.c 2010-02-23 17:09:53.152210910 -0500 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18672,9 +19136,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_it821x.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c 2010-01-25 17:39:40.420372432 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_ixp4xx_cf.c 2010-02-23 17:09:53.152210910 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -18684,9 +19148,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.7/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_jmicron.c linux-2.6.32.7/drivers/ata/pata_jmicron.c ---- linux-2.6.32.7/drivers/ata/pata_jmicron.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_jmicron.c 2010-01-25 17:39:40.420372432 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_jmicron.c linux-2.6.32.9/drivers/ata/pata_jmicron.c +--- linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_jmicron.c 2010-02-23 17:09:53.152210910 -0500 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -18696,9 +19160,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_jmicron.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_legacy.c linux-2.6.32.7/drivers/ata/pata_legacy.c ---- linux-2.6.32.7/drivers/ata/pata_legacy.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_legacy.c 2010-01-25 17:39:40.420372432 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_legacy.c linux-2.6.32.9/drivers/ata/pata_legacy.c +--- linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_legacy.c 2010-02-23 17:09:53.152210910 -0500 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -18810,9 +19274,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_legacy.c linux-2.6.32.7/drivers/ata/p struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.32.7/drivers/ata/pata_marvell.c linux-2.6.32.7/drivers/ata/pata_marvell.c ---- linux-2.6.32.7/drivers/ata/pata_marvell.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_marvell.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_marvell.c linux-2.6.32.9/drivers/ata/pata_marvell.c +--- linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_marvell.c 2010-02-23 17:09:53.152210910 -0500 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -18822,9 +19286,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_marvell.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.32.7/drivers/ata/pata_mpc52xx.c linux-2.6.32.7/drivers/ata/pata_mpc52xx.c ---- linux-2.6.32.7/drivers/ata/pata_mpc52xx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_mpc52xx.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_mpc52xx.c linux-2.6.32.9/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_mpc52xx.c 2010-02-23 17:09:53.152210910 -0500 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -18834,9 +19298,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_mpc52xx.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_sff_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_mpiix.c linux-2.6.32.7/drivers/ata/pata_mpiix.c ---- linux-2.6.32.7/drivers/ata/pata_mpiix.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_mpiix.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_mpiix.c linux-2.6.32.9/drivers/ata/pata_mpiix.c +--- linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_mpiix.c 2010-02-23 17:09:53.152210910 -0500 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -18846,9 +19310,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_mpiix.c linux-2.6.32.7/drivers/ata/pa .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_netcell.c linux-2.6.32.7/drivers/ata/pata_netcell.c ---- linux-2.6.32.7/drivers/ata/pata_netcell.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_netcell.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_netcell.c linux-2.6.32.9/drivers/ata/pata_netcell.c +--- linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_netcell.c 2010-02-23 17:09:53.152210910 -0500 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -18858,9 +19322,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_netcell.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.32.7/drivers/ata/pata_ninja32.c linux-2.6.32.7/drivers/ata/pata_ninja32.c ---- linux-2.6.32.7/drivers/ata/pata_ninja32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_ninja32.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_ninja32.c linux-2.6.32.9/drivers/ata/pata_ninja32.c +--- linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_ninja32.c 2010-02-23 17:09:53.152210910 -0500 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -18870,9 +19334,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ninja32.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87410.c linux-2.6.32.7/drivers/ata/pata_ns87410.c ---- linux-2.6.32.7/drivers/ata/pata_ns87410.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_ns87410.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87410.c linux-2.6.32.9/drivers/ata/pata_ns87410.c +--- linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_ns87410.c 2010-02-23 17:09:53.152210910 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -18882,9 +19346,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87410.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87415.c linux-2.6.32.7/drivers/ata/pata_ns87415.c ---- linux-2.6.32.7/drivers/ata/pata_ns87415.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_ns87415.c 2010-01-25 17:39:40.421405149 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_ns87415.c linux-2.6.32.9/drivers/ata/pata_ns87415.c +--- linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_ns87415.c 2010-02-23 17:09:53.152210910 -0500 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -18903,9 +19367,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87415.c linux-2.6.32.7/drivers/ata/ .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.32.7/drivers/ata/pata_octeon_cf.c linux-2.6.32.7/drivers/ata/pata_octeon_cf.c ---- linux-2.6.32.7/drivers/ata/pata_octeon_cf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_octeon_cf.c 2010-01-25 17:39:40.428099593 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_octeon_cf.c linux-2.6.32.9/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_octeon_cf.c 2010-02-23 17:09:53.152210910 -0500 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s return 0; } @@ -18914,9 +19378,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_octeon_cf.c linux-2.6.32.7/drivers/at 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.7/drivers/ata/pata_oldpiix.c linux-2.6.32.7/drivers/ata/pata_oldpiix.c ---- linux-2.6.32.7/drivers/ata/pata_oldpiix.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_oldpiix.c 2010-01-25 17:39:40.428099593 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_oldpiix.c linux-2.6.32.9/drivers/ata/pata_oldpiix.c +--- linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_oldpiix.c 2010-02-23 17:09:53.152210910 -0500 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -18926,9 +19390,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_oldpiix.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_opti.c linux-2.6.32.7/drivers/ata/pata_opti.c ---- linux-2.6.32.7/drivers/ata/pata_opti.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_opti.c 2010-01-25 17:39:40.428099593 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_opti.c linux-2.6.32.9/drivers/ata/pata_opti.c +--- linux-2.6.32.9/drivers/ata/pata_opti.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_opti.c 2010-02-23 17:09:53.152210910 -0500 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -18938,9 +19402,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_opti.c linux-2.6.32.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_optidma.c linux-2.6.32.7/drivers/ata/pata_optidma.c ---- linux-2.6.32.7/drivers/ata/pata_optidma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_optidma.c 2010-01-25 17:39:40.428099593 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_optidma.c linux-2.6.32.9/drivers/ata/pata_optidma.c +--- linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_optidma.c 2010-02-23 17:09:53.152210910 -0500 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -18959,9 +19423,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_optidma.c linux-2.6.32.7/drivers/ata/ .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_palmld.c linux-2.6.32.7/drivers/ata/pata_palmld.c ---- linux-2.6.32.7/drivers/ata/pata_palmld.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_palmld.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_palmld.c linux-2.6.32.9/drivers/ata/pata_palmld.c +--- linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_palmld.c 2010-02-23 17:09:53.152210910 -0500 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -18971,9 +19435,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_palmld.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pata_pcmcia.c linux-2.6.32.7/drivers/ata/pata_pcmcia.c ---- linux-2.6.32.7/drivers/ata/pata_pcmcia.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_pcmcia.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_pcmcia.c linux-2.6.32.9/drivers/ata/pata_pcmcia.c +--- linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_pcmcia.c 2010-02-23 17:09:53.152210910 -0500 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -19000,9 +19464,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pcmcia.c linux-2.6.32.7/drivers/ata/p info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc2027x.c linux-2.6.32.7/drivers/ata/pata_pdc2027x.c ---- linux-2.6.32.7/drivers/ata/pata_pdc2027x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_pdc2027x.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc2027x.c linux-2.6.32.9/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_pdc2027x.c 2010-02-23 17:09:53.152210910 -0500 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -19020,9 +19484,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc2027x.c linux-2.6.32.7/drivers/ata .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_pdc202xx_old.c 2010-02-23 17:09:53.152210910 -0500 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -19041,9 +19505,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.7/drivers .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/pata_platform.c linux-2.6.32.7/drivers/ata/pata_platform.c ---- linux-2.6.32.7/drivers/ata/pata_platform.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_platform.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_platform.c linux-2.6.32.9/drivers/ata/pata_platform.c +--- linux-2.6.32.9/drivers/ata/pata_platform.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_platform.c 2010-02-23 17:09:53.152210910 -0500 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -19053,9 +19517,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_platform.c linux-2.6.32.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.7/drivers/ata/pata_qdi.c linux-2.6.32.7/drivers/ata/pata_qdi.c ---- linux-2.6.32.7/drivers/ata/pata_qdi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_qdi.c 2010-01-25 17:39:40.429145377 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_qdi.c linux-2.6.32.9/drivers/ata/pata_qdi.c +--- linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_qdi.c 2010-02-23 17:09:53.152210910 -0500 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -19074,9 +19538,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_qdi.c linux-2.6.32.7/drivers/ata/pata .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_radisys.c linux-2.6.32.7/drivers/ata/pata_radisys.c ---- linux-2.6.32.7/drivers/ata/pata_radisys.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_radisys.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_radisys.c linux-2.6.32.9/drivers/ata/pata_radisys.c +--- linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_radisys.c 2010-02-23 17:09:53.152210910 -0500 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -19086,9 +19550,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_radisys.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.32.7/drivers/ata/pata_rb532_cf.c linux-2.6.32.7/drivers/ata/pata_rb532_cf.c ---- linux-2.6.32.7/drivers/ata/pata_rb532_cf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_rb532_cf.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_rb532_cf.c linux-2.6.32.9/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_rb532_cf.c 2010-02-23 17:09:53.152210910 -0500 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -19098,9 +19562,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rb532_cf.c linux-2.6.32.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_rdc.c linux-2.6.32.7/drivers/ata/pata_rdc.c ---- linux-2.6.32.7/drivers/ata/pata_rdc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_rdc.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_rdc.c linux-2.6.32.9/drivers/ata/pata_rdc.c +--- linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_rdc.c 2010-02-23 17:09:53.156212249 -0500 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p pci_write_config_byte(dev, 0x48, udma_enable); } @@ -19110,9 +19574,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rdc.c linux-2.6.32.7/drivers/ata/pata .inherits = &ata_bmdma32_port_ops, .cable_detect = rdc_pata_cable_detect, .set_piomode = rdc_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_rz1000.c linux-2.6.32.7/drivers/ata/pata_rz1000.c ---- linux-2.6.32.7/drivers/ata/pata_rz1000.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_rz1000.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_rz1000.c linux-2.6.32.9/drivers/ata/pata_rz1000.c +--- linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_rz1000.c 2010-02-23 17:09:53.156212249 -0500 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -19122,9 +19586,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rz1000.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_sc1200.c linux-2.6.32.7/drivers/ata/pata_sc1200.c ---- linux-2.6.32.7/drivers/ata/pata_sc1200.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_sc1200.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_sc1200.c linux-2.6.32.9/drivers/ata/pata_sc1200.c +--- linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_sc1200.c 2010-02-23 17:09:53.156212249 -0500 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -19134,9 +19598,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sc1200.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.32.7/drivers/ata/pata_scc.c linux-2.6.32.7/drivers/ata/pata_scc.c ---- linux-2.6.32.7/drivers/ata/pata_scc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_scc.c 2010-01-25 17:39:40.430286538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_scc.c linux-2.6.32.9/drivers/ata/pata_scc.c +--- linux-2.6.32.9/drivers/ata/pata_scc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_scc.c 2010-02-23 17:09:53.156212249 -0500 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19146,9 +19610,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_scc.c linux-2.6.32.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_sch.c linux-2.6.32.7/drivers/ata/pata_sch.c ---- linux-2.6.32.7/drivers/ata/pata_sch.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_sch.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_sch.c linux-2.6.32.9/drivers/ata/pata_sch.c +--- linux-2.6.32.9/drivers/ata/pata_sch.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_sch.c 2010-02-23 17:09:53.156212249 -0500 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19158,9 +19622,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sch.c linux-2.6.32.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_serverworks.c linux-2.6.32.7/drivers/ata/pata_serverworks.c ---- linux-2.6.32.7/drivers/ata/pata_serverworks.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_serverworks.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_serverworks.c linux-2.6.32.9/drivers/ata/pata_serverworks.c +--- linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_serverworks.c 2010-02-23 17:09:53.156212249 -0500 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -19179,9 +19643,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_serverworks.c linux-2.6.32.7/drivers/ .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_sil680.c linux-2.6.32.7/drivers/ata/pata_sil680.c ---- linux-2.6.32.7/drivers/ata/pata_sil680.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_sil680.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_sil680.c linux-2.6.32.9/drivers/ata/pata_sil680.c +--- linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_sil680.c 2010-02-23 17:09:53.156212249 -0500 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -19191,9 +19655,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sil680.c linux-2.6.32.7/drivers/ata/p .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_sis.c linux-2.6.32.7/drivers/ata/pata_sis.c ---- linux-2.6.32.7/drivers/ata/pata_sis.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_sis.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_sis.c linux-2.6.32.9/drivers/ata/pata_sis.c +--- linux-2.6.32.9/drivers/ata/pata_sis.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_sis.c 2010-02-23 17:09:53.156212249 -0500 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19249,9 +19713,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sis.c linux-2.6.32.7/drivers/ata/pata .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.32.7/drivers/ata/pata_sl82c105.c linux-2.6.32.7/drivers/ata/pata_sl82c105.c ---- linux-2.6.32.7/drivers/ata/pata_sl82c105.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_sl82c105.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_sl82c105.c linux-2.6.32.9/drivers/ata/pata_sl82c105.c +--- linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_sl82c105.c 2010-02-23 17:09:53.156212249 -0500 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -19261,9 +19725,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sl82c105.c linux-2.6.32.7/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.32.7/drivers/ata/pata_triflex.c linux-2.6.32.7/drivers/ata/pata_triflex.c ---- linux-2.6.32.7/drivers/ata/pata_triflex.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_triflex.c 2010-01-25 17:39:40.431405680 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_triflex.c linux-2.6.32.9/drivers/ata/pata_triflex.c +--- linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_triflex.c 2010-02-23 17:09:53.156212249 -0500 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -19273,9 +19737,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_triflex.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.32.7/drivers/ata/pata_via.c linux-2.6.32.7/drivers/ata/pata_via.c ---- linux-2.6.32.7/drivers/ata/pata_via.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_via.c 2010-01-25 17:39:40.432411110 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_via.c linux-2.6.32.9/drivers/ata/pata_via.c +--- linux-2.6.32.9/drivers/ata/pata_via.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_via.c 2010-02-23 17:09:53.156212249 -0500 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19294,9 +19758,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_via.c linux-2.6.32.7/drivers/ata/pata .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.32.7/drivers/ata/pata_winbond.c linux-2.6.32.7/drivers/ata/pata_winbond.c ---- linux-2.6.32.7/drivers/ata/pata_winbond.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pata_winbond.c 2010-01-25 17:39:40.432411110 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pata_winbond.c linux-2.6.32.9/drivers/ata/pata_winbond.c +--- linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pata_winbond.c 2010-02-23 17:09:53.156212249 -0500 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -19306,9 +19770,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_winbond.c linux-2.6.32.7/drivers/ata/ .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.32.7/drivers/ata/pdc_adma.c linux-2.6.32.7/drivers/ata/pdc_adma.c ---- linux-2.6.32.7/drivers/ata/pdc_adma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/pdc_adma.c 2010-01-25 17:39:40.432411110 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/pdc_adma.c linux-2.6.32.9/drivers/ata/pdc_adma.c +--- linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/pdc_adma.c 2010-02-23 17:09:53.156212249 -0500 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -19318,9 +19782,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pdc_adma.c linux-2.6.32.7/drivers/ata/pdc_ .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.32.7/drivers/ata/sata_fsl.c linux-2.6.32.7/drivers/ata/sata_fsl.c ---- linux-2.6.32.7/drivers/ata/sata_fsl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_fsl.c 2010-01-25 17:39:40.433405395 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_fsl.c linux-2.6.32.9/drivers/ata/sata_fsl.c +--- linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_fsl.c 2010-02-23 17:09:53.156212249 -0500 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -19330,9 +19794,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_fsl.c linux-2.6.32.7/drivers/ata/sata .inherits = &sata_pmp_port_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.7/drivers/ata/sata_inic162x.c linux-2.6.32.7/drivers/ata/sata_inic162x.c ---- linux-2.6.32.7/drivers/ata/sata_inic162x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_inic162x.c 2010-01-25 17:39:40.433405395 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_inic162x.c linux-2.6.32.9/drivers/ata/sata_inic162x.c +--- linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_inic162x.c 2010-02-23 17:09:53.156212249 -0500 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -19342,9 +19806,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_inic162x.c linux-2.6.32.7/drivers/ata .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/sata_mv.c linux-2.6.32.7/drivers/ata/sata_mv.c ---- linux-2.6.32.7/drivers/ata/sata_mv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_mv.c 2010-01-25 17:39:40.435100268 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_mv.c linux-2.6.32.9/drivers/ata/sata_mv.c +--- linux-2.6.32.9/drivers/ata/sata_mv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_mv.c 2010-02-23 17:09:53.156212249 -0500 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -19372,9 +19836,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_mv.c linux-2.6.32.7/drivers/ata/sata_ .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.32.7/drivers/ata/sata_nv.c linux-2.6.32.7/drivers/ata/sata_nv.c ---- linux-2.6.32.7/drivers/ata/sata_nv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_nv.c 2010-01-25 17:39:40.435100268 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_nv.c linux-2.6.32.9/drivers/ata/sata_nv.c +--- linux-2.6.32.9/drivers/ata/sata_nv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_nv.c 2010-02-23 17:09:53.156212249 -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. @@ -19417,9 +19881,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_nv.c linux-2.6.32.7/drivers/ata/sata_ .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.32.7/drivers/ata/sata_promise.c linux-2.6.32.7/drivers/ata/sata_promise.c ---- linux-2.6.32.7/drivers/ata/sata_promise.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_promise.c 2010-01-25 17:39:40.435100268 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_promise.c linux-2.6.32.9/drivers/ata/sata_promise.c +--- linux-2.6.32.9/drivers/ata/sata_promise.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_promise.c 2010-02-23 17:09:53.156212249 -0500 @@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -19446,9 +19910,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_promise.c linux-2.6.32.7/drivers/ata/ .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.32.7/drivers/ata/sata_qstor.c linux-2.6.32.7/drivers/ata/sata_qstor.c ---- linux-2.6.32.7/drivers/ata/sata_qstor.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_qstor.c 2010-01-25 17:39:40.436104915 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_qstor.c linux-2.6.32.9/drivers/ata/sata_qstor.c +--- linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_qstor.c 2010-02-23 17:09:53.156212249 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -19458,9 +19922,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_qstor.c linux-2.6.32.7/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/sata_sil24.c linux-2.6.32.7/drivers/ata/sata_sil24.c ---- linux-2.6.32.7/drivers/ata/sata_sil24.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_sil24.c 2010-01-25 17:39:40.436104915 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_sil24.c linux-2.6.32.9/drivers/ata/sata_sil24.c +--- linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_sil24.c 2010-02-23 17:09:53.160339709 -0500 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -19470,9 +19934,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sil24.c linux-2.6.32.7/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.32.7/drivers/ata/sata_sil.c linux-2.6.32.7/drivers/ata/sata_sil.c ---- linux-2.6.32.7/drivers/ata/sata_sil.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_sil.c 2010-01-25 17:39:40.436104915 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_sil.c linux-2.6.32.9/drivers/ata/sata_sil.c +--- linux-2.6.32.9/drivers/ata/sata_sil.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_sil.c 2010-02-23 17:09:53.160339709 -0500 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht .sg_tablesize = ATA_MAX_PRD }; @@ -19482,9 +19946,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sil.c linux-2.6.32.7/drivers/ata/sata .inherits = &ata_bmdma32_port_ops, .dev_config = sil_dev_config, .set_mode = sil_set_mode, -diff -urNp linux-2.6.32.7/drivers/ata/sata_sis.c linux-2.6.32.7/drivers/ata/sata_sis.c ---- linux-2.6.32.7/drivers/ata/sata_sis.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_sis.c 2010-01-25 17:39:40.437100238 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_sis.c linux-2.6.32.9/drivers/ata/sata_sis.c +--- linux-2.6.32.9/drivers/ata/sata_sis.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_sis.c 2010-02-23 17:09:53.160339709 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19494,9 +19958,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sis.c linux-2.6.32.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.32.7/drivers/ata/sata_svw.c linux-2.6.32.7/drivers/ata/sata_svw.c ---- linux-2.6.32.7/drivers/ata/sata_svw.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_svw.c 2010-01-25 17:39:40.447720538 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_svw.c linux-2.6.32.9/drivers/ata/sata_svw.c +--- linux-2.6.32.9/drivers/ata/sata_svw.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_svw.c 2010-02-23 17:09:53.160339709 -0500 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -19506,9 +19970,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_svw.c linux-2.6.32.7/drivers/ata/sata .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.7/drivers/ata/sata_sx4.c linux-2.6.32.7/drivers/ata/sata_sx4.c ---- linux-2.6.32.7/drivers/ata/sata_sx4.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_sx4.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_sx4.c linux-2.6.32.9/drivers/ata/sata_sx4.c +--- linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_sx4.c 2010-02-23 17:09:53.160339709 -0500 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -19518,9 +19982,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sx4.c linux-2.6.32.7/drivers/ata/sata .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.32.7/drivers/ata/sata_uli.c linux-2.6.32.7/drivers/ata/sata_uli.c ---- linux-2.6.32.7/drivers/ata/sata_uli.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_uli.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_uli.c linux-2.6.32.9/drivers/ata/sata_uli.c +--- linux-2.6.32.9/drivers/ata/sata_uli.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_uli.c 2010-02-23 17:09:53.160339709 -0500 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19530,9 +19994,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_uli.c linux-2.6.32.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.32.7/drivers/ata/sata_via.c linux-2.6.32.7/drivers/ata/sata_via.c ---- linux-2.6.32.7/drivers/ata/sata_via.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_via.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_via.c linux-2.6.32.9/drivers/ata/sata_via.c +--- linux-2.6.32.9/drivers/ata/sata_via.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_via.c 2010-02-23 17:09:53.160339709 -0500 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -19570,9 +20034,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_via.c linux-2.6.32.7/drivers/ata/sata .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.32.7/drivers/ata/sata_vsc.c linux-2.6.32.7/drivers/ata/sata_vsc.c ---- linux-2.6.32.7/drivers/ata/sata_vsc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ata/sata_vsc.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/ata/sata_vsc.c linux-2.6.32.9/drivers/ata/sata_vsc.c +--- linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ata/sata_vsc.c 2010-02-23 17:09:53.160339709 -0500 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -19582,9 +20046,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_vsc.c linux-2.6.32.7/drivers/ata/sata .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.7/drivers/atm/adummy.c linux-2.6.32.7/drivers/atm/adummy.c ---- linux-2.6.32.7/drivers/atm/adummy.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/adummy.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/adummy.c linux-2.6.32.9/drivers/atm/adummy.c +--- linux-2.6.32.9/drivers/atm/adummy.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/adummy.c 2010-02-23 17:09:53.160339709 -0500 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -19594,9 +20058,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/adummy.c linux-2.6.32.7/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.32.7/drivers/atm/ambassador.c linux-2.6.32.7/drivers/atm/ambassador.c ---- linux-2.6.32.7/drivers/atm/ambassador.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/ambassador.c 2010-01-25 17:39:40.448144804 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/ambassador.c linux-2.6.32.9/drivers/atm/ambassador.c +--- linux-2.6.32.9/drivers/atm/ambassador.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/ambassador.c 2010-02-23 17:09:53.160339709 -0500 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -19633,9 +20097,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/ambassador.c linux-2.6.32.7/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.32.7/drivers/atm/atmtcp.c linux-2.6.32.7/drivers/atm/atmtcp.c ---- linux-2.6.32.7/drivers/atm/atmtcp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/atmtcp.c 2010-01-25 17:39:40.449405902 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/atmtcp.c linux-2.6.32.9/drivers/atm/atmtcp.c +--- linux-2.6.32.9/drivers/atm/atmtcp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/atmtcp.c 2010-02-23 17:09:53.160339709 -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); @@ -19685,9 +20149,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/atmtcp.c linux-2.6.32.7/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.32.7/drivers/atm/eni.c linux-2.6.32.7/drivers/atm/eni.c ---- linux-2.6.32.7/drivers/atm/eni.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/eni.c 2010-01-25 17:39:40.449405902 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/eni.c linux-2.6.32.9/drivers/atm/eni.c +--- linux-2.6.32.9/drivers/atm/eni.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/eni.c 2010-02-23 17:09:53.160339709 -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); @@ -19733,9 +20197,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/eni.c linux-2.6.32.7/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.32.7/drivers/atm/firestream.c linux-2.6.32.7/drivers/atm/firestream.c ---- linux-2.6.32.7/drivers/atm/firestream.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/firestream.c 2010-01-25 17:39:40.450123608 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/firestream.c linux-2.6.32.9/drivers/atm/firestream.c +--- linux-2.6.32.9/drivers/atm/firestream.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/firestream.c 2010-02-23 17:09:53.160339709 -0500 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -19769,9 +20233,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/firestream.c linux-2.6.32.7/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.32.7/drivers/atm/fore200e.c linux-2.6.32.7/drivers/atm/fore200e.c ---- linux-2.6.32.7/drivers/atm/fore200e.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/fore200e.c 2010-01-25 17:39:40.450123608 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/fore200e.c linux-2.6.32.9/drivers/atm/fore200e.c +--- linux-2.6.32.9/drivers/atm/fore200e.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/fore200e.c 2010-02-23 17:09:53.160339709 -0500 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -19828,9 +20292,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/fore200e.c linux-2.6.32.7/drivers/atm/fore fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.32.7/drivers/atm/he.c linux-2.6.32.7/drivers/atm/he.c ---- linux-2.6.32.7/drivers/atm/he.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/he.c 2010-01-25 17:39:40.451121328 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/he.c linux-2.6.32.9/drivers/atm/he.c +--- linux-2.6.32.9/drivers/atm/he.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/he.c 2010-02-23 17:09:53.164177137 -0500 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -19912,9 +20376,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/he.c linux-2.6.32.7/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.32.7/drivers/atm/horizon.c linux-2.6.32.7/drivers/atm/horizon.c ---- linux-2.6.32.7/drivers/atm/horizon.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/horizon.c 2010-01-25 17:39:40.451121328 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/horizon.c linux-2.6.32.9/drivers/atm/horizon.c +--- linux-2.6.32.9/drivers/atm/horizon.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/horizon.c 2010-02-23 17:09:53.164177137 -0500 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -19933,9 +20397,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/horizon.c linux-2.6.32.7/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.32.7/drivers/atm/idt77252.c linux-2.6.32.7/drivers/atm/idt77252.c ---- linux-2.6.32.7/drivers/atm/idt77252.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/idt77252.c 2010-01-25 17:39:40.452307812 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/idt77252.c linux-2.6.32.9/drivers/atm/idt77252.c +--- linux-2.6.32.9/drivers/atm/idt77252.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/idt77252.c 2010-02-23 17:09:53.164177137 -0500 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -20090,9 +20554,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/idt77252.c linux-2.6.32.7/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.32.7/drivers/atm/iphase.c linux-2.6.32.7/drivers/atm/iphase.c ---- linux-2.6.32.7/drivers/atm/iphase.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/iphase.c 2010-01-25 17:39:40.453161981 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/iphase.c linux-2.6.32.9/drivers/atm/iphase.c +--- linux-2.6.32.9/drivers/atm/iphase.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/iphase.c 2010-02-23 17:09:53.164177137 -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)) @@ -20189,9 +20653,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/iphase.c linux-2.6.32.7/drivers/atm/iphase 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.7/drivers/atm/lanai.c linux-2.6.32.7/drivers/atm/lanai.c ---- linux-2.6.32.7/drivers/atm/lanai.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/lanai.c 2010-01-25 17:39:40.453161981 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/lanai.c linux-2.6.32.9/drivers/atm/lanai.c +--- linux-2.6.32.9/drivers/atm/lanai.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/lanai.c 2010-02-23 17:09:53.164177137 -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); @@ -20246,9 +20710,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/lanai.c linux-2.6.32.7/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.32.7/drivers/atm/nicstar.c linux-2.6.32.7/drivers/atm/nicstar.c ---- linux-2.6.32.7/drivers/atm/nicstar.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/nicstar.c 2010-01-25 17:39:40.454409580 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/nicstar.c linux-2.6.32.9/drivers/atm/nicstar.c +--- linux-2.6.32.9/drivers/atm/nicstar.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/nicstar.c 2010-02-23 17:09:53.164177137 -0500 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -20451,9 +20915,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/nicstar.c linux-2.6.32.7/drivers/atm/nicst } } -diff -urNp linux-2.6.32.7/drivers/atm/solos-pci.c linux-2.6.32.7/drivers/atm/solos-pci.c ---- linux-2.6.32.7/drivers/atm/solos-pci.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/solos-pci.c 2010-01-25 17:39:40.454409580 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/solos-pci.c linux-2.6.32.9/drivers/atm/solos-pci.c +--- linux-2.6.32.9/drivers/atm/solos-pci.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/solos-pci.c 2010-02-23 17:09:53.164177137 -0500 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -20472,9 +20936,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/solos-pci.c linux-2.6.32.7/drivers/atm/sol solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.32.7/drivers/atm/suni.c linux-2.6.32.7/drivers/atm/suni.c ---- linux-2.6.32.7/drivers/atm/suni.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/suni.c 2010-01-25 17:39:40.455327045 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/suni.c linux-2.6.32.9/drivers/atm/suni.c +--- linux-2.6.32.9/drivers/atm/suni.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/suni.c 2010-02-23 17:09:53.168233068 -0500 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -20486,9 +20950,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/suni.c linux-2.6.32.7/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.32.7/drivers/atm/uPD98402.c linux-2.6.32.7/drivers/atm/uPD98402.c ---- linux-2.6.32.7/drivers/atm/uPD98402.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/uPD98402.c 2010-01-25 17:39:40.455327045 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/uPD98402.c linux-2.6.32.9/drivers/atm/uPD98402.c +--- linux-2.6.32.9/drivers/atm/uPD98402.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/uPD98402.c 2010-02-23 17:09:53.168233068 -0500 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -20533,9 +20997,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/uPD98402.c linux-2.6.32.7/drivers/atm/uPD9 return 0; } -diff -urNp linux-2.6.32.7/drivers/atm/zatm.c linux-2.6.32.7/drivers/atm/zatm.c ---- linux-2.6.32.7/drivers/atm/zatm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/atm/zatm.c 2010-01-25 17:39:40.455327045 -0500 +diff -urNp linux-2.6.32.9/drivers/atm/zatm.c linux-2.6.32.9/drivers/atm/zatm.c +--- linux-2.6.32.9/drivers/atm/zatm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/atm/zatm.c 2010-02-23 17:09:53.168233068 -0500 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -20563,9 +21027,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/zatm.c linux-2.6.32.7/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.32.7/drivers/base/bus.c linux-2.6.32.7/drivers/base/bus.c ---- linux-2.6.32.7/drivers/base/bus.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/base/bus.c 2010-01-25 17:39:40.455327045 -0500 +diff -urNp linux-2.6.32.9/drivers/base/bus.c linux-2.6.32.9/drivers/base/bus.c +--- linux-2.6.32.9/drivers/base/bus.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/base/bus.c 2010-02-23 17:09:53.168233068 -0500 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -20593,11 +21057,11 @@ diff -urNp linux-2.6.32.7/drivers/base/bus.c linux-2.6.32.7/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.32.7/drivers/base/class.c linux-2.6.32.7/drivers/base/class.c ---- linux-2.6.32.7/drivers/base/class.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/base/class.c 2010-01-25 17:39:40.456410893 -0500 -@@ -61,7 +61,7 @@ static void class_release(struct kobject - "be careful\n", class->name); +diff -urNp linux-2.6.32.9/drivers/base/class.c linux-2.6.32.9/drivers/base/class.c +--- linux-2.6.32.9/drivers/base/class.c 2010-02-23 17:04:12.007594284 -0500 ++++ linux-2.6.32.9/drivers/base/class.c 2010-02-23 17:25:23.631619477 -0500 +@@ -63,7 +63,7 @@ static void class_release(struct kobject + kfree(cp); } -static struct sysfs_ops class_sysfs_ops = { @@ -20605,9 +21069,9 @@ diff -urNp linux-2.6.32.7/drivers/base/class.c linux-2.6.32.7/drivers/base/class .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.32.7/drivers/base/core.c linux-2.6.32.7/drivers/base/core.c ---- linux-2.6.32.7/drivers/base/core.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/base/core.c 2010-01-25 17:39:40.456410893 -0500 +diff -urNp linux-2.6.32.9/drivers/base/core.c linux-2.6.32.9/drivers/base/core.c +--- linux-2.6.32.9/drivers/base/core.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/base/core.c 2010-02-23 17:09:53.168233068 -0500 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -20626,9 +21090,9 @@ diff -urNp linux-2.6.32.7/drivers/base/core.c linux-2.6.32.7/drivers/base/core.c .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.32.7/drivers/base/memory.c linux-2.6.32.7/drivers/base/memory.c ---- linux-2.6.32.7/drivers/base/memory.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/base/memory.c 2010-01-25 17:39:40.456410893 -0500 +diff -urNp linux-2.6.32.9/drivers/base/memory.c linux-2.6.32.9/drivers/base/memory.c +--- linux-2.6.32.9/drivers/base/memory.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/base/memory.c 2010-02-23 17:09:53.168233068 -0500 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -20638,9 +21102,9 @@ diff -urNp linux-2.6.32.7/drivers/base/memory.c linux-2.6.32.7/drivers/base/memo .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.32.7/drivers/base/sys.c linux-2.6.32.7/drivers/base/sys.c ---- linux-2.6.32.7/drivers/base/sys.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/base/sys.c 2010-01-25 17:39:40.457295758 -0500 +diff -urNp linux-2.6.32.9/drivers/base/sys.c linux-2.6.32.9/drivers/base/sys.c +--- linux-2.6.32.9/drivers/base/sys.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/base/sys.c 2010-02-23 17:09:53.168233068 -0500 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -20659,9 +21123,9 @@ diff -urNp linux-2.6.32.7/drivers/base/sys.c linux-2.6.32.7/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.32.7/drivers/block/pktcdvd.c linux-2.6.32.7/drivers/block/pktcdvd.c ---- linux-2.6.32.7/drivers/block/pktcdvd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/block/pktcdvd.c 2010-01-25 17:39:40.457295758 -0500 +diff -urNp linux-2.6.32.9/drivers/block/pktcdvd.c linux-2.6.32.9/drivers/block/pktcdvd.c +--- linux-2.6.32.9/drivers/block/pktcdvd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/block/pktcdvd.c 2010-02-23 17:09:53.168233068 -0500 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -20671,9 +21135,9 @@ diff -urNp linux-2.6.32.7/drivers/block/pktcdvd.c linux-2.6.32.7/drivers/block/p .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.32.7/drivers/char/agp/frontend.c linux-2.6.32.7/drivers/char/agp/frontend.c ---- linux-2.6.32.7/drivers/char/agp/frontend.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/agp/frontend.c 2010-01-25 17:39:40.457295758 -0500 +diff -urNp linux-2.6.32.9/drivers/char/agp/frontend.c linux-2.6.32.9/drivers/char/agp/frontend.c +--- linux-2.6.32.9/drivers/char/agp/frontend.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/agp/frontend.c 2010-02-23 17:09:53.168233068 -0500 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -20683,9 +21147,9 @@ diff -urNp linux-2.6.32.7/drivers/char/agp/frontend.c linux-2.6.32.7/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.32.7/drivers/char/agp/intel-agp.c linux-2.6.32.7/drivers/char/agp/intel-agp.c ---- linux-2.6.32.7/drivers/char/agp/intel-agp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/agp/intel-agp.c 2010-01-25 17:39:40.458410929 -0500 +diff -urNp linux-2.6.32.9/drivers/char/agp/intel-agp.c linux-2.6.32.9/drivers/char/agp/intel-agp.c +--- linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/agp/intel-agp.c 2010-02-23 17:09:53.168233068 -0500 @@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), @@ -20695,9 +21159,9 @@ diff -urNp linux-2.6.32.7/drivers/char/agp/intel-agp.c linux-2.6.32.7/drivers/ch }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.32.7/drivers/char/hpet.c linux-2.6.32.7/drivers/char/hpet.c ---- linux-2.6.32.7/drivers/char/hpet.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hpet.c 2010-01-25 17:39:40.458410929 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hpet.c linux-2.6.32.9/drivers/char/hpet.c +--- linux-2.6.32.9/drivers/char/hpet.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hpet.c 2010-02-23 17:09:53.168233068 -0500 @@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -20707,9 +21171,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hpet.c linux-2.6.32.7/drivers/char/hpet.c static int __init hpet_init(void) { -diff -urNp linux-2.6.32.7/drivers/char/hvc_beat.c linux-2.6.32.7/drivers/char/hvc_beat.c ---- linux-2.6.32.7/drivers/char/hvc_beat.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_beat.c 2010-01-25 17:39:40.458410929 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_beat.c linux-2.6.32.9/drivers/char/hvc_beat.c +--- linux-2.6.32.9/drivers/char/hvc_beat.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_beat.c 2010-02-23 17:09:53.168233068 -0500 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -20719,9 +21183,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_beat.c linux-2.6.32.7/drivers/char/hv .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.32.7/drivers/char/hvc_console.c linux-2.6.32.7/drivers/char/hvc_console.c ---- linux-2.6.32.7/drivers/char/hvc_console.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_console.c 2010-01-25 17:39:40.458410929 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_console.c linux-2.6.32.9/drivers/char/hvc_console.c +--- linux-2.6.32.9/drivers/char/hvc_console.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_console.c 2010-02-23 17:09:53.168233068 -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. @@ -20749,9 +21213,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_console.c linux-2.6.32.7/drivers/char { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.32.7/drivers/char/hvc_console.h linux-2.6.32.7/drivers/char/hvc_console.h ---- linux-2.6.32.7/drivers/char/hvc_console.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_console.h 2010-01-25 17:39:40.461409770 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_console.h linux-2.6.32.9/drivers/char/hvc_console.h +--- linux-2.6.32.9/drivers/char/hvc_console.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_console.h 2010-02-23 17:09:53.168233068 -0500 @@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -20775,9 +21239,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_console.h linux-2.6.32.7/drivers/char /* 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.7/drivers/char/hvc_iseries.c linux-2.6.32.7/drivers/char/hvc_iseries.c ---- linux-2.6.32.7/drivers/char/hvc_iseries.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_iseries.c 2010-01-25 17:39:40.461409770 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_iseries.c linux-2.6.32.9/drivers/char/hvc_iseries.c +--- linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_iseries.c 2010-02-23 17:09:53.168233068 -0500 @@ -197,7 +197,7 @@ done: return sent; } @@ -20787,9 +21251,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_iseries.c linux-2.6.32.7/drivers/char .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.7/drivers/char/hvc_iucv.c linux-2.6.32.7/drivers/char/hvc_iucv.c ---- linux-2.6.32.7/drivers/char/hvc_iucv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_iucv.c 2010-01-25 17:39:40.461409770 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_iucv.c linux-2.6.32.9/drivers/char/hvc_iucv.c +--- linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_iucv.c 2010-02-23 17:09:53.172065136 -0500 @@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -20799,9 +21263,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_iucv.c linux-2.6.32.7/drivers/char/hv .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.32.7/drivers/char/hvc_rtas.c linux-2.6.32.7/drivers/char/hvc_rtas.c ---- linux-2.6.32.7/drivers/char/hvc_rtas.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_rtas.c 2010-01-25 17:39:40.461409770 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_rtas.c linux-2.6.32.9/drivers/char/hvc_rtas.c +--- linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_rtas.c 2010-02-23 17:09:53.172065136 -0500 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -20811,9 +21275,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_rtas.c linux-2.6.32.7/drivers/char/hv .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.32.7/drivers/char/hvcs.c linux-2.6.32.7/drivers/char/hvcs.c ---- linux-2.6.32.7/drivers/char/hvcs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvcs.c 2010-01-25 17:39:40.462277205 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvcs.c linux-2.6.32.9/drivers/char/hvcs.c +--- linux-2.6.32.9/drivers/char/hvcs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvcs.c 2010-02-23 17:09:53.172065136 -0500 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -20908,9 +21372,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvcs.c linux-2.6.32.7/drivers/char/hvcs.c return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.32.7/drivers/char/hvc_udbg.c linux-2.6.32.7/drivers/char/hvc_udbg.c ---- linux-2.6.32.7/drivers/char/hvc_udbg.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_udbg.c 2010-01-25 17:39:40.462277205 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_udbg.c linux-2.6.32.9/drivers/char/hvc_udbg.c +--- linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_udbg.c 2010-02-23 17:09:53.172065136 -0500 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -20920,9 +21384,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_udbg.c linux-2.6.32.7/drivers/char/hv .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.32.7/drivers/char/hvc_vio.c linux-2.6.32.7/drivers/char/hvc_vio.c ---- linux-2.6.32.7/drivers/char/hvc_vio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_vio.c 2010-01-25 17:39:40.462277205 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_vio.c linux-2.6.32.9/drivers/char/hvc_vio.c +--- linux-2.6.32.9/drivers/char/hvc_vio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_vio.c 2010-02-23 17:09:53.172065136 -0500 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -20932,9 +21396,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_vio.c linux-2.6.32.7/drivers/char/hvc .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.7/drivers/char/hvc_xen.c linux-2.6.32.7/drivers/char/hvc_xen.c ---- linux-2.6.32.7/drivers/char/hvc_xen.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/hvc_xen.c 2010-01-25 17:39:40.462277205 -0500 +diff -urNp linux-2.6.32.9/drivers/char/hvc_xen.c linux-2.6.32.9/drivers/char/hvc_xen.c +--- linux-2.6.32.9/drivers/char/hvc_xen.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/hvc_xen.c 2010-02-23 17:09:53.172065136 -0500 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -20944,9 +21408,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_xen.c linux-2.6.32.7/drivers/char/hvc .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c 2010-01-25 17:39:40.463416503 -0500 +diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/ipmi/ipmi_msghandler.c 2010-02-23 17:09:53.172065136 -0500 @@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -20977,9 +21441,9 @@ diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.7/dri intf->proc_dir = NULL; -diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c 2010-01-25 17:39:40.463416503 -0500 +diff -urNp linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/ipmi/ipmi_si_intf.c 2010-02-23 17:09:53.172065136 -0500 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -21010,9 +21474,9 @@ diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.7/driver new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.32.7/drivers/char/keyboard.c linux-2.6.32.7/drivers/char/keyboard.c ---- linux-2.6.32.7/drivers/char/keyboard.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/keyboard.c 2010-01-25 17:39:40.464368791 -0500 +diff -urNp linux-2.6.32.9/drivers/char/keyboard.c linux-2.6.32.9/drivers/char/keyboard.c +--- linux-2.6.32.9/drivers/char/keyboard.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/keyboard.c 2010-02-23 17:09:53.172065136 -0500 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -21039,9 +21503,9 @@ diff -urNp linux-2.6.32.7/drivers/char/keyboard.c linux-2.6.32.7/drivers/char/ke }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c ---- linux-2.6.32.7/drivers/char/mem.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/mem.c 2010-01-25 17:39:40.464368791 -0500 +diff -urNp linux-2.6.32.9/drivers/char/mem.c linux-2.6.32.9/drivers/char/mem.c +--- linux-2.6.32.9/drivers/char/mem.c 2010-02-23 17:04:12.039606376 -0500 ++++ linux-2.6.32.9/drivers/char/mem.c 2010-02-23 17:28:21.287708349 -0500 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -21058,10 +21522,10 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c +extern struct file_operations grsec_fops; +#endif + - /* - * Architectures vary in how they handle caching for addresses - * outside of main memory. -@@ -192,6 +197,11 @@ static ssize_t write_mem(struct file * f + static inline unsigned long size_inside_page(unsigned long start, + unsigned long size) + { +@@ -205,6 +210,11 @@ static ssize_t write_mem(struct file * f if (!valid_phys_addr_range(p, count)) return -EFAULT; @@ -21073,7 +21537,7 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c written = 0; #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED -@@ -324,6 +334,11 @@ static int mmap_mem(struct file * file, +@@ -337,6 +347,11 @@ static int mmap_mem(struct file * file, &vma->vm_page_prot)) return -EINVAL; @@ -21085,9 +21549,9 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff, size, vma->vm_page_prot); -@@ -558,6 +573,11 @@ static ssize_t write_kmem(struct file * - ssize_t written; +@@ -560,6 +575,11 @@ static ssize_t write_kmem(struct file * char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ + int err = 0; +#ifdef CONFIG_GRKERNSEC_KMEM + gr_handle_kmem_write(); @@ -21097,7 +21561,7 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c if (p < (unsigned long) high_memory) { wrote = count; -@@ -763,6 +783,16 @@ static loff_t memory_lseek(struct file * +@@ -765,6 +785,16 @@ static loff_t memory_lseek(struct file * static int open_port(struct inode * inode, struct file * filp) { @@ -21114,7 +21578,7 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; } -@@ -770,7 +800,6 @@ static int open_port(struct inode * inod +@@ -772,7 +802,6 @@ static int open_port(struct inode * inod #define full_lseek null_lseek #define write_zero write_null #define read_full read_zero @@ -21122,7 +21586,7 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c #define open_kmem open_mem #define open_oldmem open_mem -@@ -886,6 +915,9 @@ static const struct memdev { +@@ -888,6 +917,9 @@ static const struct memdev { #ifdef CONFIG_CRASH_DUMP [12] = { "oldmem", 0, &oldmem_fops, NULL }, #endif @@ -21132,9 +21596,9 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.32.7/drivers/char/nvram.c linux-2.6.32.7/drivers/char/nvram.c ---- linux-2.6.32.7/drivers/char/nvram.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/nvram.c 2010-01-25 17:39:40.464368791 -0500 +diff -urNp linux-2.6.32.9/drivers/char/nvram.c linux-2.6.32.9/drivers/char/nvram.c +--- linux-2.6.32.9/drivers/char/nvram.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/nvram.c 2010-02-23 17:09:53.172065136 -0500 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -21147,9 +21611,9 @@ diff -urNp linux-2.6.32.7/drivers/char/nvram.c linux-2.6.32.7/drivers/char/nvram }; static int __init nvram_init(void) -diff -urNp linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c 2010-01-25 17:39:40.465137767 -0500 +diff -urNp linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/pcmcia/ipwireless/tty.c 2010-02-23 17:09:53.172065136 -0500 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -21264,9 +21728,9 @@ diff -urNp linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.7/dr do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.32.7/drivers/char/pty.c linux-2.6.32.7/drivers/char/pty.c ---- linux-2.6.32.7/drivers/char/pty.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/pty.c 2010-01-25 17:39:40.465137767 -0500 +diff -urNp linux-2.6.32.9/drivers/char/pty.c linux-2.6.32.9/drivers/char/pty.c +--- linux-2.6.32.9/drivers/char/pty.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/pty.c 2010-02-23 17:09:53.176362503 -0500 @@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode return ret; } @@ -21297,9 +21761,9 @@ diff -urNp linux-2.6.32.7/drivers/char/pty.c linux-2.6.32.7/drivers/char/pty.c cdev_init(&ptmx_cdev, &ptmx_fops); if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) -diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/random.c ---- linux-2.6.32.7/drivers/char/random.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/random.c 2010-01-25 17:39:40.465137767 -0500 +diff -urNp linux-2.6.32.9/drivers/char/random.c linux-2.6.32.9/drivers/char/random.c +--- linux-2.6.32.9/drivers/char/random.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/random.c 2010-02-23 17:09:53.176362503 -0500 @@ -254,8 +254,13 @@ /* * Configuration information @@ -21332,7 +21796,7 @@ diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/rand #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, -@@ -1218,7 +1230,7 @@ EXPORT_SYMBOL(generate_random_uuid); +@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid); #include <linux/sysctl.h> static int min_read_thresh = 8, min_write_thresh; @@ -21341,9 +21805,9 @@ diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.32.7/drivers/char/sonypi.c linux-2.6.32.7/drivers/char/sonypi.c ---- linux-2.6.32.7/drivers/char/sonypi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/sonypi.c 2010-01-25 17:39:40.466354578 -0500 +diff -urNp linux-2.6.32.9/drivers/char/sonypi.c linux-2.6.32.9/drivers/char/sonypi.c +--- linux-2.6.32.9/drivers/char/sonypi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/sonypi.c 2010-02-23 17:09:53.176362503 -0500 @@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -21374,9 +21838,9 @@ diff -urNp linux-2.6.32.7/drivers/char/sonypi.c linux-2.6.32.7/drivers/char/sony mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.32.7/drivers/char/tpm/tpm_bios.c linux-2.6.32.7/drivers/char/tpm/tpm_bios.c ---- linux-2.6.32.7/drivers/char/tpm/tpm_bios.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/tpm/tpm_bios.c 2010-01-25 17:39:40.466354578 -0500 +diff -urNp linux-2.6.32.9/drivers/char/tpm/tpm_bios.c linux-2.6.32.9/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/tpm/tpm_bios.c 2010-02-23 17:09:53.176362503 -0500 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -21417,9 +21881,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tpm/tpm_bios.c linux-2.6.32.7/drivers/cha memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_io.c ---- linux-2.6.32.7/drivers/char/tty_io.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/tty_io.c 2010-01-25 17:39:40.466354578 -0500 +diff -urNp linux-2.6.32.9/drivers/char/tty_io.c linux-2.6.32.9/drivers/char/tty_io.c +--- linux-2.6.32.9/drivers/char/tty_io.c 2010-02-23 17:04:12.063589634 -0500 ++++ linux-2.6.32.9/drivers/char/tty_io.c 2010-02-23 17:09:53.176362503 -0500 @@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -21516,7 +21980,7 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_ { struct tty_struct *tty; unsigned long flags; -@@ -1944,6 +1941,8 @@ out: +@@ -1946,6 +1943,8 @@ out: return retval; } @@ -21525,7 +21989,7 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_ /** * tiocsti - fake input character * @tty: tty to fake input into -@@ -2578,8 +2577,10 @@ long tty_ioctl(struct file *file, unsign +@@ -2580,8 +2579,10 @@ long tty_ioctl(struct file *file, unsign return retval; } @@ -21537,7 +22001,7 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_ unsigned long arg) { struct inode *inode = file->f_dentry->d_inode; -@@ -2603,6 +2604,8 @@ static long tty_compat_ioctl(struct file +@@ -2605,6 +2606,8 @@ static long tty_compat_ioctl(struct file return retval; } @@ -21546,7 +22010,7 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_ #endif /* -@@ -3046,11 +3049,6 @@ struct tty_struct *get_current_tty(void) +@@ -3048,11 +3051,6 @@ struct tty_struct *get_current_tty(void) } EXPORT_SYMBOL_GPL(get_current_tty); @@ -21558,9 +22022,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_ /* * Initialize the console device. This is called *early*, so * we can't necessarily depend on lots of kernel help here. -diff -urNp linux-2.6.32.7/drivers/char/tty_ldisc.c linux-2.6.32.7/drivers/char/tty_ldisc.c ---- linux-2.6.32.7/drivers/char/tty_ldisc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/tty_ldisc.c 2010-01-25 17:39:40.467421675 -0500 +diff -urNp linux-2.6.32.9/drivers/char/tty_ldisc.c linux-2.6.32.9/drivers/char/tty_ldisc.c +--- linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/tty_ldisc.c 2010-02-23 17:09:53.176362503 -0500 @@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; @@ -21606,9 +22070,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_ldisc.c linux-2.6.32.7/drivers/char/t module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -diff -urNp linux-2.6.32.7/drivers/char/virtio_console.c linux-2.6.32.7/drivers/char/virtio_console.c ---- linux-2.6.32.7/drivers/char/virtio_console.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/virtio_console.c 2010-01-25 17:39:40.467421675 -0500 +diff -urNp linux-2.6.32.9/drivers/char/virtio_console.c linux-2.6.32.9/drivers/char/virtio_console.c +--- linux-2.6.32.9/drivers/char/virtio_console.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/virtio_console.c 2010-02-23 17:09:53.176362503 -0500 @@ -44,6 +44,7 @@ static unsigned int in_len; static char *in, *inbuf; @@ -21617,9 +22081,9 @@ diff -urNp linux-2.6.32.7/drivers/char/virtio_console.c linux-2.6.32.7/drivers/c static struct hv_ops virtio_cons; /* The hvc device */ -diff -urNp linux-2.6.32.7/drivers/char/vt_ioctl.c linux-2.6.32.7/drivers/char/vt_ioctl.c ---- linux-2.6.32.7/drivers/char/vt_ioctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/char/vt_ioctl.c 2010-01-25 17:39:40.468114881 -0500 +diff -urNp linux-2.6.32.9/drivers/char/vt_ioctl.c linux-2.6.32.9/drivers/char/vt_ioctl.c +--- linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/char/vt_ioctl.c 2010-02-23 17:09:53.176362503 -0500 @@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -21647,9 +22111,9 @@ diff -urNp linux-2.6.32.7/drivers/char/vt_ioctl.c linux-2.6.32.7/drivers/char/vt q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.32.7/drivers/cpufreq/cpufreq.c linux-2.6.32.7/drivers/cpufreq/cpufreq.c ---- linux-2.6.32.7/drivers/cpufreq/cpufreq.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/cpufreq/cpufreq.c 2010-01-25 17:39:40.468114881 -0500 +diff -urNp linux-2.6.32.9/drivers/cpufreq/cpufreq.c linux-2.6.32.9/drivers/cpufreq/cpufreq.c +--- linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/cpufreq/cpufreq.c 2010-02-23 17:09:53.176362503 -0500 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -21659,9 +22123,9 @@ diff -urNp linux-2.6.32.7/drivers/cpufreq/cpufreq.c linux-2.6.32.7/drivers/cpufr .show = show, .store = store, }; -diff -urNp linux-2.6.32.7/drivers/cpuidle/sysfs.c linux-2.6.32.7/drivers/cpuidle/sysfs.c ---- linux-2.6.32.7/drivers/cpuidle/sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/cpuidle/sysfs.c 2010-01-25 17:39:40.468114881 -0500 +diff -urNp linux-2.6.32.9/drivers/cpuidle/sysfs.c linux-2.6.32.9/drivers/cpuidle/sysfs.c +--- linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/cpuidle/sysfs.c 2010-02-23 17:09:53.176362503 -0500 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -21680,9 +22144,9 @@ diff -urNp linux-2.6.32.7/drivers/cpuidle/sysfs.c linux-2.6.32.7/drivers/cpuidle .show = cpuidle_state_show, }; -diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.c linux-2.6.32.7/drivers/dma/ioat/dma.c ---- linux-2.6.32.7/drivers/dma/ioat/dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/dma/ioat/dma.c 2010-01-25 17:39:40.468114881 -0500 +diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.c linux-2.6.32.9/drivers/dma/ioat/dma.c +--- linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/dma/ioat/dma.c 2010-02-23 17:09:53.176362503 -0500 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str return entry->show(&chan->common, page); } @@ -21692,9 +22156,9 @@ diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.c linux-2.6.32.7/drivers/dma/ioat .show = ioat_attr_show, }; -diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.h linux-2.6.32.7/drivers/dma/ioat/dma.h ---- linux-2.6.32.7/drivers/dma/ioat/dma.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/dma/ioat/dma.h 2010-01-25 17:39:40.468114881 -0500 +diff -urNp linux-2.6.32.9/drivers/dma/ioat/dma.h linux-2.6.32.9/drivers/dma/ioat/dma.h +--- linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/dma/ioat/dma.h 2010-02-23 17:09:53.176362503 -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); @@ -21704,9 +22168,9 @@ diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.h linux-2.6.32.7/drivers/dma/ioat 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.7/drivers/edac/edac_core.h linux-2.6.32.7/drivers/edac/edac_core.h ---- linux-2.6.32.7/drivers/edac/edac_core.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/edac/edac_core.h 2010-01-25 17:39:40.469418840 -0500 +diff -urNp linux-2.6.32.9/drivers/edac/edac_core.h linux-2.6.32.9/drivers/edac/edac_core.h +--- linux-2.6.32.9/drivers/edac/edac_core.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/edac/edac_core.h 2010-02-23 17:09:53.176362503 -0500 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -21724,9 +22188,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_core.h linux-2.6.32.7/drivers/edac/e #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.32.7/drivers/edac/edac_device_sysfs.c linux-2.6.32.7/drivers/edac/edac_device_sysfs.c ---- linux-2.6.32.7/drivers/edac/edac_device_sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/edac/edac_device_sysfs.c 2010-01-25 17:39:40.469418840 -0500 +diff -urNp linux-2.6.32.9/drivers/edac/edac_device_sysfs.c linux-2.6.32.9/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/edac/edac_device_sysfs.c 2010-02-23 17:09:53.176362503 -0500 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -21754,9 +22218,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_device_sysfs.c linux-2.6.32.7/driver .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c 2010-01-25 17:39:40.470118277 -0500 +diff -urNp linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/edac/edac_mc_sysfs.c 2010-02-23 17:09:53.176362503 -0500 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -21775,9 +22239,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c linux-2.6.32.7/drivers/ed .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c 2010-01-25 17:39:40.470118277 -0500 +diff -urNp linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/edac/edac_pci_sysfs.c 2010-02-23 17:09:53.180370058 -0500 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -21796,9 +22260,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c linux-2.6.32.7/drivers/e .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.32.7/drivers/firmware/dmi_scan.c linux-2.6.32.7/drivers/firmware/dmi_scan.c ---- linux-2.6.32.7/drivers/firmware/dmi_scan.c 2010-01-25 20:04:14.730263785 -0500 -+++ linux-2.6.32.7/drivers/firmware/dmi_scan.c 2010-01-25 20:04:24.434442680 -0500 +diff -urNp linux-2.6.32.9/drivers/firmware/dmi_scan.c linux-2.6.32.9/drivers/firmware/dmi_scan.c +--- linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/firmware/dmi_scan.c 2010-02-23 17:09:53.180370058 -0500 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -21811,9 +22275,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/dmi_scan.c linux-2.6.32.7/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.32.7/drivers/firmware/edd.c linux-2.6.32.7/drivers/firmware/edd.c ---- linux-2.6.32.7/drivers/firmware/edd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/firmware/edd.c 2010-01-25 17:39:40.470118277 -0500 +diff -urNp linux-2.6.32.9/drivers/firmware/edd.c linux-2.6.32.9/drivers/firmware/edd.c +--- linux-2.6.32.9/drivers/firmware/edd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/firmware/edd.c 2010-02-23 17:09:53.180370058 -0500 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -21823,9 +22287,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/edd.c linux-2.6.32.7/drivers/firmware .show = edd_attr_show, }; -diff -urNp linux-2.6.32.7/drivers/firmware/efivars.c linux-2.6.32.7/drivers/firmware/efivars.c ---- linux-2.6.32.7/drivers/firmware/efivars.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/firmware/efivars.c 2010-01-25 17:39:40.470118277 -0500 +diff -urNp linux-2.6.32.9/drivers/firmware/efivars.c linux-2.6.32.9/drivers/firmware/efivars.c +--- linux-2.6.32.9/drivers/firmware/efivars.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/firmware/efivars.c 2010-02-23 17:09:53.180370058 -0500 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -21835,9 +22299,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/efivars.c linux-2.6.32.7/drivers/firm .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.32.7/drivers/firmware/iscsi_ibft.c linux-2.6.32.7/drivers/firmware/iscsi_ibft.c ---- linux-2.6.32.7/drivers/firmware/iscsi_ibft.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/firmware/iscsi_ibft.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/firmware/iscsi_ibft.c linux-2.6.32.9/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/firmware/iscsi_ibft.c 2010-02-23 17:09:53.180370058 -0500 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -21847,9 +22311,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/iscsi_ibft.c linux-2.6.32.7/drivers/f .show = ibft_show_attribute, }; -diff -urNp linux-2.6.32.7/drivers/firmware/memmap.c linux-2.6.32.7/drivers/firmware/memmap.c ---- linux-2.6.32.7/drivers/firmware/memmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/firmware/memmap.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/firmware/memmap.c linux-2.6.32.9/drivers/firmware/memmap.c +--- linux-2.6.32.9/drivers/firmware/memmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/firmware/memmap.c 2010-02-23 17:09:53.180370058 -0500 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -21859,9 +22323,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/memmap.c linux-2.6.32.7/drivers/firmw .show = memmap_attr_show, }; -diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_drv.c linux-2.6.32.7/drivers/gpu/drm/drm_drv.c ---- linux-2.6.32.7/drivers/gpu/drm/drm_drv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/drm_drv.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_drv.c linux-2.6.32.9/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/drm_drv.c 2010-02-23 17:09:53.180370058 -0500 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -21871,9 +22335,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_drv.c linux-2.6.32.7/drivers/gpu/d ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_fops.c linux-2.6.32.7/drivers/gpu/drm/drm_fops.c ---- linux-2.6.32.7/drivers/gpu/drm/drm_fops.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/drm_fops.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_fops.c linux-2.6.32.9/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/drm_fops.c 2010-02-23 17:09:53.180370058 -0500 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -21925,9 +22389,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_fops.c linux-2.6.32.7/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/drm_ioctl.c 2010-02-23 17:09:53.180370058 -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); @@ -21937,9 +22401,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.7/drivers/gpu stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_lock.c linux-2.6.32.7/drivers/gpu/drm/drm_lock.c ---- linux-2.6.32.7/drivers/gpu/drm/drm_lock.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/drm_lock.c 2010-01-25 17:39:40.471175406 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/drm_lock.c linux-2.6.32.9/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/drm_lock.c 2010-02-23 17:09:53.180370058 -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; @@ -21958,9 +22422,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_lock.c linux-2.6.32.7/drivers/gpu/ /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c 2010-01-25 17:39:40.472422527 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i810/i810_dma.c 2010-02-23 17:09:53.180370058 -0500 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -21983,9 +22447,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.7/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-01-25 17:39:40.472422527 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-23 17:09:53.180370058 -0500 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ } } @@ -21995,9 +22459,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.7/drive .init = ch7017_init, .detect = ch7017_detect, .mode_valid = ch7017_mode_valid, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-01-25 17:39:40.472422527 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-23 17:09:53.180370058 -0500 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ } } @@ -22007,9 +22471,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.7/drive .init = ch7xxx_init, .detect = ch7xxx_detect, .mode_valid = ch7xxx_mode_valid, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h 2010-01-25 17:39:40.472422527 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo.h 2010-02-23 17:09:53.180370058 -0500 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -22042,9 +22506,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h linux-2.6.32.7/drivers/gpu/ +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-23 17:09:53.180370058 -0500 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -22054,9 +22518,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.7/drivers .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-23 17:09:53.180370058 -0500 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -22066,9 +22530,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.7/drive .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-23 17:09:53.180370058 -0500 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -22078,9 +22542,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.7/drive .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/i915/i915_drv.c 2010-02-23 17:09:53.180370058 -0500 @@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -22090,9 +22554,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.7/drivers .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c ---- linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/radeon/mkregtable.c 2010-02-23 17:09:53.180370058 -0500 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, regex_t mask_rex; regmatch_t match[4]; @@ -22110,9 +22574,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.7/dri if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { -diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c 2010-01-25 17:39:40.473202731 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-23 17:09:53.184132288 -0500 @@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o } } @@ -22137,9 +22601,9 @@ diff -urNp linux-2.6.32.7/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.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c 2010-01-25 17:39:40.474418764 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_state.c 2010-02-23 17:09:53.184132288 -0500 @@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -22149,9 +22613,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.7/d DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-01-25 17:39:40.474418764 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-23 17:09:53.184132288 -0500 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -22203,9 +22667,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.7/dri } -diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c ---- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-01-25 17:39:40.474418764 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-23 17:09:53.184132288 -0500 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a NULL }; @@ -22215,9 +22679,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.7/drivers/gp .show = &ttm_bo_global_show }; -diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-01-25 17:39:40.475420819 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-23 17:09:53.184132288 -0500 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -22238,9 +22702,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.7/drivers /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c 2010-01-25 17:39:40.475420819 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_global.c 2010-02-23 17:09:53.184132288 -0500 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -22298,9 +22762,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.7/driver ref->release(ref); item->object = NULL; } -diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c ---- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c 2010-01-25 17:39:40.475420819 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-23 17:09:53.184132288 -0500 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at NULL }; @@ -22310,9 +22774,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.7/driver .show = &ttm_mem_zone_show, .store = &ttm_mem_zone_store }; -diff -urNp linux-2.6.32.7/drivers/gpu/vga/vgaarb.c linux-2.6.32.7/drivers/gpu/vga/vgaarb.c ---- linux-2.6.32.7/drivers/gpu/vga/vgaarb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/gpu/vga/vgaarb.c 2010-01-25 17:39:40.475420819 -0500 +diff -urNp linux-2.6.32.9/drivers/gpu/vga/vgaarb.c linux-2.6.32.9/drivers/gpu/vga/vgaarb.c +--- linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/gpu/vga/vgaarb.c 2010-02-23 17:09:53.184132288 -0500 @@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file remaining -= 7; pr_devel("client 0x%p called 'target'\n", priv); @@ -22322,9 +22786,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/vga/vgaarb.c linux-2.6.32.7/drivers/gpu/vg pdev = pci_dev_get(vga_default_device()); else { if (!vga_pci_str_to_vars(curr_pos, remaining, -diff -urNp linux-2.6.32.7/drivers/hwmon/k8temp.c linux-2.6.32.7/drivers/hwmon/k8temp.c ---- linux-2.6.32.7/drivers/hwmon/k8temp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/hwmon/k8temp.c 2010-01-25 17:39:40.476406478 -0500 +diff -urNp linux-2.6.32.9/drivers/hwmon/k8temp.c linux-2.6.32.9/drivers/hwmon/k8temp.c +--- linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/hwmon/k8temp.c 2010-02-23 17:09:53.184132288 -0500 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -22334,9 +22798,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/k8temp.c linux-2.6.32.7/drivers/hwmon/k8 }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.32.7/drivers/hwmon/sis5595.c linux-2.6.32.7/drivers/hwmon/sis5595.c ---- linux-2.6.32.7/drivers/hwmon/sis5595.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/hwmon/sis5595.c 2010-01-25 17:39:40.492760229 -0500 +diff -urNp linux-2.6.32.9/drivers/hwmon/sis5595.c linux-2.6.32.9/drivers/hwmon/sis5595.c +--- linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/hwmon/sis5595.c 2010-02-23 17:09:53.184132288 -0500 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -22346,9 +22810,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/sis5595.c linux-2.6.32.7/drivers/hwmon/s }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.32.7/drivers/hwmon/via686a.c linux-2.6.32.7/drivers/hwmon/via686a.c ---- linux-2.6.32.7/drivers/hwmon/via686a.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/hwmon/via686a.c 2010-01-25 17:39:40.493306350 -0500 +diff -urNp linux-2.6.32.9/drivers/hwmon/via686a.c linux-2.6.32.9/drivers/hwmon/via686a.c +--- linux-2.6.32.9/drivers/hwmon/via686a.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/hwmon/via686a.c 2010-02-23 17:09:53.184132288 -0500 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -22358,9 +22822,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/via686a.c linux-2.6.32.7/drivers/hwmon/v }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.32.7/drivers/hwmon/vt8231.c linux-2.6.32.7/drivers/hwmon/vt8231.c ---- linux-2.6.32.7/drivers/hwmon/vt8231.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/hwmon/vt8231.c 2010-01-25 17:39:40.497301758 -0500 +diff -urNp linux-2.6.32.9/drivers/hwmon/vt8231.c linux-2.6.32.9/drivers/hwmon/vt8231.c +--- linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/hwmon/vt8231.c 2010-02-23 17:09:53.184132288 -0500 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -22370,9 +22834,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/vt8231.c linux-2.6.32.7/drivers/hwmon/vt }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.32.7/drivers/hwmon/w83791d.c linux-2.6.32.7/drivers/hwmon/w83791d.c ---- linux-2.6.32.7/drivers/hwmon/w83791d.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/hwmon/w83791d.c 2010-01-25 17:39:40.497301758 -0500 +diff -urNp linux-2.6.32.9/drivers/hwmon/w83791d.c linux-2.6.32.9/drivers/hwmon/w83791d.c +--- linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/hwmon/w83791d.c 2010-02-23 17:09:53.184132288 -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); @@ -22384,9 +22848,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/w83791d.c linux-2.6.32.7/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c 2010-01-25 17:39:40.497301758 -0500 +diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/i2c/busses/i2c-i801.c 2010-02-23 17:09:53.188075376 -0500 @@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, @@ -22396,9 +22860,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c linux-2.6.32.7/drivers/i }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c 2010-01-25 17:39:40.497301758 -0500 +diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/i2c/busses/i2c-piix4.c 2010-02-23 17:09:53.188075376 -0500 @@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -22417,9 +22881,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.7/drivers/ }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c 2010-01-25 17:39:40.498418547 -0500 +diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis630.c 2010-02-23 17:09:53.188075376 -0500 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -22429,9 +22893,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.7/drivers }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c 2010-01-25 17:39:40.498418547 -0500 +diff -urNp linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/i2c/busses/i2c-sis96x.c 2010-02-23 17:09:53.188075376 -0500 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -22441,9 +22905,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.7/drivers }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.32.7/drivers/ide/ide-cd.c linux-2.6.32.7/drivers/ide/ide-cd.c ---- linux-2.6.32.7/drivers/ide/ide-cd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ide/ide-cd.c 2010-01-25 17:39:40.499096688 -0500 +diff -urNp linux-2.6.32.9/drivers/ide/ide-cd.c linux-2.6.32.9/drivers/ide/ide-cd.c +--- linux-2.6.32.9/drivers/ide/ide-cd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ide/ide-cd.c 2010-02-23 17:09:53.188075376 -0500 @@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ alignment = queue_dma_alignment(q) | q->dma_pad_mask; if ((unsigned long)buf & alignment @@ -22453,9 +22917,9 @@ diff -urNp linux-2.6.32.7/drivers/ide/ide-cd.c linux-2.6.32.7/drivers/ide/ide-cd drive->dma = 0; } } -diff -urNp linux-2.6.32.7/drivers/ieee1394/dv1394.c linux-2.6.32.7/drivers/ieee1394/dv1394.c ---- linux-2.6.32.7/drivers/ieee1394/dv1394.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/dv1394.c 2010-01-25 17:39:40.499096688 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/dv1394.c linux-2.6.32.9/drivers/ieee1394/dv1394.c +--- linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/dv1394.c 2010-02-23 17:09:53.188075376 -0500 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -22474,9 +22938,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/dv1394.c linux-2.6.32.7/drivers/ieee1 }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.32.7/drivers/ieee1394/eth1394.c linux-2.6.32.7/drivers/ieee1394/eth1394.c ---- linux-2.6.32.7/drivers/ieee1394/eth1394.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/eth1394.c 2010-01-25 17:39:40.499096688 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/eth1394.c linux-2.6.32.9/drivers/ieee1394/eth1394.c +--- linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/eth1394.c 2010-02-23 17:09:53.188075376 -0500 @@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -22486,9 +22950,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/eth1394.c linux-2.6.32.7/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.32.7/drivers/ieee1394/hosts.c linux-2.6.32.7/drivers/ieee1394/hosts.c ---- linux-2.6.32.7/drivers/ieee1394/hosts.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/hosts.c 2010-01-25 17:39:40.500173107 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/hosts.c linux-2.6.32.9/drivers/ieee1394/hosts.c +--- linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/hosts.c 2010-02-23 17:09:53.188075376 -0500 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -22497,9 +22961,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/hosts.c linux-2.6.32.7/drivers/ieee13 .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.32.7/drivers/ieee1394/ohci1394.c linux-2.6.32.7/drivers/ieee1394/ohci1394.c ---- linux-2.6.32.7/drivers/ieee1394/ohci1394.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/ohci1394.c 2010-01-25 17:39:40.500173107 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/ohci1394.c linux-2.6.32.9/drivers/ieee1394/ohci1394.c +--- linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/ohci1394.c 2010-02-23 17:09:53.188075376 -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) @@ -22521,9 +22985,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/ohci1394.c linux-2.6.32.7/drivers/iee }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.32.7/drivers/ieee1394/raw1394.c linux-2.6.32.7/drivers/ieee1394/raw1394.c ---- linux-2.6.32.7/drivers/ieee1394/raw1394.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/raw1394.c 2010-01-25 17:39:40.501412048 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/raw1394.c linux-2.6.32.9/drivers/ieee1394/raw1394.c +--- linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/raw1394.c 2010-02-23 17:09:53.188075376 -0500 @@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -22533,9 +22997,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/raw1394.c linux-2.6.32.7/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.32.7/drivers/ieee1394/sbp2.c linux-2.6.32.7/drivers/ieee1394/sbp2.c ---- linux-2.6.32.7/drivers/ieee1394/sbp2.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/sbp2.c 2010-01-25 17:39:40.501412048 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/sbp2.c linux-2.6.32.9/drivers/ieee1394/sbp2.c +--- linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/sbp2.c 2010-02-23 17:09:53.192542032 -0500 @@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, @@ -22554,9 +23018,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/sbp2.c linux-2.6.32.7/drivers/ieee139 { int ret; -diff -urNp linux-2.6.32.7/drivers/ieee1394/video1394.c linux-2.6.32.7/drivers/ieee1394/video1394.c ---- linux-2.6.32.7/drivers/ieee1394/video1394.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/ieee1394/video1394.c 2010-01-25 17:39:40.502276017 -0500 +diff -urNp linux-2.6.32.9/drivers/ieee1394/video1394.c linux-2.6.32.9/drivers/ieee1394/video1394.c +--- linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/ieee1394/video1394.c 2010-02-23 17:09:53.192542032 -0500 @@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -22566,9 +23030,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/video1394.c linux-2.6.32.7/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.32.7/drivers/infiniband/core/cm.c linux-2.6.32.7/drivers/infiniband/core/cm.c ---- linux-2.6.32.7/drivers/infiniband/core/cm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/infiniband/core/cm.c 2010-01-25 17:39:40.502276017 -0500 +diff -urNp linux-2.6.32.9/drivers/infiniband/core/cm.c linux-2.6.32.9/drivers/infiniband/core/cm.c +--- linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/infiniband/core/cm.c 2010-02-23 17:09:53.192542032 -0500 @@ -112,7 +112,7 @@ static char const counter_group_names[CM struct cm_counter_group { @@ -22712,9 +23176,9 @@ diff -urNp linux-2.6.32.7/drivers/infiniband/core/cm.c linux-2.6.32.7/drivers/in .show = cm_show_counter }; -diff -urNp linux-2.6.32.7/drivers/infiniband/core/sysfs.c linux-2.6.32.7/drivers/infiniband/core/sysfs.c ---- linux-2.6.32.7/drivers/infiniband/core/sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/infiniband/core/sysfs.c 2010-01-25 17:39:40.503408043 -0500 +diff -urNp linux-2.6.32.9/drivers/infiniband/core/sysfs.c linux-2.6.32.9/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/infiniband/core/sysfs.c 2010-02-23 17:09:53.192542032 -0500 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -22724,9 +23188,9 @@ diff -urNp linux-2.6.32.7/drivers/infiniband/core/sysfs.c linux-2.6.32.7/drivers .show = port_attr_show }; -diff -urNp linux-2.6.32.7/drivers/input/keyboard/atkbd.c linux-2.6.32.7/drivers/input/keyboard/atkbd.c ---- linux-2.6.32.7/drivers/input/keyboard/atkbd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/keyboard/atkbd.c 2010-01-25 17:39:40.503408043 -0500 +diff -urNp linux-2.6.32.9/drivers/input/keyboard/atkbd.c linux-2.6.32.9/drivers/input/keyboard/atkbd.c +--- linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/keyboard/atkbd.c 2010-02-23 17:09:53.192542032 -0500 @@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -22736,9 +23200,9 @@ diff -urNp linux-2.6.32.7/drivers/input/keyboard/atkbd.c linux-2.6.32.7/drivers/ }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.32.7/drivers/input/mouse/lifebook.c linux-2.6.32.7/drivers/input/mouse/lifebook.c ---- linux-2.6.32.7/drivers/input/mouse/lifebook.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/mouse/lifebook.c 2010-01-25 17:39:40.503408043 -0500 +diff -urNp linux-2.6.32.9/drivers/input/mouse/lifebook.c linux-2.6.32.9/drivers/input/mouse/lifebook.c +--- linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/mouse/lifebook.c 2010-02-23 17:09:53.192542032 -0500 @@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -22748,9 +23212,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/lifebook.c linux-2.6.32.7/drivers/ }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.32.7/drivers/input/mouse/psmouse-base.c linux-2.6.32.7/drivers/input/mouse/psmouse-base.c ---- linux-2.6.32.7/drivers/input/mouse/psmouse-base.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/mouse/psmouse-base.c 2010-01-25 17:39:40.504268935 -0500 +diff -urNp linux-2.6.32.9/drivers/input/mouse/psmouse-base.c linux-2.6.32.9/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/mouse/psmouse-base.c 2010-02-23 17:09:53.192542032 -0500 @@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -22760,9 +23224,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/psmouse-base.c linux-2.6.32.7/driv }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.32.7/drivers/input/mouse/synaptics.c linux-2.6.32.7/drivers/input/mouse/synaptics.c ---- linux-2.6.32.7/drivers/input/mouse/synaptics.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/mouse/synaptics.c 2010-01-25 17:39:40.504268935 -0500 +diff -urNp linux-2.6.32.9/drivers/input/mouse/synaptics.c linux-2.6.32.9/drivers/input/mouse/synaptics.c +--- linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/mouse/synaptics.c 2010-02-23 17:09:53.192542032 -0500 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -22791,9 +23255,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/synaptics.c linux-2.6.32.7/drivers }; #endif -diff -urNp linux-2.6.32.7/drivers/input/mousedev.c linux-2.6.32.7/drivers/input/mousedev.c ---- linux-2.6.32.7/drivers/input/mousedev.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/mousedev.c 2010-01-25 17:39:40.504268935 -0500 +diff -urNp linux-2.6.32.9/drivers/input/mousedev.c linux-2.6.32.9/drivers/input/mousedev.c +--- linux-2.6.32.9/drivers/input/mousedev.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/mousedev.c 2010-02-23 17:09:53.192542032 -0500 @@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -22803,9 +23267,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mousedev.c linux-2.6.32.7/drivers/input/ }; static int psaux_registered; #endif -diff -urNp linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h 2010-01-25 20:04:14.787254997 -0500 -+++ linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h 2010-01-25 20:04:24.498472269 -0500 +diff -urNp linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/serio/i8042-x86ia64io.h 2010-02-23 17:09:53.192542032 -0500 @@ -172,7 +172,7 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -22860,9 +23324,9 @@ diff -urNp linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.7/d }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.32.7/drivers/input/serio/serio_raw.c linux-2.6.32.7/drivers/input/serio/serio_raw.c ---- linux-2.6.32.7/drivers/input/serio/serio_raw.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/input/serio/serio_raw.c 2010-01-25 17:39:40.505425306 -0500 +diff -urNp linux-2.6.32.9/drivers/input/serio/serio_raw.c linux-2.6.32.9/drivers/input/serio/serio_raw.c +--- linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/input/serio/serio_raw.c 2010-02-23 17:09:53.192542032 -0500 @@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -22872,9 +23336,9 @@ diff -urNp linux-2.6.32.7/drivers/input/serio/serio_raw.c linux-2.6.32.7/drivers }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/common.c linux-2.6.32.7/drivers/isdn/gigaset/common.c ---- linux-2.6.32.7/drivers/isdn/gigaset/common.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/isdn/gigaset/common.c 2010-01-25 17:39:40.530169845 -0500 +diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/common.c linux-2.6.32.9/drivers/isdn/gigaset/common.c +--- linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/isdn/gigaset/common.c 2010-02-23 17:09:53.192542032 -0500 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -22884,9 +23348,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/common.c linux-2.6.32.7/drivers/i cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h 2010-01-25 17:39:40.531357689 -0500 +diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/isdn/gigaset/gigaset.h 2010-02-23 17:09:53.192542032 -0500 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -22896,9 +23360,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h linux-2.6.32.7/drivers/ struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/interface.c linux-2.6.32.7/drivers/isdn/gigaset/interface.c ---- linux-2.6.32.7/drivers/isdn/gigaset/interface.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/isdn/gigaset/interface.c 2010-01-25 17:39:40.535125613 -0500 +diff -urNp linux-2.6.32.9/drivers/isdn/gigaset/interface.c linux-2.6.32.9/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/isdn/gigaset/interface.c 2010-02-23 17:09:53.196332354 -0500 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -22986,9 +23450,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/interface.c linux-2.6.32.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.32.7/drivers/lguest/core.c linux-2.6.32.7/drivers/lguest/core.c ---- linux-2.6.32.7/drivers/lguest/core.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/lguest/core.c 2010-01-25 17:39:40.535125613 -0500 +diff -urNp linux-2.6.32.9/drivers/lguest/core.c linux-2.6.32.9/drivers/lguest/core.c +--- linux-2.6.32.9/drivers/lguest/core.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/lguest/core.c 2010-02-23 17:09:53.196332354 -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. @@ -23007,9 +23471,9 @@ diff -urNp linux-2.6.32.7/drivers/lguest/core.c linux-2.6.32.7/drivers/lguest/co if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c 2010-01-25 17:39:40.536163946 -0500 +diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/macintosh/via-pmu-backlight.c 2010-02-23 17:09:53.196332354 -0500 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -23028,9 +23492,9 @@ diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.7/d .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu.c linux-2.6.32.7/drivers/macintosh/via-pmu.c ---- linux-2.6.32.7/drivers/macintosh/via-pmu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/macintosh/via-pmu.c 2010-01-25 17:39:40.536163946 -0500 +diff -urNp linux-2.6.32.9/drivers/macintosh/via-pmu.c linux-2.6.32.9/drivers/macintosh/via-pmu.c +--- linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/macintosh/via-pmu.c 2010-02-23 17:09:53.196332354 -0500 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -23040,9 +23504,9 @@ diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu.c linux-2.6.32.7/drivers/mac .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.32.7/drivers/md/bitmap.c linux-2.6.32.7/drivers/md/bitmap.c ---- linux-2.6.32.7/drivers/md/bitmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/md/bitmap.c 2010-01-25 17:39:40.536163946 -0500 +diff -urNp linux-2.6.32.9/drivers/md/bitmap.c linux-2.6.32.9/drivers/md/bitmap.c +--- linux-2.6.32.9/drivers/md/bitmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/md/bitmap.c 2010-02-23 17:09:53.196332354 -0500 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -23052,9 +23516,9 @@ diff -urNp linux-2.6.32.7/drivers/md/bitmap.c linux-2.6.32.7/drivers/md/bitmap.c # endif #endif -diff -urNp linux-2.6.32.7/drivers/md/dm-sysfs.c linux-2.6.32.7/drivers/md/dm-sysfs.c ---- linux-2.6.32.7/drivers/md/dm-sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/md/dm-sysfs.c 2010-01-25 17:39:40.536163946 -0500 +diff -urNp linux-2.6.32.9/drivers/md/dm-sysfs.c linux-2.6.32.9/drivers/md/dm-sysfs.c +--- linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/md/dm-sysfs.c 2010-02-23 17:09:53.196332354 -0500 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -23064,9 +23528,9 @@ diff -urNp linux-2.6.32.7/drivers/md/dm-sysfs.c linux-2.6.32.7/drivers/md/dm-sys .show = dm_attr_show, }; -diff -urNp linux-2.6.32.7/drivers/md/dm-table.c linux-2.6.32.7/drivers/md/dm-table.c ---- linux-2.6.32.7/drivers/md/dm-table.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/md/dm-table.c 2010-01-25 17:39:40.537389005 -0500 +diff -urNp linux-2.6.32.9/drivers/md/dm-table.c linux-2.6.32.9/drivers/md/dm-table.c +--- linux-2.6.32.9/drivers/md/dm-table.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/md/dm-table.c 2010-02-23 17:09:53.196332354 -0500 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -23076,9 +23540,9 @@ diff -urNp linux-2.6.32.7/drivers/md/dm-table.c linux-2.6.32.7/drivers/md/dm-tab 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.7/drivers/md/md.c linux-2.6.32.7/drivers/md/md.c ---- linux-2.6.32.7/drivers/md/md.c 2010-01-25 20:04:14.812259856 -0500 -+++ linux-2.6.32.7/drivers/md/md.c 2010-01-25 20:04:24.515156738 -0500 +diff -urNp linux-2.6.32.9/drivers/md/md.c linux-2.6.32.9/drivers/md/md.c +--- linux-2.6.32.9/drivers/md/md.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/md/md.c 2010-02-23 17:09:53.196332354 -0500 @@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); @@ -23115,9 +23579,9 @@ diff -urNp linux-2.6.32.7/drivers/md/md.c linux-2.6.32.7/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.7/drivers/md/md.h linux-2.6.32.7/drivers/md/md.h ---- linux-2.6.32.7/drivers/md/md.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/md/md.h 2010-01-25 17:39:40.538411271 -0500 +diff -urNp linux-2.6.32.9/drivers/md/md.h linux-2.6.32.9/drivers/md/md.h +--- linux-2.6.32.9/drivers/md/md.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/md/md.h 2010-02-23 17:09:53.196332354 -0500 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -23127,9 +23591,9 @@ diff -urNp linux-2.6.32.7/drivers/md/md.h linux-2.6.32.7/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c ---- linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-01-25 17:39:40.539417594 -0500 +diff -urNp linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-23 17:09:53.196332354 -0500 @@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt const struct dvb_device *template, void *priv, int type) { @@ -23138,9 +23602,9 @@ diff -urNp linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.7/dri struct file_operations *dvbdevfops; struct device *clsdev; int minor; -diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c 2010-01-25 17:39:40.539417594 -0500 +diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/media/video/usbvideo/konicawc.c 2010-02-23 17:09:53.196332354 -0500 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -23150,9 +23614,9 @@ diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.7 cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c 2010-01-25 17:39:40.539417594 -0500 +diff -urNp linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-23 17:09:53.196332354 -0500 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -23162,9 +23626,9 @@ diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c linu cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.32.7/drivers/message/i2o/i2o_proc.c linux-2.6.32.7/drivers/message/i2o/i2o_proc.c ---- linux-2.6.32.7/drivers/message/i2o/i2o_proc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/message/i2o/i2o_proc.c 2010-01-25 17:39:40.539417594 -0500 +diff -urNp linux-2.6.32.9/drivers/message/i2o/i2o_proc.c linux-2.6.32.9/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/message/i2o/i2o_proc.c 2010-02-23 17:09:53.200463728 -0500 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -23251,9 +23715,9 @@ diff -urNp linux-2.6.32.7/drivers/message/i2o/i2o_proc.c linux-2.6.32.7/drivers/ return 0; } -diff -urNp linux-2.6.32.7/drivers/misc/kgdbts.c linux-2.6.32.7/drivers/misc/kgdbts.c ---- linux-2.6.32.7/drivers/misc/kgdbts.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/misc/kgdbts.c 2010-01-25 17:39:40.540421639 -0500 +diff -urNp linux-2.6.32.9/drivers/misc/kgdbts.c linux-2.6.32.9/drivers/misc/kgdbts.c +--- linux-2.6.32.9/drivers/misc/kgdbts.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/misc/kgdbts.c 2010-02-23 17:09:53.200463728 -0500 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -23272,9 +23736,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/kgdbts.c linux-2.6.32.7/drivers/misc/kgdb .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c ---- linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c 2010-01-25 17:39:40.540421639 -0500 +diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/misc/sgi-gru/gruhandles.c 2010-02-23 17:09:53.200463728 -0500 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic static void update_mcs_stats(enum mcs_op op, unsigned long clks) @@ -23286,9 +23750,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.7/drive if (mcs_op_statistics[op].max < clks) mcs_op_statistics[op].max = clks; } -diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c ---- linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c 2010-01-25 17:39:40.540421639 -0500 +diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/misc/sgi-gru/gruprocfs.c 2010-02-23 17:09:53.200463728 -0500 @@ -32,9 +32,9 @@ #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) @@ -23312,9 +23776,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.7/driver 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.7/drivers/misc/sgi-gru/grutables.h linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h 2010-01-25 17:39:40.541415895 -0500 +diff -urNp linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/misc/sgi-gru/grutables.h 2010-02-23 17:09:53.200463728 -0500 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; * GRU statistics. */ @@ -23498,9 +23962,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h linux-2.6.32.7/driver } while (0) #ifdef CONFIG_SGI_GRU_DEBUG -diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2000.c linux-2.6.32.7/drivers/mtd/devices/doc2000.c ---- linux-2.6.32.7/drivers/mtd/devices/doc2000.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/mtd/devices/doc2000.c 2010-01-25 17:39:40.541415895 -0500 +diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2000.c linux-2.6.32.9/drivers/mtd/devices/doc2000.c +--- linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/mtd/devices/doc2000.c 2010-02-23 17:09:53.200463728 -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 */ @@ -23510,9 +23974,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2000.c linux-2.6.32.7/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2001.c linux-2.6.32.7/drivers/mtd/devices/doc2001.c ---- linux-2.6.32.7/drivers/mtd/devices/doc2001.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/mtd/devices/doc2001.c 2010-01-25 17:39:40.541415895 -0500 +diff -urNp linux-2.6.32.9/drivers/mtd/devices/doc2001.c linux-2.6.32.9/drivers/mtd/devices/doc2001.c +--- linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/mtd/devices/doc2001.c 2010-02-23 17:09:53.200463728 -0500 @@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt /* Don't allow read past end of device */ if (from >= this->totlen) @@ -23522,9 +23986,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2001.c linux-2.6.32.7/drivers/m /* Don't allow a single read to cross a 512-byte block boundary */ if (from + len > ((from | 0x1ff) + 1)) -diff -urNp linux-2.6.32.7/drivers/mtd/ubi/build.c linux-2.6.32.7/drivers/mtd/ubi/build.c ---- linux-2.6.32.7/drivers/mtd/ubi/build.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/mtd/ubi/build.c 2010-01-25 17:39:40.542180216 -0500 +diff -urNp linux-2.6.32.9/drivers/mtd/ubi/build.c linux-2.6.32.9/drivers/mtd/ubi/build.c +--- linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/mtd/ubi/build.c 2010-02-23 17:09:53.200463728 -0500 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit); static int __init bytes_str_to_int(const char *str) { @@ -23564,9 +24028,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/ubi/build.c linux-2.6.32.7/drivers/mtd/ubi } /** -diff -urNp linux-2.6.32.7/drivers/net/e1000e/82571.c linux-2.6.32.7/drivers/net/e1000e/82571.c ---- linux-2.6.32.7/drivers/net/e1000e/82571.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/e1000e/82571.c 2010-01-25 17:39:40.542180216 -0500 +diff -urNp linux-2.6.32.9/drivers/net/e1000e/82571.c linux-2.6.32.9/drivers/net/e1000e/82571.c +--- linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/e1000e/82571.c 2010-02-23 17:09:53.200463728 -0500 @@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s { struct e1000_hw *hw = &adapter->hw; @@ -23620,9 +24084,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/82571.c linux-2.6.32.7/drivers/net/ .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.32.7/drivers/net/e1000e/e1000.h linux-2.6.32.7/drivers/net/e1000e/e1000.h ---- linux-2.6.32.7/drivers/net/e1000e/e1000.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/e1000e/e1000.h 2010-01-25 17:39:40.542180216 -0500 +diff -urNp linux-2.6.32.9/drivers/net/e1000e/e1000.h linux-2.6.32.9/drivers/net/e1000e/e1000.h +--- linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/e1000e/e1000.h 2010-02-23 17:09:53.200463728 -0500 @@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; @@ -23636,9 +24100,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/e1000.h linux-2.6.32.7/drivers/net/ }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.32.7/drivers/net/e1000e/es2lan.c linux-2.6.32.7/drivers/net/e1000e/es2lan.c ---- linux-2.6.32.7/drivers/net/e1000e/es2lan.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/e1000e/es2lan.c 2010-01-25 17:39:40.543398122 -0500 +diff -urNp linux-2.6.32.9/drivers/net/e1000e/es2lan.c linux-2.6.32.9/drivers/net/e1000e/es2lan.c +--- linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/e1000e/es2lan.c 2010-02-23 17:09:53.200463728 -0500 @@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es { struct e1000_hw *hw = &adapter->hw; @@ -23674,9 +24138,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/es2lan.c linux-2.6.32.7/drivers/net .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.32.7/drivers/net/e1000e/hw.h linux-2.6.32.7/drivers/net/e1000e/hw.h ---- linux-2.6.32.7/drivers/net/e1000e/hw.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/e1000e/hw.h 2010-01-25 17:39:40.543398122 -0500 +diff -urNp linux-2.6.32.9/drivers/net/e1000e/hw.h linux-2.6.32.9/drivers/net/e1000e/hw.h +--- linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/e1000e/hw.h 2010-02-23 17:09:53.200463728 -0500 @@ -755,34 +755,34 @@ struct e1000_mac_operations { /* Function pointers for the PHY. */ @@ -23736,18 +24200,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/hw.h linux-2.6.32.7/drivers/net/e10 }; struct e1000_mac_info { -@@ -856,7 +856,7 @@ struct e1000_phy_info { - }; - - struct e1000_nvm_info { -- struct e1000_nvm_operations ops; -+ const struct e1000_nvm_operations ops; - - enum e1000_nvm_type type; - enum e1000_nvm_override override; -diff -urNp linux-2.6.32.7/drivers/net/e1000e/ich8lan.c linux-2.6.32.7/drivers/net/e1000e/ich8lan.c ---- linux-2.6.32.7/drivers/net/e1000e/ich8lan.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/e1000e/ich8lan.c 2010-01-25 17:39:40.552414935 -0500 +diff -urNp linux-2.6.32.9/drivers/net/e1000e/ich8lan.c linux-2.6.32.9/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/e1000e/ich8lan.c 2010-02-23 17:09:53.200463728 -0500 @@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -23775,9 +24230,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/ich8lan.c linux-2.6.32.7/drivers/ne .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, .release_nvm = e1000_release_nvm_ich8lan, -diff -urNp linux-2.6.32.7/drivers/net/ibmveth.c linux-2.6.32.7/drivers/net/ibmveth.c ---- linux-2.6.32.7/drivers/net/ibmveth.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/ibmveth.c 2010-01-25 17:39:40.552414935 -0500 +diff -urNp linux-2.6.32.9/drivers/net/ibmveth.c linux-2.6.32.9/drivers/net/ibmveth.c +--- linux-2.6.32.9/drivers/net/ibmveth.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/ibmveth.c 2010-02-23 17:09:53.200463728 -0500 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -23787,9 +24242,9 @@ diff -urNp linux-2.6.32.7/drivers/net/ibmveth.c linux-2.6.32.7/drivers/net/ibmve .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_82575.c linux-2.6.32.7/drivers/net/igb/e1000_82575.c ---- linux-2.6.32.7/drivers/net/igb/e1000_82575.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/igb/e1000_82575.c 2010-01-25 17:39:40.553416584 -0500 +diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_82575.c linux-2.6.32.9/drivers/net/igb/e1000_82575.c +--- linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/igb/e1000_82575.c 2010-02-23 17:09:53.200463728 -0500 @@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -23815,9 +24270,9 @@ diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_82575.c linux-2.6.32.7/drivers/n .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_hw.h linux-2.6.32.7/drivers/net/igb/e1000_hw.h ---- linux-2.6.32.7/drivers/net/igb/e1000_hw.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/igb/e1000_hw.h 2010-01-25 17:39:40.553416584 -0500 +diff -urNp linux-2.6.32.9/drivers/net/igb/e1000_hw.h linux-2.6.32.9/drivers/net/igb/e1000_hw.h +--- linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/igb/e1000_hw.h 2010-02-23 17:09:53.204540597 -0500 @@ -302,17 +302,17 @@ struct e1000_phy_operations { }; @@ -23843,18 +24298,9 @@ diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_hw.h linux-2.6.32.7/drivers/net/ }; extern const struct e1000_info e1000_82575_info; -@@ -397,7 +397,7 @@ struct e1000_phy_info { - }; - - struct e1000_nvm_info { -- struct e1000_nvm_operations ops; -+ const struct e1000_nvm_operations ops; - - enum e1000_nvm_type type; - enum e1000_nvm_override override; -diff -urNp linux-2.6.32.7/drivers/net/irda/vlsi_ir.c linux-2.6.32.7/drivers/net/irda/vlsi_ir.c ---- linux-2.6.32.7/drivers/net/irda/vlsi_ir.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/irda/vlsi_ir.c 2010-01-25 17:39:40.554121095 -0500 +diff -urNp linux-2.6.32.9/drivers/net/irda/vlsi_ir.c linux-2.6.32.9/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/irda/vlsi_ir.c 2010-02-23 17:09:53.204540597 -0500 @@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -23871,9 +24317,9 @@ diff -urNp linux-2.6.32.7/drivers/net/irda/vlsi_ir.c linux-2.6.32.7/drivers/net/ spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return NETDEV_TX_OK; -diff -urNp linux-2.6.32.7/drivers/net/iseries_veth.c linux-2.6.32.7/drivers/net/iseries_veth.c ---- linux-2.6.32.7/drivers/net/iseries_veth.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/iseries_veth.c 2010-01-25 17:39:40.565344882 -0500 +diff -urNp linux-2.6.32.9/drivers/net/iseries_veth.c linux-2.6.32.9/drivers/net/iseries_veth.c +--- linux-2.6.32.9/drivers/net/iseries_veth.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/iseries_veth.c 2010-02-23 17:09:53.204540597 -0500 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -23892,9 +24338,9 @@ diff -urNp linux-2.6.32.7/drivers/net/iseries_veth.c linux-2.6.32.7/drivers/net/ .show = veth_port_attribute_show }; -diff -urNp linux-2.6.32.7/drivers/net/pcnet32.c linux-2.6.32.7/drivers/net/pcnet32.c ---- linux-2.6.32.7/drivers/net/pcnet32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/pcnet32.c 2010-01-25 17:39:40.565344882 -0500 +diff -urNp linux-2.6.32.9/drivers/net/pcnet32.c linux-2.6.32.9/drivers/net/pcnet32.c +--- linux-2.6.32.9/drivers/net/pcnet32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/pcnet32.c 2010-02-23 17:09:53.204540597 -0500 @@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses @@ -23904,9 +24350,9 @@ diff -urNp linux-2.6.32.7/drivers/net/pcnet32.c linux-2.6.32.7/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.32.7/drivers/net/tg3.h linux-2.6.32.7/drivers/net/tg3.h ---- linux-2.6.32.7/drivers/net/tg3.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/tg3.h 2010-01-25 17:39:40.566412698 -0500 +diff -urNp linux-2.6.32.9/drivers/net/tg3.h linux-2.6.32.9/drivers/net/tg3.h +--- linux-2.6.32.9/drivers/net/tg3.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/tg3.h 2010-02-23 17:09:53.204540597 -0500 @@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -23915,9 +24361,9 @@ diff -urNp linux-2.6.32.7/drivers/net/tg3.h linux-2.6.32.7/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.7/drivers/net/usb/hso.c linux-2.6.32.7/drivers/net/usb/hso.c ---- linux-2.6.32.7/drivers/net/usb/hso.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/usb/hso.c 2010-01-25 17:39:40.567425146 -0500 +diff -urNp linux-2.6.32.9/drivers/net/usb/hso.c linux-2.6.32.9/drivers/net/usb/hso.c +--- linux-2.6.32.9/drivers/net/usb/hso.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/usb/hso.c 2010-02-23 17:09:53.204540597 -0500 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -23996,9 +24442,9 @@ diff -urNp linux-2.6.32.7/drivers/net/usb/hso.c linux-2.6.32.7/drivers/net/usb/h result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c ---- linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c 2010-01-25 17:39:40.567425146 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/b43/debugfs.c 2010-02-23 17:09:53.204540597 -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); @@ -24008,9 +24454,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c linux-2.6.32.7/driv /* Offset of struct b43_dfs_file in struct b43_dfsentry */ size_t file_struct_offset; }; -diff -urNp linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c ---- linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c 2010-01-25 17:39:40.567425146 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/b43legacy/debugfs.c 2010-02-23 17:09:53.204540597 -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); @@ -24020,9 +24466,9 @@ diff -urNp linux-2.6.32.7/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.7/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-01-25 17:39:40.567425146 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-23 17:09:53.204540597 -0500 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = }, }; @@ -24032,9 +24478,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.7 .ucode = &iwl5000_ucode, .lib = &iwl1000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-01-25 17:39:40.568210179 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-23 17:09:53.204540597 -0500 @@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -24044,9 +24490,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.7 .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-01-25 17:39:40.568210179 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-23 17:09:53.204540597 -0500 @@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -24056,9 +24502,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.7 .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-01-25 20:04:15.064610348 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-01-25 20:04:24.680179315 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-23 17:09:53.204540597 -0500 @@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -24076,9 +24522,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.7 .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-01-25 17:39:40.569316162 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-23 17:09:53.208535454 -0500 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; @@ -24088,9 +24534,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.7 .ucode = &iwl5000_ucode, .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-01-25 17:39:40.569316162 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-23 17:09:53.208535454 -0500 @@ -67,7 +67,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ @@ -24100,9 +24546,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.7/ 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.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c 2010-01-25 17:39:40.569316162 -0500 +diff -urNp linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/net/wireless/libertas/debugfs.c 2010-02-23 17:09:53.208535454 -0500 @@ -708,7 +708,7 @@ out_unlock: struct lbs_debugfs_files { const char *name; @@ -24112,9 +24558,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.7 }; static const struct lbs_debugfs_files debugfs_files[] = { -diff -urNp linux-2.6.32.7/drivers/oprofile/buffer_sync.c linux-2.6.32.7/drivers/oprofile/buffer_sync.c ---- linux-2.6.32.7/drivers/oprofile/buffer_sync.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/buffer_sync.c 2010-01-25 17:39:40.569316162 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/buffer_sync.c linux-2.6.32.9/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/buffer_sync.c 2010-02-23 17:09:53.208535454 -0500 @@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -24150,9 +24596,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/buffer_sync.c linux-2.6.32.7/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.32.7/drivers/oprofile/event_buffer.c linux-2.6.32.7/drivers/oprofile/event_buffer.c ---- linux-2.6.32.7/drivers/oprofile/event_buffer.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/event_buffer.c 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/event_buffer.c linux-2.6.32.9/drivers/oprofile/event_buffer.c +--- linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/event_buffer.c 2010-02-23 17:09:53.208535454 -0500 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value } @@ -24162,9 +24608,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/event_buffer.c linux-2.6.32.7/drivers return; } -diff -urNp linux-2.6.32.7/drivers/oprofile/oprof.c linux-2.6.32.7/drivers/oprofile/oprof.c ---- linux-2.6.32.7/drivers/oprofile/oprof.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/oprof.c 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/oprof.c linux-2.6.32.9/drivers/oprofile/oprof.c +--- linux-2.6.32.9/drivers/oprofile/oprof.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/oprof.c 2010-02-23 17:09:53.208535454 -0500 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st if (oprofile_ops.switch_events()) return; @@ -24174,9 +24620,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprof.c linux-2.6.32.7/drivers/oprofi start_switch_worker(); } -diff -urNp linux-2.6.32.7/drivers/oprofile/oprofilefs.c linux-2.6.32.7/drivers/oprofile/oprofilefs.c ---- linux-2.6.32.7/drivers/oprofile/oprofilefs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/oprofilefs.c 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/oprofilefs.c linux-2.6.32.9/drivers/oprofile/oprofilefs.c +--- linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/oprofilefs.c 2010-02-23 17:09:53.208535454 -0500 @@ -187,7 +187,7 @@ static const struct file_operations atom @@ -24186,9 +24632,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofilefs.c linux-2.6.32.7/drivers/o { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.c linux-2.6.32.7/drivers/oprofile/oprofile_stats.c ---- linux-2.6.32.7/drivers/oprofile/oprofile_stats.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/oprofile_stats.c 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.c linux-2.6.32.9/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.c 2010-02-23 17:09:53.208535454 -0500 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -24206,9 +24652,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.c linux-2.6.32.7/drive } -diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.h linux-2.6.32.7/drivers/oprofile/oprofile_stats.h ---- linux-2.6.32.7/drivers/oprofile/oprofile_stats.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/oprofile/oprofile_stats.h 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/oprofile/oprofile_stats.h linux-2.6.32.9/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/oprofile/oprofile_stats.h 2010-02-23 17:09:53.208535454 -0500 @@ -13,11 +13,11 @@ #include <asm/atomic.h> @@ -24226,9 +24672,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.h linux-2.6.32.7/drive }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.32.7/drivers/parisc/pdc_stable.c linux-2.6.32.7/drivers/parisc/pdc_stable.c ---- linux-2.6.32.7/drivers/parisc/pdc_stable.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/parisc/pdc_stable.c 2010-01-25 17:39:40.570409439 -0500 +diff -urNp linux-2.6.32.9/drivers/parisc/pdc_stable.c linux-2.6.32.9/drivers/parisc/pdc_stable.c +--- linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/parisc/pdc_stable.c 2010-02-23 17:09:53.208535454 -0500 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -24238,9 +24684,9 @@ diff -urNp linux-2.6.32.7/drivers/parisc/pdc_stable.c linux-2.6.32.7/drivers/par .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c 2010-01-25 17:39:40.571411517 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/hotplug/acpiphp_glue.c 2010-02-23 17:09:53.208535454 -0500 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -24250,9 +24696,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.7/driv .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-01-25 17:39:40.571411517 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-23 17:09:53.208535454 -0500 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -24267,9 +24713,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.7/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.32.7/drivers/pci/hotplug/fakephp.c linux-2.6.32.7/drivers/pci/hotplug/fakephp.c ---- linux-2.6.32.7/drivers/pci/hotplug/fakephp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/hotplug/fakephp.c 2010-01-25 17:39:40.571411517 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/hotplug/fakephp.c linux-2.6.32.9/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/hotplug/fakephp.c 2010-02-23 17:09:53.208535454 -0500 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -24279,9 +24725,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/fakephp.c linux-2.6.32.7/drivers/p .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.32.7/drivers/pci/intel-iommu.c linux-2.6.32.7/drivers/pci/intel-iommu.c ---- linux-2.6.32.7/drivers/pci/intel-iommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/intel-iommu.c 2010-01-25 17:39:40.572167277 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/intel-iommu.c linux-2.6.32.9/drivers/pci/intel-iommu.c +--- linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/intel-iommu.c 2010-02-23 17:09:53.208535454 -0500 @@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de return !dma_addr; } @@ -24291,9 +24737,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/intel-iommu.c linux-2.6.32.7/drivers/pci/i .alloc_coherent = intel_alloc_coherent, .free_coherent = intel_free_coherent, .map_sg = intel_map_sg, -diff -urNp linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c 2010-01-25 17:39:40.572167277 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/pcie/portdrv_pci.c 2010-02-23 17:09:53.208535454 -0500 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -24303,9 +24749,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.7/drivers/ }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.32.7/drivers/pci/proc.c linux-2.6.32.7/drivers/pci/proc.c ---- linux-2.6.32.7/drivers/pci/proc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/proc.c 2010-01-25 17:39:40.572167277 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/proc.c linux-2.6.32.9/drivers/pci/proc.c +--- linux-2.6.32.9/drivers/pci/proc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/proc.c 2010-02-23 17:09:53.208535454 -0500 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -24323,9 +24769,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/proc.c linux-2.6.32.7/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.7/drivers/pci/slot.c linux-2.6.32.7/drivers/pci/slot.c ---- linux-2.6.32.7/drivers/pci/slot.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pci/slot.c 2010-01-25 17:39:40.572167277 -0500 +diff -urNp linux-2.6.32.9/drivers/pci/slot.c linux-2.6.32.9/drivers/pci/slot.c +--- linux-2.6.32.9/drivers/pci/slot.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pci/slot.c 2010-02-23 17:09:53.208535454 -0500 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -24335,9 +24781,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/slot.c linux-2.6.32.7/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.32.7/drivers/pcmcia/ti113x.h linux-2.6.32.7/drivers/pcmcia/ti113x.h ---- linux-2.6.32.7/drivers/pcmcia/ti113x.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pcmcia/ti113x.h 2010-01-25 17:39:40.573121845 -0500 +diff -urNp linux-2.6.32.9/drivers/pcmcia/ti113x.h linux-2.6.32.9/drivers/pcmcia/ti113x.h +--- linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pcmcia/ti113x.h 2010-02-23 17:09:53.208535454 -0500 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), @@ -24347,9 +24793,9 @@ diff -urNp linux-2.6.32.7/drivers/pcmcia/ti113x.h linux-2.6.32.7/drivers/pcmcia/ }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.32.7/drivers/pcmcia/yenta_socket.c linux-2.6.32.7/drivers/pcmcia/yenta_socket.c ---- linux-2.6.32.7/drivers/pcmcia/yenta_socket.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pcmcia/yenta_socket.c 2010-01-25 17:39:40.573121845 -0500 +diff -urNp linux-2.6.32.9/drivers/pcmcia/yenta_socket.c linux-2.6.32.9/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pcmcia/yenta_socket.c 2010-02-23 17:09:53.208535454 -0500 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -24359,9 +24805,9 @@ diff -urNp linux-2.6.32.7/drivers/pcmcia/yenta_socket.c linux-2.6.32.7/drivers/p }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.32.7/drivers/platform/x86/acer-wmi.c linux-2.6.32.7/drivers/platform/x86/acer-wmi.c ---- linux-2.6.32.7/drivers/platform/x86/acer-wmi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/acer-wmi.c 2010-01-25 17:39:40.573121845 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/acer-wmi.c linux-2.6.32.9/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/acer-wmi.c 2010-02-23 17:09:53.208535454 -0500 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -24371,9 +24817,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/acer-wmi.c linux-2.6.32.7/drivers .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/asus_acpi.c linux-2.6.32.7/drivers/platform/x86/asus_acpi.c ---- linux-2.6.32.7/drivers/platform/x86/asus_acpi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/asus_acpi.c 2010-01-25 17:39:40.573121845 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/asus_acpi.c linux-2.6.32.9/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/asus_acpi.c 2010-02-23 17:09:53.212539101 -0500 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -24383,9 +24829,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/asus_acpi.c linux-2.6.32.7/driver .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/asus-laptop.c linux-2.6.32.7/drivers/platform/x86/asus-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/asus-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/asus-laptop.c 2010-01-25 17:39:40.574409071 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/asus-laptop.c linux-2.6.32.9/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/asus-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac */ static int read_brightness(struct backlight_device *bd); @@ -24395,9 +24841,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/asus-laptop.c linux-2.6.32.7/driv .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/compal-laptop.c linux-2.6.32.7/drivers/platform/x86/compal-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/compal-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/compal-laptop.c 2010-01-25 17:39:40.574409071 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/compal-laptop.c linux-2.6.32.9/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/compal-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -24407,9 +24853,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/compal-laptop.c linux-2.6.32.7/dr .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/dell-laptop.c linux-2.6.32.7/drivers/platform/x86/dell-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/dell-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/dell-laptop.c 2010-01-25 17:39:40.574409071 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/dell-laptop.c linux-2.6.32.9/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/dell-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -24419,9 +24865,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/dell-laptop.c linux-2.6.32.7/driv .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c 2010-01-25 17:39:40.574409071 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/eeepc-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); @@ -24431,9 +24877,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.7/dri .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c 2010-01-25 17:39:40.575240739 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/fujitsu-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -24443,9 +24889,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.7/d .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/msi-laptop.c linux-2.6.32.7/drivers/platform/x86/msi-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/msi-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/msi-laptop.c 2010-01-25 17:39:40.575240739 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/msi-laptop.c linux-2.6.32.9/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/msi-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -24455,9 +24901,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/msi-laptop.c linux-2.6.32.7/drive .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c 2010-01-25 17:39:40.575240739 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/panasonic-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -24467,9 +24913,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.7 .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/sony-laptop.c linux-2.6.32.7/drivers/platform/x86/sony-laptop.c ---- linux-2.6.32.7/drivers/platform/x86/sony-laptop.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/sony-laptop.c 2010-01-25 17:39:40.576099323 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/sony-laptop.c linux-2.6.32.9/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/sony-laptop.c 2010-02-23 17:09:53.212539101 -0500 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -24479,9 +24925,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/sony-laptop.c linux-2.6.32.7/driv .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c 2010-01-25 17:39:40.577261614 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/thinkpad_acpi.c 2010-02-23 17:09:53.212539101 -0500 @@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig return status & TP_EC_BACKLIGHT_LVLMSK; } @@ -24491,9 +24937,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.7/dr .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c 2010-01-25 17:39:40.577261614 -0500 +diff -urNp linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/platform/x86/toshiba_acpi.c 2010-02-23 17:09:53.212539101 -0500 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -24503,9 +24949,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.7/dri .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c 2010-01-25 17:39:40.577261614 -0500 +diff -urNp linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pnp/pnpbios/bioscalls.c 2010-02-23 17:09:53.212539101 -0500 @@ -60,7 +60,7 @@ do { \ set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) @@ -24562,9 +25008,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.7/drivers + + pax_close_kernel(); } -diff -urNp linux-2.6.32.7/drivers/pnp/quirks.c linux-2.6.32.7/drivers/pnp/quirks.c ---- linux-2.6.32.7/drivers/pnp/quirks.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pnp/quirks.c 2010-01-25 17:39:40.578276325 -0500 +diff -urNp linux-2.6.32.9/drivers/pnp/quirks.c linux-2.6.32.9/drivers/pnp/quirks.c +--- linux-2.6.32.9/drivers/pnp/quirks.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pnp/quirks.c 2010-02-23 17:09:53.212539101 -0500 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -24574,9 +25020,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/quirks.c linux-2.6.32.7/drivers/pnp/quirks }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.32.7/drivers/pnp/resource.c linux-2.6.32.7/drivers/pnp/resource.c ---- linux-2.6.32.7/drivers/pnp/resource.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/pnp/resource.c 2010-01-25 17:39:40.578276325 -0500 +diff -urNp linux-2.6.32.9/drivers/pnp/resource.c linux-2.6.32.9/drivers/pnp/resource.c +--- linux-2.6.32.9/drivers/pnp/resource.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/pnp/resource.c 2010-02-23 17:09:53.212539101 -0500 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -24595,9 +25041,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/resource.c linux-2.6.32.7/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.c linux-2.6.32.7/drivers/s390/cio/qdio_perf.c ---- linux-2.6.32.7/drivers/s390/cio/qdio_perf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/s390/cio/qdio_perf.c 2010-01-25 17:39:40.578276325 -0500 +diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.c linux-2.6.32.9/drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.c 2010-02-23 17:09:53.216464462 -0500 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ static int qdio_perf_proc_show(struct seq_file *m, void *v) { @@ -24673,9 +25119,9 @@ diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.c linux-2.6.32.7/drivers/s3 seq_printf(m, "\n"); return 0; } -diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.h linux-2.6.32.7/drivers/s390/cio/qdio_perf.h ---- linux-2.6.32.7/drivers/s390/cio/qdio_perf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/s390/cio/qdio_perf.h 2010-01-25 17:39:40.578276325 -0500 +diff -urNp linux-2.6.32.9/drivers/s390/cio/qdio_perf.h linux-2.6.32.9/drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/s390/cio/qdio_perf.h 2010-02-23 17:09:53.216464462 -0500 @@ -13,46 +13,46 @@ struct qdio_perf_stats { @@ -24748,9 +25194,9 @@ diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.h linux-2.6.32.7/drivers/s3 } int qdio_setup_perf_stats(void); -diff -urNp linux-2.6.32.7/drivers/scsi/ipr.c linux-2.6.32.7/drivers/scsi/ipr.c ---- linux-2.6.32.7/drivers/scsi/ipr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/scsi/ipr.c 2010-01-25 17:39:40.633265236 -0500 +diff -urNp linux-2.6.32.9/drivers/scsi/ipr.c linux-2.6.32.9/drivers/scsi/ipr.c +--- linux-2.6.32.9/drivers/scsi/ipr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/scsi/ipr.c 2010-02-23 17:09:53.216464462 -0500 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -24760,9 +25206,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/ipr.c linux-2.6.32.7/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.7/drivers/scsi/libfc/fc_exch.c linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c 2010-01-25 17:39:40.659100572 -0500 +diff -urNp linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/scsi/libfc/fc_exch.c 2010-02-23 17:09:53.216464462 -0500 @@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -24884,9 +25330,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c linux-2.6.32.7/drivers/sc fc_frame_free(fp); } -diff -urNp linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c 2010-01-25 17:39:40.660412281 -0500 +diff -urNp linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/scsi/libsas/sas_ata.c 2010-02-23 17:09:53.216464462 -0500 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -24896,9 +25342,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c linux-2.6.32.7/drivers/s .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.32.7/drivers/scsi/scsi_logging.h linux-2.6.32.7/drivers/scsi/scsi_logging.h ---- linux-2.6.32.7/drivers/scsi/scsi_logging.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/scsi/scsi_logging.h 2010-01-25 17:39:40.671315332 -0500 +diff -urNp linux-2.6.32.9/drivers/scsi/scsi_logging.h linux-2.6.32.9/drivers/scsi/scsi_logging.h +--- linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/scsi/scsi_logging.h 2010-02-23 17:09:53.216464462 -0500 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -24908,9 +25354,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/scsi_logging.h linux-2.6.32.7/drivers/scs #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.32.7/drivers/scsi/sg.c linux-2.6.32.7/drivers/scsi/sg.c ---- linux-2.6.32.7/drivers/scsi/sg.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/scsi/sg.c 2010-01-25 17:39:40.690253312 -0500 +diff -urNp linux-2.6.32.9/drivers/scsi/sg.c linux-2.6.32.9/drivers/scsi/sg.c +--- linux-2.6.32.9/drivers/scsi/sg.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/scsi/sg.c 2010-02-23 17:09:53.216464462 -0500 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf { const struct file_operations * fops; }; @@ -24929,9 +25375,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/sg.c linux-2.6.32.7/drivers/scsi/sg.c sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); if (!sg_proc_sgp) -diff -urNp linux-2.6.32.7/drivers/serial/8250_pci.c linux-2.6.32.7/drivers/serial/8250_pci.c ---- linux-2.6.32.7/drivers/serial/8250_pci.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/serial/8250_pci.c 2010-01-25 17:39:40.691334412 -0500 +diff -urNp linux-2.6.32.9/drivers/serial/8250_pci.c linux-2.6.32.9/drivers/serial/8250_pci.c +--- linux-2.6.32.9/drivers/serial/8250_pci.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/serial/8250_pci.c 2010-02-23 17:09:53.216464462 -0500 @@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -24941,9 +25387,9 @@ diff -urNp linux-2.6.32.7/drivers/serial/8250_pci.c linux-2.6.32.7/drivers/seria }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.32.7/drivers/serial/kgdboc.c linux-2.6.32.7/drivers/serial/kgdboc.c ---- linux-2.6.32.7/drivers/serial/kgdboc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/serial/kgdboc.c 2010-01-25 17:39:40.691334412 -0500 +diff -urNp linux-2.6.32.9/drivers/serial/kgdboc.c linux-2.6.32.9/drivers/serial/kgdboc.c +--- linux-2.6.32.9/drivers/serial/kgdboc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/serial/kgdboc.c 2010-02-23 17:09:53.216464462 -0500 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -24962,9 +25408,9 @@ diff -urNp linux-2.6.32.7/drivers/serial/kgdboc.c linux-2.6.32.7/drivers/serial/ .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.32.7/drivers/staging/android/binder.c linux-2.6.32.7/drivers/staging/android/binder.c ---- linux-2.6.32.7/drivers/staging/android/binder.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/android/binder.c 2010-01-25 17:39:40.720250683 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/android/binder.c linux-2.6.32.9/drivers/staging/android/binder.c +--- linux-2.6.32.9/drivers/staging/android/binder.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/android/binder.c 2010-02-23 17:09:53.216464462 -0500 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -24974,9 +25420,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/android/binder.c linux-2.6.32.7/driver .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c 2010-01-25 17:39:40.721352667 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/b3dfg/b3dfg.c 2010-02-23 17:09:53.220509464 -0500 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -24995,9 +25441,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.7/drivers/s .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c 2010-01-25 17:39:40.721352667 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/comedi/comedi_fops.c 2010-02-23 17:09:53.220509464 -0500 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -25007,9 +25453,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c linux-2.6.32.7/dr .close = comedi_unmap, }; -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-01-25 17:39:40.721352667 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-23 17:09:53.220509464 -0500 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi static dev_t adsp_devno; static struct class *adsp_class; @@ -25019,9 +25465,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32 .owner = THIS_MODULE, .open = adsp_open, .unlocked_ioctl = adsp_ioctl, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-01-25 17:39:40.722422728 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-23 17:09:53.220509464 -0500 @@ -1022,7 +1022,7 @@ done: return rc; } @@ -25031,9 +25477,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.7 .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-01-25 17:39:40.722422728 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-23 17:09:53.220509464 -0500 @@ -833,7 +833,7 @@ done: return rc; } @@ -25043,9 +25489,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32 .owner = THIS_MODULE, .open = audamrnb_open, .release = audamrnb_release, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-23 17:09:53.220509464 -0500 @@ -805,7 +805,7 @@ dma_fail: return rc; } @@ -25055,9 +25501,9 @@ diff -urNp linux-2.6.32.7/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.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_in.c 2010-02-23 17:09:53.220509464 -0500 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino return 0; } @@ -25076,9 +25522,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.7/ .owner = THIS_MODULE, .open = audpre_open, .unlocked_ioctl = audpre_ioctl, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-23 17:09:53.220509464 -0500 @@ -941,7 +941,7 @@ done: return rc; } @@ -25088,9 +25534,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.7 .owner = THIS_MODULE, .open = audio_open, .release = audio_release, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_out.c 2010-02-23 17:09:53.220509464 -0500 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod return 0; } @@ -25109,9 +25555,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.7 .owner = THIS_MODULE, .open = audpp_open, .unlocked_ioctl = audpp_ioctl, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-23 17:09:53.220509464 -0500 @@ -816,7 +816,7 @@ err: return rc; } @@ -25121,9 +25567,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32 .owner = THIS_MODULE, .open = audqcelp_open, .release = audqcelp_release, -diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c ---- linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c 2010-01-25 17:39:40.723151138 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/qdsp5/snd.c 2010-02-23 17:09:53.220509464 -0500 @@ -242,7 +242,7 @@ err: return rc; } @@ -25133,9 +25579,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.7/drive .owner = THIS_MODULE, .open = snd_open, .release = snd_release, -diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c ---- linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c 2010-01-25 17:39:40.724416092 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/smd/smd_qmi.c 2010-02-23 17:09:53.220509464 -0500 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, return 0; } @@ -25145,9 +25591,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.7/dri .owner = THIS_MODULE, .read = qmi_read, .write = qmi_write, -diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c ---- linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-01-25 17:39:40.724416092 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-23 17:09:53.220509464 -0500 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file return rc; } @@ -25166,9 +25612,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c linux .owner = THIS_MODULE, .open = rpcrouter_open, .release = rpcrouter_release, -diff -urNp linux-2.6.32.7/drivers/staging/dst/dcore.c linux-2.6.32.7/drivers/staging/dst/dcore.c ---- linux-2.6.32.7/drivers/staging/dst/dcore.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dst/dcore.c 2010-01-25 17:39:40.724416092 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dst/dcore.c linux-2.6.32.9/drivers/staging/dst/dcore.c +--- linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dst/dcore.c 2010-02-23 17:09:53.220509464 -0500 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi return 0; } @@ -25187,9 +25633,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dst/dcore.c linux-2.6.32.7/drivers/sta snprintf(n->name, sizeof(n->name), "%s", ctl->name); err = dst_node_sysfs_init(n); -diff -urNp linux-2.6.32.7/drivers/staging/dst/trans.c linux-2.6.32.7/drivers/staging/dst/trans.c ---- linux-2.6.32.7/drivers/staging/dst/trans.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/dst/trans.c 2010-01-25 17:39:40.725262561 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/dst/trans.c linux-2.6.32.9/drivers/staging/dst/trans.c +--- linux-2.6.32.9/drivers/staging/dst/trans.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/dst/trans.c 2010-02-23 17:09:53.220509464 -0500 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, t->error = 0; t->retries = 0; @@ -25199,9 +25645,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dst/trans.c linux-2.6.32.7/drivers/sta t->enc = bio_data_dir(bio); dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); -diff -urNp linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c 2010-01-25 17:39:40.725262561 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/go7007/go7007-v4l2.c 2010-02-23 17:09:53.220509464 -0500 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -25211,9 +25657,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.7/dr .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c ---- linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c 2010-01-25 17:39:40.725262561 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/hv/blkvsc_drv.c 2010-02-23 17:09:53.220509464 -0500 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; @@ -25223,9 +25669,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.7/drivers .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, -diff -urNp linux-2.6.32.7/drivers/staging/panel/panel.c linux-2.6.32.7/drivers/staging/panel/panel.c ---- linux-2.6.32.7/drivers/staging/panel/panel.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/panel/panel.c 2010-01-25 17:39:40.726187847 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/panel/panel.c linux-2.6.32.9/drivers/staging/panel/panel.c +--- linux-2.6.32.9/drivers/staging/panel/panel.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/panel/panel.c 2010-02-23 17:09:53.224545810 -0500 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -25244,9 +25690,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/panel/panel.c linux-2.6.32.7/drivers/s .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.32.7/drivers/staging/phison/phison.c linux-2.6.32.7/drivers/staging/phison/phison.c ---- linux-2.6.32.7/drivers/staging/phison/phison.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/phison/phison.c 2010-01-25 17:39:40.726187847 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/phison/phison.c linux-2.6.32.9/drivers/staging/phison/phison.c +--- linux-2.6.32.9/drivers/staging/phison/phison.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/phison/phison.c 2010-02-23 17:09:53.224545810 -0500 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -25256,9 +25702,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/phison/phison.c linux-2.6.32.7/drivers .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.32.7/drivers/staging/poch/poch.c linux-2.6.32.7/drivers/staging/poch/poch.c ---- linux-2.6.32.7/drivers/staging/poch/poch.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/poch/poch.c 2010-01-25 17:39:40.726187847 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/poch/poch.c linux-2.6.32.9/drivers/staging/poch/poch.c +--- linux-2.6.32.9/drivers/staging/poch/poch.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/poch/poch.c 2010-02-23 17:09:53.224545810 -0500 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -25268,9 +25714,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/poch/poch.c linux-2.6.32.7/drivers/sta .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/inode.c linux-2.6.32.7/drivers/staging/pohmelfs/inode.c ---- linux-2.6.32.7/drivers/staging/pohmelfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/pohmelfs/inode.c 2010-01-25 17:39:40.728423487 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/inode.c linux-2.6.32.9/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/pohmelfs/inode.c 2010-02-23 17:09:53.224545810 -0500 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su mutex_init(&psb->mcache_lock); psb->mcache_root = RB_ROOT; @@ -25280,9 +25726,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/inode.c linux-2.6.32.7/driver psb->trans_max_pages = 100; -diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c ---- linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c 2010-01-25 17:39:40.728423487 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/pohmelfs/mcache.c 2010-02-23 17:09:53.224545810 -0500 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ m->data = data; m->start = start; @@ -25292,9 +25738,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c linux-2.6.32.7/drive mutex_lock(&psb->mcache_lock); err = pohmelfs_mcache_insert(psb, m); -diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h ---- linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h 2010-01-25 17:39:40.729274682 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/pohmelfs/netfs.h 2010-02-23 17:09:53.224545810 -0500 @@ -570,7 +570,7 @@ struct pohmelfs_config; struct pohmelfs_sb { struct rb_root mcache_root; @@ -25304,9 +25750,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h linux-2.6.32.7/driver unsigned long mcache_timeout; unsigned int idx; -diff -urNp linux-2.6.32.7/drivers/staging/sep/sep_driver.c linux-2.6.32.7/drivers/staging/sep/sep_driver.c ---- linux-2.6.32.7/drivers/staging/sep/sep_driver.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/sep/sep_driver.c 2010-01-25 17:39:40.741285423 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/sep/sep_driver.c linux-2.6.32.9/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/sep/sep_driver.c 2010-02-23 17:09:53.224545810 -0500 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver static dev_t sep_devno; @@ -25316,9 +25762,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/sep/sep_driver.c linux-2.6.32.7/driver .owner = THIS_MODULE, .ioctl = sep_ioctl, .poll = sep_poll, -diff -urNp linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c ---- linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c 2010-01-25 17:39:40.741285423 -0500 +diff -urNp linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/staging/vme/devices/vme_user.c 2010-02-23 17:09:53.224545810 -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); @@ -25328,9 +25774,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c linux-2.6.32.7/ .open = vme_user_open, .release = vme_user_release, .read = vme_user_read, -diff -urNp linux-2.6.32.7/drivers/uio/uio.c linux-2.6.32.7/drivers/uio/uio.c ---- linux-2.6.32.7/drivers/uio/uio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/uio/uio.c 2010-01-25 17:39:40.741285423 -0500 +diff -urNp linux-2.6.32.9/drivers/uio/uio.c linux-2.6.32.9/drivers/uio/uio.c +--- linux-2.6.32.9/drivers/uio/uio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/uio/uio.c 2010-02-23 17:09:53.224545810 -0500 @@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -25349,9 +25795,9 @@ diff -urNp linux-2.6.32.7/drivers/uio/uio.c linux-2.6.32.7/drivers/uio/uio.c .show = portio_type_show, }; -diff -urNp linux-2.6.32.7/drivers/usb/atm/usbatm.c linux-2.6.32.7/drivers/usb/atm/usbatm.c ---- linux-2.6.32.7/drivers/usb/atm/usbatm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/atm/usbatm.c 2010-01-25 17:39:40.762117232 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/atm/usbatm.c linux-2.6.32.9/drivers/usb/atm/usbatm.c +--- linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/atm/usbatm.c 2010-02-23 17:09:53.258048533 -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", @@ -25431,9 +25877,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/atm/usbatm.c linux-2.6.32.7/drivers/usb/at if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.32.7/drivers/usb/class/cdc-acm.c linux-2.6.32.7/drivers/usb/class/cdc-acm.c ---- linux-2.6.32.7/drivers/usb/class/cdc-acm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/class/cdc-acm.c 2010-01-25 17:39:40.768399993 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/class/cdc-acm.c linux-2.6.32.9/drivers/usb/class/cdc-acm.c +--- linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/class/cdc-acm.c 2010-02-23 17:09:53.258048533 -0500 @@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -25443,9 +25889,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/class/cdc-acm.c linux-2.6.32.7/drivers/usb }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.32.7/drivers/usb/class/usblp.c linux-2.6.32.7/drivers/usb/class/usblp.c ---- linux-2.6.32.7/drivers/usb/class/usblp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/class/usblp.c 2010-01-25 17:39:40.770313910 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/class/usblp.c linux-2.6.32.9/drivers/usb/class/usblp.c +--- linux-2.6.32.9/drivers/usb/class/usblp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/class/usblp.c 2010-02-23 17:09:53.258048533 -0500 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -25464,9 +25910,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/class/usblp.c linux-2.6.32.7/drivers/usb/c }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.c linux-2.6.32.7/drivers/usb/core/hcd.c ---- linux-2.6.32.7/drivers/usb/core/hcd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/core/hcd.c 2010-01-25 17:39:40.788423758 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.c linux-2.6.32.9/drivers/usb/core/hcd.c +--- linux-2.6.32.9/drivers/usb/core/hcd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/core/hcd.c 2010-02-23 17:09:53.258048533 -0500 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -25485,9 +25931,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.c linux-2.6.32.7/drivers/usb/core { if (mon_ops) -diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.h linux-2.6.32.7/drivers/usb/core/hcd.h ---- linux-2.6.32.7/drivers/usb/core/hcd.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/core/hcd.h 2010-01-25 17:39:40.789414516 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/core/hcd.h linux-2.6.32.9/drivers/usb/core/hcd.h +--- linux-2.6.32.9/drivers/usb/core/hcd.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/core/hcd.h 2010-02-23 17:09:53.258048533 -0500 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -25515,9 +25961,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.h linux-2.6.32.7/drivers/usb/core void usb_mon_deregister(void); #else -diff -urNp linux-2.6.32.7/drivers/usb/core/hub.c linux-2.6.32.7/drivers/usb/core/hub.c ---- linux-2.6.32.7/drivers/usb/core/hub.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/core/hub.c 2010-01-25 17:39:40.793419392 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/core/hub.c linux-2.6.32.9/drivers/usb/core/hub.c +--- linux-2.6.32.9/drivers/usb/core/hub.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/core/hub.c 2010-02-23 17:09:53.260755480 -0500 @@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -25527,9 +25973,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hub.c linux-2.6.32.7/drivers/usb/core }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.32.7/drivers/usb/core/message.c linux-2.6.32.7/drivers/usb/core/message.c ---- linux-2.6.32.7/drivers/usb/core/message.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/core/message.c 2010-01-25 17:54:24.735173702 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/core/message.c linux-2.6.32.9/drivers/usb/core/message.c +--- linux-2.6.32.9/drivers/usb/core/message.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/core/message.c 2010-02-23 17:09:53.260755480 -0500 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); if (buf) { @@ -25541,9 +25987,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/message.c linux-2.6.32.7/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.32.7/drivers/usb/host/ehci-pci.c linux-2.6.32.7/drivers/usb/host/ehci-pci.c ---- linux-2.6.32.7/drivers/usb/host/ehci-pci.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/host/ehci-pci.c 2010-01-25 17:39:40.795294801 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/host/ehci-pci.c linux-2.6.32.9/drivers/usb/host/ehci-pci.c +--- linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/host/ehci-pci.c 2010-02-23 17:09:53.260755480 -0500 @@ -422,7 +422,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .driver_data = (unsigned long) &ehci_pci_hc_driver, @@ -25553,9 +25999,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/host/ehci-pci.c linux-2.6.32.7/drivers/usb }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.32.7/drivers/usb/host/uhci-hcd.c linux-2.6.32.7/drivers/usb/host/uhci-hcd.c ---- linux-2.6.32.7/drivers/usb/host/uhci-hcd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/host/uhci-hcd.c 2010-01-25 17:39:40.806137594 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/host/uhci-hcd.c linux-2.6.32.9/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/host/uhci-hcd.c 2010-02-23 17:09:53.260755480 -0500 @@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -25565,9 +26011,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/host/uhci-hcd.c linux-2.6.32.7/drivers/usb }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.32.7/drivers/usb/misc/appledisplay.c linux-2.6.32.7/drivers/usb/misc/appledisplay.c ---- linux-2.6.32.7/drivers/usb/misc/appledisplay.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/misc/appledisplay.c 2010-01-25 17:39:40.812417415 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/misc/appledisplay.c linux-2.6.32.9/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/misc/appledisplay.c 2010-02-23 17:09:53.260755480 -0500 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -25577,9 +26023,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/misc/appledisplay.c linux-2.6.32.7/drivers .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/usb/mon/mon_main.c linux-2.6.32.7/drivers/usb/mon/mon_main.c ---- linux-2.6.32.7/drivers/usb/mon/mon_main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/mon/mon_main.c 2010-01-25 17:39:40.813096797 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/mon/mon_main.c linux-2.6.32.9/drivers/usb/mon/mon_main.c +--- linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/mon/mon_main.c 2010-02-23 17:09:53.260755480 -0500 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -25589,9 +26035,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/mon/mon_main.c linux-2.6.32.7/drivers/usb/ .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.32.7/drivers/usb/storage/debug.h linux-2.6.32.7/drivers/usb/storage/debug.h ---- linux-2.6.32.7/drivers/usb/storage/debug.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/storage/debug.h 2010-01-25 17:39:40.821350825 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/storage/debug.h linux-2.6.32.9/drivers/usb/storage/debug.h +--- linux-2.6.32.9/drivers/usb/storage/debug.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/storage/debug.h 2010-02-23 17:09:53.260755480 -0500 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -25605,9 +26051,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/debug.h linux-2.6.32.7/drivers/usb #endif #endif -diff -urNp linux-2.6.32.7/drivers/usb/storage/usb.c linux-2.6.32.7/drivers/usb/storage/usb.c ---- linux-2.6.32.7/drivers/usb/storage/usb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/storage/usb.c 2010-01-25 17:39:40.827952779 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/storage/usb.c linux-2.6.32.9/drivers/usb/storage/usb.c +--- linux-2.6.32.9/drivers/usb/storage/usb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/storage/usb.c 2010-02-23 17:09:53.260755480 -0500 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -25617,9 +26063,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/usb.c linux-2.6.32.7/drivers/usb/s }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.32.7/drivers/usb/storage/usual-tables.c linux-2.6.32.7/drivers/usb/storage/usual-tables.c ---- linux-2.6.32.7/drivers/usb/storage/usual-tables.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/usb/storage/usual-tables.c 2010-01-25 17:39:40.828430890 -0500 +diff -urNp linux-2.6.32.9/drivers/usb/storage/usual-tables.c linux-2.6.32.9/drivers/usb/storage/usual-tables.c +--- linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/usb/storage/usual-tables.c 2010-02-23 17:09:53.260755480 -0500 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -25629,9 +26075,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/usual-tables.c linux-2.6.32.7/driv }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.32.7/drivers/uwb/wlp/messages.c linux-2.6.32.7/drivers/uwb/wlp/messages.c ---- linux-2.6.32.7/drivers/uwb/wlp/messages.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/uwb/wlp/messages.c 2010-01-25 17:39:40.828430890 -0500 +diff -urNp linux-2.6.32.9/drivers/uwb/wlp/messages.c linux-2.6.32.9/drivers/uwb/wlp/messages.c +--- linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/uwb/wlp/messages.c 2010-02-23 17:09:53.260755480 -0500 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -25641,9 +26087,9 @@ diff -urNp linux-2.6.32.7/drivers/uwb/wlp/messages.c linux-2.6.32.7/drivers/uwb/ enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.32.7/drivers/uwb/wlp/sysfs.c linux-2.6.32.7/drivers/uwb/wlp/sysfs.c ---- linux-2.6.32.7/drivers/uwb/wlp/sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/uwb/wlp/sysfs.c 2010-01-25 17:39:40.828430890 -0500 +diff -urNp linux-2.6.32.9/drivers/uwb/wlp/sysfs.c linux-2.6.32.9/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/uwb/wlp/sysfs.c 2010-02-23 17:09:53.263724942 -0500 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -25654,9 +26100,9 @@ diff -urNp linux-2.6.32.7/drivers/uwb/wlp/sysfs.c linux-2.6.32.7/drivers/uwb/wlp .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.32.7/drivers/video/atmel_lcdfb.c linux-2.6.32.7/drivers/video/atmel_lcdfb.c ---- linux-2.6.32.7/drivers/video/atmel_lcdfb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/atmel_lcdfb.c 2010-01-25 17:39:40.829417445 -0500 +diff -urNp linux-2.6.32.9/drivers/video/atmel_lcdfb.c linux-2.6.32.9/drivers/video/atmel_lcdfb.c +--- linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/atmel_lcdfb.c 2010-02-23 17:09:53.263724942 -0500 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -25666,9 +26112,9 @@ diff -urNp linux-2.6.32.7/drivers/video/atmel_lcdfb.c linux-2.6.32.7/drivers/vid .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/aty/aty128fb.c linux-2.6.32.7/drivers/video/aty/aty128fb.c ---- linux-2.6.32.7/drivers/video/aty/aty128fb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/aty/aty128fb.c 2010-01-25 17:39:40.829417445 -0500 +diff -urNp linux-2.6.32.9/drivers/video/aty/aty128fb.c linux-2.6.32.9/drivers/video/aty/aty128fb.c +--- linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/aty/aty128fb.c 2010-02-23 17:09:53.263724942 -0500 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -25678,9 +26124,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/aty128fb.c linux-2.6.32.7/drivers/vi .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/aty/atyfb_base.c linux-2.6.32.7/drivers/video/aty/atyfb_base.c ---- linux-2.6.32.7/drivers/video/aty/atyfb_base.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/aty/atyfb_base.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/aty/atyfb_base.c linux-2.6.32.9/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/aty/atyfb_base.c 2010-02-23 17:09:53.263724942 -0500 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -25690,9 +26136,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/atyfb_base.c linux-2.6.32.7/drivers/ .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/aty/radeon_backlight.c linux-2.6.32.7/drivers/video/aty/radeon_backlight.c ---- linux-2.6.32.7/drivers/video/aty/radeon_backlight.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/aty/radeon_backlight.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/aty/radeon_backlight.c linux-2.6.32.9/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/aty/radeon_backlight.c 2010-02-23 17:09:53.263724942 -0500 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -25702,9 +26148,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/radeon_backlight.c linux-2.6.32.7/dr .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c ---- linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/adp5520_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str return error ? data->current_brightness : reg_val; } @@ -25714,9 +26160,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c linux-2.6.32.7/dr .update_status = adp5520_bl_update_status, .get_brightness = adp5520_bl_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/adx_bl.c linux-2.6.32.7/drivers/video/backlight/adx_bl.c ---- linux-2.6.32.7/drivers/video/backlight/adx_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/adx_bl.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/adx_bl.c linux-2.6.32.9/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/adx_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct return 1; } @@ -25726,9 +26172,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/adx_bl.c linux-2.6.32.7/driver .options = 0, .update_status = adx_backlight_update_status, .get_brightness = adx_backlight_get_brightness, -diff -urNp linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/atmel-pwm-bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -25738,9 +26184,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.7/ .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/backlight.c linux-2.6.32.7/drivers/video/backlight/backlight.c ---- linux-2.6.32.7/drivers/video/backlight/backlight.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/backlight.c 2010-01-25 17:39:40.830417520 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/backlight.c linux-2.6.32.9/drivers/video/backlight/backlight.c +--- linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/backlight.c 2010-02-23 17:09:53.263724942 -0500 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ @@ -25750,9 +26196,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/backlight.c linux-2.6.32.7/dri { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c 2010-01-25 17:39:40.831420408 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/corgi_lcd.c 2010-02-23 17:09:53.263724942 -0500 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -25762,9 +26208,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c linux-2.6.32.7/dri .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c 2010-01-25 17:39:40.831420408 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/cr_bllcd.c 2010-02-23 17:09:53.263724942 -0500 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -25774,9 +26220,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c linux-2.6.32.7/driv .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/da903x_bl.c linux-2.6.32.7/drivers/video/backlight/da903x_bl.c ---- linux-2.6.32.7/drivers/video/backlight/da903x_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/da903x_bl.c 2010-01-25 17:39:40.831420408 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/da903x_bl.c linux-2.6.32.9/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/da903x_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -25786,9 +26232,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/da903x_bl.c linux-2.6.32.7/dri .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/generic_bl.c linux-2.6.32.7/drivers/video/backlight/generic_bl.c ---- linux-2.6.32.7/drivers/video/backlight/generic_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/generic_bl.c 2010-01-25 17:39:40.831420408 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/generic_bl.c linux-2.6.32.9/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/generic_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -25798,9 +26244,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/generic_bl.c linux-2.6.32.7/dr .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.32.7/drivers/video/backlight/hp680_bl.c linux-2.6.32.7/drivers/video/backlight/hp680_bl.c ---- linux-2.6.32.7/drivers/video/backlight/hp680_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/hp680_bl.c 2010-01-25 17:39:40.831420408 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/hp680_bl.c linux-2.6.32.9/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/hp680_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -25810,9 +26256,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/hp680_bl.c linux-2.6.32.7/driv .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/jornada720_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -93,7 +93,7 @@ out: return ret; } @@ -25822,9 +26268,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c linux-2.6.32.7 .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/kb3886_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -25834,9 +26280,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c linux-2.6.32.7/dri .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/locomolcd.c linux-2.6.32.7/drivers/video/backlight/locomolcd.c ---- linux-2.6.32.7/drivers/video/backlight/locomolcd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/locomolcd.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/locomolcd.c linux-2.6.32.9/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/locomolcd.c 2010-02-23 17:09:53.263724942 -0500 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -25846,9 +26292,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/locomolcd.c linux-2.6.32.7/dri .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -25858,9 +26304,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.7 }; /* Module parameters. */ -diff -urNp linux-2.6.32.7/drivers/video/backlight/omap1_bl.c linux-2.6.32.7/drivers/video/backlight/omap1_bl.c ---- linux-2.6.32.7/drivers/video/backlight/omap1_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/omap1_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/omap1_bl.c linux-2.6.32.9/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/omap1_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -25870,9 +26316,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/omap1_bl.c linux-2.6.32.7/driv .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/progear_bl.c linux-2.6.32.7/drivers/video/backlight/progear_bl.c ---- linux-2.6.32.7/drivers/video/backlight/progear_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/progear_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/progear_bl.c linux-2.6.32.9/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/progear_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -25882,9 +26328,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/progear_bl.c linux-2.6.32.7/dr .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/pwm_bl.c linux-2.6.32.7/drivers/video/backlight/pwm_bl.c ---- linux-2.6.32.7/drivers/video/backlight/pwm_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/pwm_bl.c 2010-01-25 17:39:40.832311620 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/pwm_bl.c linux-2.6.32.9/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/pwm_bl.c 2010-02-23 17:09:53.263724942 -0500 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -25894,9 +26340,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/pwm_bl.c linux-2.6.32.7/driver .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/tosa_bl.c linux-2.6.32.7/drivers/video/backlight/tosa_bl.c ---- linux-2.6.32.7/drivers/video/backlight/tosa_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/tosa_bl.c 2010-01-25 17:39:40.833395500 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/tosa_bl.c linux-2.6.32.9/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/tosa_bl.c 2010-02-23 17:09:53.268343828 -0500 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -25906,9 +26352,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/tosa_bl.c linux-2.6.32.7/drive .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c ---- linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c 2010-01-25 17:39:40.833395500 -0500 +diff -urNp linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/backlight/wm831x_bl.c 2010-02-23 17:09:53.268343828 -0500 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne return data->current_brightness; } @@ -25918,9 +26364,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c linux-2.6.32.7/dri .options = BL_CORE_SUSPENDRESUME, .update_status = wm831x_backlight_update_status, .get_brightness = wm831x_backlight_get_brightness, -diff -urNp linux-2.6.32.7/drivers/video/bf54x-lq043fb.c linux-2.6.32.7/drivers/video/bf54x-lq043fb.c ---- linux-2.6.32.7/drivers/video/bf54x-lq043fb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/bf54x-lq043fb.c 2010-01-25 17:39:40.833395500 -0500 +diff -urNp linux-2.6.32.9/drivers/video/bf54x-lq043fb.c linux-2.6.32.9/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/bf54x-lq043fb.c 2010-02-23 17:09:53.268343828 -0500 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -25930,9 +26376,9 @@ diff -urNp linux-2.6.32.7/drivers/video/bf54x-lq043fb.c linux-2.6.32.7/drivers/v .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c 2010-01-25 17:39:40.833395500 -0500 +diff -urNp linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/bfin-t350mcqb-fb.c 2010-02-23 17:09:53.268343828 -0500 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -25942,9 +26388,9 @@ diff -urNp linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.7/driver .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.32.7/drivers/video/fbmem.c linux-2.6.32.7/drivers/video/fbmem.c ---- linux-2.6.32.7/drivers/video/fbmem.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/fbmem.c 2010-01-25 17:39:40.834423162 -0500 +diff -urNp linux-2.6.32.9/drivers/video/fbmem.c linux-2.6.32.9/drivers/video/fbmem.c +--- linux-2.6.32.9/drivers/video/fbmem.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/fbmem.c 2010-02-23 17:09:53.268343828 -0500 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -25972,9 +26418,9 @@ diff -urNp linux-2.6.32.7/drivers/video/fbmem.c linux-2.6.32.7/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.32.7/drivers/video/fbmon.c linux-2.6.32.7/drivers/video/fbmon.c ---- linux-2.6.32.7/drivers/video/fbmon.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/fbmon.c 2010-01-25 17:39:40.834423162 -0500 +diff -urNp linux-2.6.32.9/drivers/video/fbmon.c linux-2.6.32.9/drivers/video/fbmon.c +--- linux-2.6.32.9/drivers/video/fbmon.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/fbmon.c 2010-02-23 17:09:53.268343828 -0500 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -25984,9 +26430,9 @@ diff -urNp linux-2.6.32.7/drivers/video/fbmon.c linux-2.6.32.7/drivers/video/fbm #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.32.7/drivers/video/i810/i810_accel.c linux-2.6.32.7/drivers/video/i810/i810_accel.c ---- linux-2.6.32.7/drivers/video/i810/i810_accel.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/i810/i810_accel.c 2010-01-25 17:39:40.835283316 -0500 +diff -urNp linux-2.6.32.9/drivers/video/i810/i810_accel.c linux-2.6.32.9/drivers/video/i810/i810_accel.c +--- linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/i810/i810_accel.c 2010-02-23 17:09:53.268343828 -0500 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -25995,9 +26441,9 @@ diff -urNp linux-2.6.32.7/drivers/video/i810/i810_accel.c linux-2.6.32.7/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.32.7/drivers/video/i810/i810_main.c linux-2.6.32.7/drivers/video/i810/i810_main.c ---- linux-2.6.32.7/drivers/video/i810/i810_main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/i810/i810_main.c 2010-01-25 17:39:40.835283316 -0500 +diff -urNp linux-2.6.32.9/drivers/video/i810/i810_main.c linux-2.6.32.9/drivers/video/i810/i810_main.c +--- linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/i810/i810_main.c 2010-02-23 17:09:53.268343828 -0500 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, @@ -26007,9 +26453,9 @@ diff -urNp linux-2.6.32.7/drivers/video/i810/i810_main.c linux-2.6.32.7/drivers/ }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.32.7/drivers/video/modedb.c linux-2.6.32.7/drivers/video/modedb.c ---- linux-2.6.32.7/drivers/video/modedb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/modedb.c 2010-01-25 17:39:40.836261121 -0500 +diff -urNp linux-2.6.32.9/drivers/video/modedb.c linux-2.6.32.9/drivers/video/modedb.c +--- linux-2.6.32.9/drivers/video/modedb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/modedb.c 2010-02-23 17:09:53.268343828 -0500 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -26310,9 +26756,9 @@ diff -urNp linux-2.6.32.7/drivers/video/modedb.c linux-2.6.32.7/drivers/video/mo }, }; -diff -urNp linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c 2010-01-25 17:39:40.836261121 -0500 +diff -urNp linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/nvidia/nv_backlight.c 2010-02-23 17:09:53.268343828 -0500 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -26322,9 +26768,9 @@ diff -urNp linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c linux-2.6.32.7/dri .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/riva/fbdev.c linux-2.6.32.7/drivers/video/riva/fbdev.c ---- linux-2.6.32.7/drivers/video/riva/fbdev.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/riva/fbdev.c 2010-01-25 17:39:40.836261121 -0500 +diff -urNp linux-2.6.32.9/drivers/video/riva/fbdev.c linux-2.6.32.9/drivers/video/riva/fbdev.c +--- linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/riva/fbdev.c 2010-02-23 17:09:53.268343828 -0500 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -26334,9 +26780,9 @@ diff -urNp linux-2.6.32.7/drivers/video/riva/fbdev.c linux-2.6.32.7/drivers/vide .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.32.7/drivers/video/uvesafb.c linux-2.6.32.7/drivers/video/uvesafb.c ---- linux-2.6.32.7/drivers/video/uvesafb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/uvesafb.c 2010-01-25 17:39:40.837424384 -0500 +diff -urNp linux-2.6.32.9/drivers/video/uvesafb.c linux-2.6.32.9/drivers/video/uvesafb.c +--- linux-2.6.32.9/drivers/video/uvesafb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/uvesafb.c 2010-02-23 17:09:53.268343828 -0500 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -26412,9 +26858,9 @@ diff -urNp linux-2.6.32.7/drivers/video/uvesafb.c linux-2.6.32.7/drivers/video/u } framebuffer_release(info); -diff -urNp linux-2.6.32.7/drivers/video/vesafb.c linux-2.6.32.7/drivers/video/vesafb.c ---- linux-2.6.32.7/drivers/video/vesafb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/video/vesafb.c 2010-01-25 17:39:40.837424384 -0500 +diff -urNp linux-2.6.32.9/drivers/video/vesafb.c linux-2.6.32.9/drivers/video/vesafb.c +--- linux-2.6.32.9/drivers/video/vesafb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/video/vesafb.c 2010-02-23 17:09:53.268343828 -0500 @@ -9,6 +9,7 @@ */ @@ -26518,9 +26964,9 @@ diff -urNp linux-2.6.32.7/drivers/video/vesafb.c linux-2.6.32.7/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.32.7/drivers/xen/sys-hypervisor.c linux-2.6.32.7/drivers/xen/sys-hypervisor.c ---- linux-2.6.32.7/drivers/xen/sys-hypervisor.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/drivers/xen/sys-hypervisor.c 2010-01-25 17:39:40.837424384 -0500 +diff -urNp linux-2.6.32.9/drivers/xen/sys-hypervisor.c linux-2.6.32.9/drivers/xen/sys-hypervisor.c +--- linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/drivers/xen/sys-hypervisor.c 2010-02-23 17:09:53.268343828 -0500 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -26530,9 +26976,9 @@ diff -urNp linux-2.6.32.7/drivers/xen/sys-hypervisor.c linux-2.6.32.7/drivers/xe .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.32.7/fs/9p/vfs_inode.c linux-2.6.32.7/fs/9p/vfs_inode.c ---- linux-2.6.32.7/fs/9p/vfs_inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/9p/vfs_inode.c 2010-01-25 17:39:40.837424384 -0500 +diff -urNp linux-2.6.32.9/fs/9p/vfs_inode.c linux-2.6.32.9/fs/9p/vfs_inode.c +--- linux-2.6.32.9/fs/9p/vfs_inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/9p/vfs_inode.c 2010-02-23 17:09:53.272463050 -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) @@ -26542,9 +26988,9 @@ diff -urNp linux-2.6.32.7/fs/9p/vfs_inode.c linux-2.6.32.7/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.7/fs/aio.c linux-2.6.32.7/fs/aio.c ---- linux-2.6.32.7/fs/aio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/aio.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/aio.c linux-2.6.32.9/fs/aio.c +--- linux-2.6.32.9/fs/aio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/aio.c 2010-02-23 17:09:53.272463050 -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; @@ -26554,9 +27000,9 @@ diff -urNp linux-2.6.32.7/fs/aio.c linux-2.6.32.7/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.32.7/fs/attr.c linux-2.6.32.7/fs/attr.c ---- linux-2.6.32.7/fs/attr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/attr.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/attr.c linux-2.6.32.9/fs/attr.c +--- linux-2.6.32.9/fs/attr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/attr.c 2010-02-23 17:09:53.272463050 -0500 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode unsigned long limit; @@ -26565,9 +27011,9 @@ diff -urNp linux-2.6.32.7/fs/attr.c linux-2.6.32.7/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.7/fs/autofs/root.c linux-2.6.32.7/fs/autofs/root.c ---- linux-2.6.32.7/fs/autofs/root.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/autofs/root.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/autofs/root.c linux-2.6.32.9/fs/autofs/root.c +--- linux-2.6.32.9/fs/autofs/root.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/autofs/root.c 2010-02-23 17:09:53.272463050 -0500 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -26578,9 +27024,9 @@ diff -urNp linux-2.6.32.7/fs/autofs/root.c linux-2.6.32.7/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.32.7/fs/autofs4/symlink.c linux-2.6.32.7/fs/autofs4/symlink.c ---- linux-2.6.32.7/fs/autofs4/symlink.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/autofs4/symlink.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/autofs4/symlink.c linux-2.6.32.9/fs/autofs4/symlink.c +--- linux-2.6.32.9/fs/autofs4/symlink.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/autofs4/symlink.c 2010-02-23 17:09:53.272463050 -0500 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -26590,9 +27036,9 @@ diff -urNp linux-2.6.32.7/fs/autofs4/symlink.c linux-2.6.32.7/fs/autofs4/symlink return NULL; } -diff -urNp linux-2.6.32.7/fs/befs/linuxvfs.c linux-2.6.32.7/fs/befs/linuxvfs.c ---- linux-2.6.32.7/fs/befs/linuxvfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/befs/linuxvfs.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/befs/linuxvfs.c linux-2.6.32.9/fs/befs/linuxvfs.c +--- linux-2.6.32.9/fs/befs/linuxvfs.c 2010-02-23 17:04:12.513858925 -0500 ++++ linux-2.6.32.9/fs/befs/linuxvfs.c 2010-02-23 17:09:53.272463050 -0500 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -26602,9 +27048,9 @@ diff -urNp linux-2.6.32.7/fs/befs/linuxvfs.c linux-2.6.32.7/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c ---- linux-2.6.32.7/fs/binfmt_aout.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/binfmt_aout.c 2010-01-25 17:39:40.838419304 -0500 +diff -urNp linux-2.6.32.9/fs/binfmt_aout.c linux-2.6.32.9/fs/binfmt_aout.c +--- linux-2.6.32.9/fs/binfmt_aout.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/binfmt_aout.c 2010-02-23 17:09:53.272463050 -0500 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -26635,7 +27081,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c if (ex.a_data + ex.a_bss > rlim) return -ENOMEM; -@@ -276,6 +281,27 @@ static int load_aout_binary(struct linux +@@ -277,6 +282,27 @@ static int load_aout_binary(struct linux install_exec_creds(bprm); current->flags &= ~PF_FORKNOEXEC; @@ -26663,7 +27109,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c if (N_MAGIC(ex) == OMAGIC) { unsigned long text_addr, map_size; loff_t pos; -@@ -348,7 +374,7 @@ static int load_aout_binary(struct linux +@@ -349,7 +375,7 @@ static int load_aout_binary(struct linux down_write(¤t->mm->mmap_sem); error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data, @@ -26672,9 +27118,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/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.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c ---- linux-2.6.32.7/fs/binfmt_elf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/binfmt_elf.c 2010-01-25 17:39:40.839418065 -0500 +diff -urNp linux-2.6.32.9/fs/binfmt_elf.c linux-2.6.32.9/fs/binfmt_elf.c +--- linux-2.6.32.9/fs/binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/binfmt_elf.c 2010-02-23 17:09:53.272463050 -0500 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -26984,7 +27430,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c loc = kmalloc(sizeof(*loc), GFP_KERNEL); if (!loc) { -@@ -742,11 +938,80 @@ static int load_elf_binary(struct linux_ +@@ -718,11 +914,80 @@ static int load_elf_binary(struct linux_ /* OK, This is the point of no return */ current->flags &= ~PF_FORKNOEXEC; @@ -27044,6 +27490,10 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c + put_cpu(); + } +#endif + + /* Do this immediately, since STACK_TOP as used in setup_arg_pages + may depend on the personality. */ + SET_PERSONALITY(loc->elf_ex); + +#ifdef CONFIG_PAX_ASLR + if (current->mm->pax_flags & MF_PAX_RANDMMAP) { @@ -27051,10 +27501,6 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT; + } +#endif - - /* Do this immediately, since STACK_TOP as used in setup_arg_pages - may depend on the personality. */ - SET_PERSONALITY(loc->elf_ex); + +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) { @@ -27066,7 +27512,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; -@@ -827,6 +1092,20 @@ static int load_elf_binary(struct linux_ +@@ -804,6 +1069,20 @@ static int load_elf_binary(struct linux_ #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif @@ -27087,7 +27533,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, -@@ -859,9 +1138,9 @@ static int load_elf_binary(struct linux_ +@@ -836,9 +1115,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. */ @@ -27100,7 +27546,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c /* set_brk can never work. Avoid overflows. */ send_sig(SIGKILL, current, 0); retval = -EINVAL; -@@ -889,6 +1168,11 @@ static int load_elf_binary(struct linux_ +@@ -866,6 +1145,11 @@ static int load_elf_binary(struct linux_ start_data += load_bias; end_data += load_bias; @@ -27112,7 +27558,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/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 -@@ -900,9 +1184,11 @@ static int load_elf_binary(struct linux_ +@@ -877,9 +1161,11 @@ static int load_elf_binary(struct linux_ goto out_free_dentry; } if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { @@ -27127,7 +27573,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c } if (elf_interpreter) { -@@ -1135,8 +1421,10 @@ static int dump_seek(struct file *file, +@@ -1112,8 +1398,10 @@ static int dump_seek(struct file *file, unsigned long n = off; if (n > PAGE_SIZE) n = PAGE_SIZE; @@ -27139,7 +27585,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c off -= n; } free_page((unsigned long)buf); -@@ -1148,7 +1436,7 @@ static int dump_seek(struct file *file, +@@ -1125,7 +1413,7 @@ static int dump_seek(struct file *file, * Decide what to dump of a segment, part, all or none. */ static unsigned long vma_dump_size(struct vm_area_struct *vma, @@ -27148,7 +27594,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) -@@ -1182,7 +1470,7 @@ static unsigned long vma_dump_size(struc +@@ -1159,7 +1447,7 @@ static unsigned long vma_dump_size(struc if (vma->vm_file == NULL) return 0; @@ -27157,7 +27603,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c goto whole; /* -@@ -1278,8 +1566,11 @@ static int writenote(struct memelfnote * +@@ -1255,8 +1543,11 @@ static int writenote(struct memelfnote * #undef DUMP_WRITE #define DUMP_WRITE(addr, nr) \ @@ -27170,7 +27616,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c static void fill_elf_header(struct elfhdr *elf, int segs, u16 machine, u32 flags, u8 osabi) -@@ -1408,9 +1699,9 @@ static void fill_auxv_note(struct memelf +@@ -1385,9 +1676,9 @@ static void fill_auxv_note(struct memelf { elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; int i = 0; @@ -27182,7 +27628,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } -@@ -1996,7 +2287,7 @@ static int elf_core_dump(long signr, str +@@ -1973,7 +2264,7 @@ static int elf_core_dump(long signr, str phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -27191,7 +27637,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/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; -@@ -2029,7 +2320,7 @@ static int elf_core_dump(long signr, str +@@ -2006,7 +2297,7 @@ static int elf_core_dump(long signr, str unsigned long addr; unsigned long end; @@ -27200,7 +27646,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2038,6 +2329,7 @@ static int elf_core_dump(long signr, str +@@ -2015,6 +2306,7 @@ static int elf_core_dump(long signr, str page = get_dump_page(addr); if (page) { void *kaddr = kmap(page); @@ -27208,7 +27654,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c stop = ((size += PAGE_SIZE) > limit) || !dump_write(file, kaddr, PAGE_SIZE); kunmap(page); -@@ -2065,6 +2357,97 @@ out: +@@ -2042,6 +2334,97 @@ out: #endif /* USE_ELF_CORE_DUMP */ @@ -27306,10 +27752,10 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c ---- linux-2.6.32.7/fs/binfmt_flat.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/binfmt_flat.c 2010-01-25 17:39:40.840303077 -0500 -@@ -563,7 +563,9 @@ static int load_flat_file(struct linux_b +diff -urNp linux-2.6.32.9/fs/binfmt_flat.c linux-2.6.32.9/fs/binfmt_flat.c +--- linux-2.6.32.9/fs/binfmt_flat.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/binfmt_flat.c 2010-02-23 17:09:53.272463050 -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", (int)-realdatastart); @@ -27319,7 +27765,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c ret = realdatastart; goto err; } -@@ -587,8 +589,10 @@ static int load_flat_file(struct linux_b +@@ -588,8 +590,10 @@ static int load_flat_file(struct linux_b } if (IS_ERR_VALUE(result)) { printk("Unable to read data+bss, errno %d\n", (int)-result); @@ -27330,7 +27776,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c ret = result; goto err; } -@@ -657,8 +661,10 @@ static int load_flat_file(struct linux_b +@@ -658,8 +662,10 @@ static int load_flat_file(struct linux_b } if (IS_ERR_VALUE(result)) { printk("Unable to read code+data+bss, errno %d\n",(int)-result); @@ -27341,9 +27787,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.32.7/fs/binfmt_misc.c linux-2.6.32.7/fs/binfmt_misc.c ---- linux-2.6.32.7/fs/binfmt_misc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/binfmt_misc.c 2010-01-25 17:39:40.840303077 -0500 +diff -urNp linux-2.6.32.9/fs/binfmt_misc.c linux-2.6.32.9/fs/binfmt_misc.c +--- linux-2.6.32.9/fs/binfmt_misc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/binfmt_misc.c 2010-02-23 17:09:53.272463050 -0500 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -27353,9 +27799,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_misc.c linux-2.6.32.7/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c ---- linux-2.6.32.7/fs/bio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/bio.c 2010-01-25 17:39:40.840303077 -0500 +diff -urNp linux-2.6.32.9/fs/bio.c linux-2.6.32.9/fs/bio.c +--- linux-2.6.32.9/fs/bio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/bio.c 2010-02-23 17:09:53.272463050 -0500 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -27365,7 +27811,7 @@ diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c if (!bslab->slab && entry == -1) entry = i; -@@ -1212,7 +1212,7 @@ static void bio_copy_kern_endio(struct b +@@ -1217,7 +1217,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; int i; @@ -27374,9 +27820,9 @@ diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.32.7/fs/btrfs/ctree.c linux-2.6.32.7/fs/btrfs/ctree.c ---- linux-2.6.32.7/fs/btrfs/ctree.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/ctree.c 2010-01-25 17:39:40.841428527 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/ctree.c linux-2.6.32.9/fs/btrfs/ctree.c +--- linux-2.6.32.9/fs/btrfs/ctree.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/ctree.c 2010-02-23 17:09:53.272463050 -0500 @@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; @@ -27385,9 +27831,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/ctree.c linux-2.6.32.7/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.7/fs/btrfs/disk-io.c linux-2.6.32.7/fs/btrfs/disk-io.c ---- linux-2.6.32.7/fs/btrfs/disk-io.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/disk-io.c 2010-01-25 17:39:40.842154796 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/disk-io.c linux-2.6.32.9/fs/btrfs/disk-io.c +--- linux-2.6.32.9/fs/btrfs/disk-io.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/disk-io.c 2010-02-23 17:09:53.276137164 -0500 @@ -39,7 +39,7 @@ #include "tree-log.h" #include "free-space-cache.h" @@ -27406,9 +27852,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/disk-io.c linux-2.6.32.7/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.7/fs/btrfs/extent_io.h linux-2.6.32.7/fs/btrfs/extent_io.h ---- linux-2.6.32.7/fs/btrfs/extent_io.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/extent_io.h 2010-01-25 17:39:40.842154796 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/extent_io.h linux-2.6.32.9/fs/btrfs/extent_io.h +--- linux-2.6.32.9/fs/btrfs/extent_io.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/extent_io.h 2010-02-23 17:09:53.276137164 -0500 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s struct bio *bio, int mirror_num, unsigned long bio_flags); @@ -27469,9 +27915,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/extent_io.h linux-2.6.32.7/fs/btrfs/extent_io }; struct extent_state { -diff -urNp linux-2.6.32.7/fs/btrfs/free-space-cache.c linux-2.6.32.7/fs/btrfs/free-space-cache.c ---- linux-2.6.32.7/fs/btrfs/free-space-cache.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/free-space-cache.c 2010-01-25 17:39:40.850151357 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/free-space-cache.c linux-2.6.32.9/fs/btrfs/free-space-cache.c +--- linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/free-space-cache.c 2010-02-23 17:09:53.276137164 -0500 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { @@ -27490,9 +27936,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/free-space-cache.c linux-2.6.32.7/fs/btrfs/fr if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.32.7/fs/btrfs/inode.c linux-2.6.32.7/fs/btrfs/inode.c ---- linux-2.6.32.7/fs/btrfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/inode.c 2010-01-25 17:39:40.851419030 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/inode.c linux-2.6.32.9/fs/btrfs/inode.c +--- linux-2.6.32.9/fs/btrfs/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/inode.c 2010-02-23 17:09:53.276137164 -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; @@ -27511,9 +27957,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/inode.c linux-2.6.32.7/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.7/fs/btrfs/sysfs.c linux-2.6.32.7/fs/btrfs/sysfs.c ---- linux-2.6.32.7/fs/btrfs/sysfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/btrfs/sysfs.c 2010-01-25 17:39:40.851419030 -0500 +diff -urNp linux-2.6.32.9/fs/btrfs/sysfs.c linux-2.6.32.9/fs/btrfs/sysfs.c +--- linux-2.6.32.9/fs/btrfs/sysfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/btrfs/sysfs.c 2010-02-23 17:09:53.276137164 -0500 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -27529,9 +27975,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/sysfs.c linux-2.6.32.7/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.32.7/fs/buffer.c linux-2.6.32.7/fs/buffer.c ---- linux-2.6.32.7/fs/buffer.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/buffer.c 2010-01-25 17:39:40.852369217 -0500 +diff -urNp linux-2.6.32.9/fs/buffer.c linux-2.6.32.9/fs/buffer.c +--- linux-2.6.32.9/fs/buffer.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/buffer.c 2010-02-23 17:09:53.276137164 -0500 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -27540,9 +27986,9 @@ diff -urNp linux-2.6.32.7/fs/buffer.c linux-2.6.32.7/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -diff -urNp linux-2.6.32.7/fs/cachefiles/rdwr.c linux-2.6.32.7/fs/cachefiles/rdwr.c ---- linux-2.6.32.7/fs/cachefiles/rdwr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/cachefiles/rdwr.c 2010-01-25 17:39:40.852369217 -0500 +diff -urNp linux-2.6.32.9/fs/cachefiles/rdwr.c linux-2.6.32.9/fs/cachefiles/rdwr.c +--- linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/cachefiles/rdwr.c 2010-02-23 17:09:53.276137164 -0500 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); @@ -27552,9 +27998,9 @@ diff -urNp linux-2.6.32.7/fs/cachefiles/rdwr.c linux-2.6.32.7/fs/cachefiles/rdwr set_fs(old_fs); kunmap(page); if (ret != len) -diff -urNp linux-2.6.32.7/fs/cifs/cifs_uniupr.h linux-2.6.32.7/fs/cifs/cifs_uniupr.h ---- linux-2.6.32.7/fs/cifs/cifs_uniupr.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/cifs/cifs_uniupr.h 2010-01-25 17:39:40.852369217 -0500 +diff -urNp linux-2.6.32.9/fs/cifs/cifs_uniupr.h linux-2.6.32.9/fs/cifs/cifs_uniupr.h +--- linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/cifs/cifs_uniupr.h 2010-02-23 17:09:53.276137164 -0500 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -27564,9 +28010,9 @@ diff -urNp linux-2.6.32.7/fs/cifs/cifs_uniupr.h linux-2.6.32.7/fs/cifs/cifs_uniu }; #endif -diff -urNp linux-2.6.32.7/fs/cifs/link.c linux-2.6.32.7/fs/cifs/link.c ---- linux-2.6.32.7/fs/cifs/link.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/cifs/link.c 2010-01-25 17:39:40.852369217 -0500 +diff -urNp linux-2.6.32.9/fs/cifs/link.c linux-2.6.32.9/fs/cifs/link.c +--- linux-2.6.32.9/fs/cifs/link.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/cifs/link.c 2010-02-23 17:09:53.276137164 -0500 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -27576,9 +28022,9 @@ diff -urNp linux-2.6.32.7/fs/cifs/link.c linux-2.6.32.7/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.32.7/fs/compat_binfmt_elf.c linux-2.6.32.7/fs/compat_binfmt_elf.c ---- linux-2.6.32.7/fs/compat_binfmt_elf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/compat_binfmt_elf.c 2010-01-25 17:39:40.852369217 -0500 +diff -urNp linux-2.6.32.9/fs/compat_binfmt_elf.c linux-2.6.32.9/fs/compat_binfmt_elf.c +--- linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/compat_binfmt_elf.c 2010-02-23 17:09:53.276137164 -0500 @@ -29,10 +29,12 @@ #undef elfhdr #undef elf_phdr @@ -27592,9 +28038,9 @@ diff -urNp linux-2.6.32.7/fs/compat_binfmt_elf.c linux-2.6.32.7/fs/compat_binfmt #define elf_addr_t Elf32_Addr /* -diff -urNp linux-2.6.32.7/fs/compat.c linux-2.6.32.7/fs/compat.c ---- linux-2.6.32.7/fs/compat.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/compat.c 2010-01-25 17:39:40.853440941 -0500 +diff -urNp linux-2.6.32.9/fs/compat.c linux-2.6.32.9/fs/compat.c +--- linux-2.6.32.9/fs/compat.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/compat.c 2010-02-23 17:09:53.276137164 -0500 @@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -27694,9 +28140,9 @@ diff -urNp linux-2.6.32.7/fs/compat.c linux-2.6.32.7/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.32.7/fs/compat_ioctl.c linux-2.6.32.7/fs/compat_ioctl.c ---- linux-2.6.32.7/fs/compat_ioctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/compat_ioctl.c 2010-01-25 17:39:40.854422632 -0500 +diff -urNp linux-2.6.32.9/fs/compat_ioctl.c linux-2.6.32.9/fs/compat_ioctl.c +--- linux-2.6.32.9/fs/compat_ioctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/compat_ioctl.c 2010-02-23 17:09:53.276137164 -0500 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -27716,9 +28162,9 @@ diff -urNp linux-2.6.32.7/fs/compat_ioctl.c linux-2.6.32.7/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.32.7/fs/debugfs/inode.c linux-2.6.32.7/fs/debugfs/inode.c ---- linux-2.6.32.7/fs/debugfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/debugfs/inode.c 2010-01-25 17:39:40.854422632 -0500 +diff -urNp linux-2.6.32.9/fs/debugfs/inode.c linux-2.6.32.9/fs/debugfs/inode.c +--- linux-2.6.32.9/fs/debugfs/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/debugfs/inode.c 2010-02-23 17:09:53.276137164 -0500 @@ -128,7 +128,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -27728,9 +28174,9 @@ diff -urNp linux-2.6.32.7/fs/debugfs/inode.c linux-2.6.32.7/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.32.7/fs/dlm/lockspace.c linux-2.6.32.7/fs/dlm/lockspace.c ---- linux-2.6.32.7/fs/dlm/lockspace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/dlm/lockspace.c 2010-01-25 17:39:40.854422632 -0500 +diff -urNp linux-2.6.32.9/fs/dlm/lockspace.c linux-2.6.32.9/fs/dlm/lockspace.c +--- linux-2.6.32.9/fs/dlm/lockspace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/dlm/lockspace.c 2010-02-23 17:09:53.280435608 -0500 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -27740,9 +28186,9 @@ diff -urNp linux-2.6.32.7/fs/dlm/lockspace.c linux-2.6.32.7/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.32.7/fs/ecryptfs/inode.c linux-2.6.32.7/fs/ecryptfs/inode.c ---- linux-2.6.32.7/fs/ecryptfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ecryptfs/inode.c 2010-01-25 17:39:40.855424759 -0500 +diff -urNp linux-2.6.32.9/fs/ecryptfs/inode.c linux-2.6.32.9/fs/ecryptfs/inode.c +--- linux-2.6.32.9/fs/ecryptfs/inode.c 2010-02-23 17:04:12.533572395 -0500 ++++ linux-2.6.32.9/fs/ecryptfs/inode.c 2010-02-23 17:09:53.280435608 -0500 @@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, old_fs = get_fs(); set_fs(get_ds()); @@ -27761,9 +28207,9 @@ diff -urNp linux-2.6.32.7/fs/ecryptfs/inode.c linux-2.6.32.7/fs/ecryptfs/inode.c set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c ---- linux-2.6.32.7/fs/exec.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/exec.c 2010-01-25 17:39:40.855424759 -0500 +diff -urNp linux-2.6.32.9/fs/exec.c linux-2.6.32.9/fs/exec.c +--- linux-2.6.32.9/fs/exec.c 2010-02-23 17:04:12.533572395 -0500 ++++ linux-2.6.32.9/fs/exec.c 2010-02-23 17:24:19.199824476 -0500 @@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> @@ -27875,7 +28321,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c /* * cover the whole range: [new_start, old_end) */ -@@ -602,6 +622,14 @@ int setup_arg_pages(struct linux_binprm +@@ -605,6 +625,14 @@ int setup_arg_pages(struct linux_binprm bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -27890,7 +28336,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c vm_flags = VM_STACK_FLAGS; /* -@@ -615,19 +643,24 @@ int setup_arg_pages(struct linux_binprm +@@ -618,19 +646,24 @@ int setup_arg_pages(struct linux_binprm vm_flags &= ~VM_EXEC; vm_flags |= mm->def_flags; @@ -27919,10 +28365,18 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c - goto out_unlock; - } - + stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE; + stack_size = vma->vm_end - vma->vm_start; + /* +@@ -638,7 +671,6 @@ int setup_arg_pages(struct linux_binprm + * will align it up. + */ + rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK; +- rlim_stack = min(rlim_stack, stack_size); #ifdef CONFIG_STACK_GROWSUP - stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; - #else -@@ -651,7 +684,7 @@ struct file *open_exec(const char *name) + if (stack_size + stack_expand > rlim_stack) + stack_base = vma->vm_start + rlim_stack; +@@ -668,7 +700,7 @@ struct file *open_exec(const char *name) int err; file = do_filp_open(AT_FDCWD, name, @@ -27931,7 +28385,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c MAY_EXEC | MAY_OPEN); if (IS_ERR(file)) goto out; -@@ -688,7 +721,7 @@ int kernel_read(struct file *file, loff_ +@@ -705,7 +737,7 @@ int kernel_read(struct file *file, loff_ old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -27940,7 +28394,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c set_fs(old_fs); return result; } -@@ -1088,7 +1121,7 @@ int check_unsafe_exec(struct linux_binpr +@@ -1111,7 +1143,7 @@ int check_unsafe_exec(struct linux_binpr } rcu_read_unlock(); @@ -27949,7 +28403,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c bprm->unsafe |= LSM_UNSAFE_SHARE; } else { res = -EAGAIN; -@@ -1287,6 +1320,11 @@ int do_execve(char * filename, +@@ -1310,6 +1342,11 @@ int do_execve(char * filename, char __user *__user *envp, struct pt_regs * regs) { @@ -27961,7 +28415,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1323,6 +1361,18 @@ int do_execve(char * filename, +@@ -1346,6 +1383,18 @@ int do_execve(char * filename, bprm->filename = filename; bprm->interp = filename; @@ -27980,7 +28434,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1352,10 +1402,41 @@ int do_execve(char * filename, +@@ -1375,10 +1424,41 @@ int do_execve(char * filename, if (retval < 0) goto out; @@ -28023,7 +28477,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c current->stack_start = current->mm->start_stack; -@@ -1368,6 +1449,14 @@ int do_execve(char * filename, +@@ -1391,6 +1471,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; @@ -28038,7 +28492,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c out: if (bprm->mm) mmput (bprm->mm); -@@ -1531,6 +1620,169 @@ out: +@@ -1554,6 +1642,169 @@ out: return ispipe; } @@ -28208,7 +28662,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1733,17 +1985,17 @@ static void wait_for_dump_helpers(struct +@@ -1756,17 +2007,17 @@ static void wait_for_dump_helpers(struct pipe = file->f_path.dentry->d_inode->i_pipe; pipe_lock(pipe); @@ -28231,7 +28685,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c pipe_unlock(pipe); } -@@ -1814,6 +2066,10 @@ void do_coredump(long signr, int exit_co +@@ -1837,6 +2088,10 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); @@ -28242,9 +28696,9 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.32.7/fs/ext2/balloc.c linux-2.6.32.7/fs/ext2/balloc.c ---- linux-2.6.32.7/fs/ext2/balloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext2/balloc.c 2010-01-25 17:39:40.856418905 -0500 +diff -urNp linux-2.6.32.9/fs/ext2/balloc.c linux-2.6.32.9/fs/ext2/balloc.c +--- linux-2.6.32.9/fs/ext2/balloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext2/balloc.c 2010-02-23 17:09:53.280435608 -0500 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -28254,9 +28708,9 @@ diff -urNp linux-2.6.32.7/fs/ext2/balloc.c linux-2.6.32.7/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.7/fs/ext3/balloc.c linux-2.6.32.7/fs/ext3/balloc.c ---- linux-2.6.32.7/fs/ext3/balloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext3/balloc.c 2010-01-25 17:39:40.856418905 -0500 +diff -urNp linux-2.6.32.9/fs/ext3/balloc.c linux-2.6.32.9/fs/ext3/balloc.c +--- linux-2.6.32.9/fs/ext3/balloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext3/balloc.c 2010-02-23 17:09:53.280435608 -0500 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -28266,9 +28720,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/balloc.c linux-2.6.32.7/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.7/fs/ext3/namei.c linux-2.6.32.7/fs/ext3/namei.c ---- linux-2.6.32.7/fs/ext3/namei.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext3/namei.c 2010-01-25 17:39:40.856418905 -0500 +diff -urNp linux-2.6.32.9/fs/ext3/namei.c linux-2.6.32.9/fs/ext3/namei.c +--- linux-2.6.32.9/fs/ext3/namei.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext3/namei.c 2010-02-23 17:09:53.280435608 -0500 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -28278,9 +28732,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/namei.c linux-2.6.32.7/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.7/fs/ext3/xattr.c linux-2.6.32.7/fs/ext3/xattr.c ---- linux-2.6.32.7/fs/ext3/xattr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext3/xattr.c 2010-01-25 17:39:40.857371632 -0500 +diff -urNp linux-2.6.32.9/fs/ext3/xattr.c linux-2.6.32.9/fs/ext3/xattr.c +--- linux-2.6.32.9/fs/ext3/xattr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext3/xattr.c 2010-02-23 17:09:53.280435608 -0500 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -28292,9 +28746,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/xattr.c linux-2.6.32.7/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.32.7/fs/ext4/balloc.c linux-2.6.32.7/fs/ext4/balloc.c ---- linux-2.6.32.7/fs/ext4/balloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext4/balloc.c 2010-01-25 17:39:40.857371632 -0500 +diff -urNp linux-2.6.32.9/fs/ext4/balloc.c linux-2.6.32.9/fs/ext4/balloc.c +--- linux-2.6.32.9/fs/ext4/balloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext4/balloc.c 2010-02-23 17:09:53.280435608 -0500 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -28304,9 +28758,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/balloc.c linux-2.6.32.7/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.32.7/fs/ext4/ioctl.c linux-2.6.32.7/fs/ext4/ioctl.c ---- linux-2.6.32.7/fs/ext4/ioctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext4/ioctl.c 2010-01-25 17:39:40.857371632 -0500 +diff -urNp linux-2.6.32.9/fs/ext4/ioctl.c linux-2.6.32.9/fs/ext4/ioctl.c +--- linux-2.6.32.9/fs/ext4/ioctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext4/ioctl.c 2010-02-23 17:09:53.280435608 -0500 @@ -221,6 +221,9 @@ setversion_out: struct file *donor_filp; int err; @@ -28317,9 +28771,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/ioctl.c linux-2.6.32.7/fs/ext4/ioctl.c if (!(filp->f_mode & FMODE_READ) || !(filp->f_mode & FMODE_WRITE)) return -EBADF; -diff -urNp linux-2.6.32.7/fs/ext4/namei.c linux-2.6.32.7/fs/ext4/namei.c ---- linux-2.6.32.7/fs/ext4/namei.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext4/namei.c 2010-01-25 17:39:40.858402028 -0500 +diff -urNp linux-2.6.32.9/fs/ext4/namei.c linux-2.6.32.9/fs/ext4/namei.c +--- linux-2.6.32.9/fs/ext4/namei.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext4/namei.c 2010-02-23 17:09:53.280435608 -0500 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -28329,9 +28783,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/namei.c linux-2.6.32.7/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.32.7/fs/ext4/super.c linux-2.6.32.7/fs/ext4/super.c ---- linux-2.6.32.7/fs/ext4/super.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ext4/super.c 2010-01-25 17:39:40.858402028 -0500 +diff -urNp linux-2.6.32.9/fs/ext4/super.c linux-2.6.32.9/fs/ext4/super.c +--- linux-2.6.32.9/fs/ext4/super.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ext4/super.c 2010-02-23 17:09:53.284244949 -0500 @@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje } @@ -28341,10 +28795,10 @@ diff -urNp linux-2.6.32.7/fs/ext4/super.c linux-2.6.32.7/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.32.7/fs/fcntl.c linux-2.6.32.7/fs/fcntl.c ---- linux-2.6.32.7/fs/fcntl.c 2010-01-25 20:04:15.424090472 -0500 -+++ linux-2.6.32.7/fs/fcntl.c 2010-01-25 20:04:24.955600005 -0500 -@@ -346,6 +346,7 @@ static long do_fcntl(int fd, unsigned in +diff -urNp linux-2.6.32.9/fs/fcntl.c linux-2.6.32.9/fs/fcntl.c +--- linux-2.6.32.9/fs/fcntl.c 2010-02-23 17:04:12.533572395 -0500 ++++ linux-2.6.32.9/fs/fcntl.c 2010-02-23 17:09:53.284244949 -0500 +@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: case F_DUPFD_CLOEXEC: @@ -28352,7 +28806,7 @@ diff -urNp linux-2.6.32.7/fs/fcntl.c linux-2.6.32.7/fs/fcntl.c if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -@@ -502,7 +503,8 @@ static inline int sigio_perm(struct task +@@ -500,7 +501,8 @@ static inline int sigio_perm(struct task ret = ((fown->euid == 0 || fown->euid == cred->suid || fown->euid == cred->uid || fown->uid == cred->suid || fown->uid == cred->uid) && @@ -28362,9 +28816,9 @@ diff -urNp linux-2.6.32.7/fs/fcntl.c linux-2.6.32.7/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.32.7/fs/fifo.c linux-2.6.32.7/fs/fifo.c ---- linux-2.6.32.7/fs/fifo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fifo.c 2010-01-25 17:39:40.859418542 -0500 +diff -urNp linux-2.6.32.9/fs/fifo.c linux-2.6.32.9/fs/fifo.c +--- linux-2.6.32.9/fs/fifo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fifo.c 2010-02-23 17:09:53.284244949 -0500 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -28435,9 +28889,9 @@ diff -urNp linux-2.6.32.7/fs/fifo.c linux-2.6.32.7/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.32.7/fs/file.c linux-2.6.32.7/fs/file.c ---- linux-2.6.32.7/fs/file.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/file.c 2010-01-25 17:39:40.866271752 -0500 +diff -urNp linux-2.6.32.9/fs/file.c linux-2.6.32.9/fs/file.c +--- linux-2.6.32.9/fs/file.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/file.c 2010-02-23 17:09:53.284244949 -0500 @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -28455,19 +28909,50 @@ diff -urNp linux-2.6.32.7/fs/file.c linux-2.6.32.7/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c ---- linux-2.6.32.7/fs/fs_struct.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fs_struct.c 2010-01-25 17:39:40.866271752 -0500 -@@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk) +diff -urNp linux-2.6.32.9/fs/fs_struct.c linux-2.6.32.9/fs/fs_struct.c +--- linux-2.6.32.9/fs/fs_struct.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fs_struct.c 2010-02-23 17:09:53.284244949 -0500 +@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo + struct task_struct *g, *p; + struct fs_struct *fs; + int count = 0; ++ unsigned long flags; + + read_lock(&tasklist_lock); + do_each_thread(g, p) { + task_lock(p); ++ gr_fs_write_lock_irqsave(p, flags); + fs = p->fs; + if (fs) { + write_lock(&fs->lock); +@@ -66,6 +68,7 @@ void chroot_fs_refs(struct path *old_roo + } + write_unlock(&fs->lock); + } ++ gr_fs_write_unlock_irqrestore(p, flags); + task_unlock(p); + } while_each_thread(g, p); + read_unlock(&tasklist_lock); +@@ -83,14 +86,17 @@ void free_fs_struct(struct fs_struct *fs + void exit_fs(struct task_struct *tsk) + { + struct fs_struct *fs = tsk->fs; ++ unsigned long flags; + + if (fs) { + int kill; task_lock(tsk); ++ gr_fs_write_lock_irqsave(tsk, flags); write_lock(&fs->lock); tsk->fs = NULL; - kill = !--fs->users; + kill = !atomic_dec_return(&fs->users); write_unlock(&fs->lock); ++ gr_fs_write_unlock_irqrestore(tsk, flags); task_unlock(tsk); if (kill) -@@ -102,7 +102,7 @@ struct fs_struct *copy_fs_struct(struct + free_fs_struct(fs); +@@ -102,7 +108,7 @@ struct fs_struct *copy_fs_struct(struct struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); /* We don't need to lock fs - think why ;-) */ if (fs) { @@ -28476,16 +28961,27 @@ diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c fs->in_exec = 0; rwlock_init(&fs->lock); fs->umask = old->umask; -@@ -127,7 +127,7 @@ int unshare_fs_struct(void) +@@ -121,15 +127,18 @@ int unshare_fs_struct(void) + struct fs_struct *fs = current->fs; + struct fs_struct *new_fs = copy_fs_struct(fs); + int kill; ++ unsigned long flags; + + if (!new_fs) + return -ENOMEM; task_lock(current); ++ gr_fs_write_lock_irqsave(current, flags); write_lock(&fs->lock); - kill = !--fs->users; + kill = !atomic_dec_return(&fs->users); current->fs = new_fs; write_unlock(&fs->lock); ++ gr_fs_write_unlock_irqrestore(current, flags); task_unlock(current); -@@ -147,7 +147,7 @@ EXPORT_SYMBOL(current_umask); + + if (kill) +@@ -147,7 +156,7 @@ EXPORT_SYMBOL(current_umask); /* to be mentioned only in INIT_TASK */ struct fs_struct init_fs = { @@ -28494,7 +28990,15 @@ diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c .lock = __RW_LOCK_UNLOCKED(init_fs.lock), .umask = 0022, }; -@@ -162,12 +162,12 @@ void daemonize_fs_struct(void) +@@ -155,6 +164,7 @@ struct fs_struct init_fs = { + void daemonize_fs_struct(void) + { + struct fs_struct *fs = current->fs; ++ unsigned long flags; + + if (fs) { + int kill; +@@ -162,13 +172,15 @@ void daemonize_fs_struct(void) task_lock(current); write_lock(&init_fs.lock); @@ -28502,16 +29006,19 @@ diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c + atomic_inc(&init_fs.users); write_unlock(&init_fs.lock); ++ gr_fs_write_lock_irqsave(current, flags); write_lock(&fs->lock); current->fs = &init_fs; - kill = !--fs->users; + kill = !atomic_dec_return(&fs->users); write_unlock(&fs->lock); ++ gr_fs_write_unlock_irqrestore(current, flags); task_unlock(current); -diff -urNp linux-2.6.32.7/fs/fuse/control.c linux-2.6.32.7/fs/fuse/control.c ---- linux-2.6.32.7/fs/fuse/control.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fuse/control.c 2010-01-25 17:39:40.866271752 -0500 + if (kill) +diff -urNp linux-2.6.32.9/fs/fuse/control.c linux-2.6.32.9/fs/fuse/control.c +--- linux-2.6.32.9/fs/fuse/control.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fuse/control.c 2010-02-23 17:09:53.284244949 -0500 @@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -28521,9 +29028,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/control.c linux-2.6.32.7/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.32.7/fs/fuse/cuse.c linux-2.6.32.7/fs/fuse/cuse.c ---- linux-2.6.32.7/fs/fuse/cuse.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fuse/cuse.c 2010-01-25 17:39:40.866271752 -0500 +diff -urNp linux-2.6.32.9/fs/fuse/cuse.c linux-2.6.32.9/fs/fuse/cuse.c +--- linux-2.6.32.9/fs/fuse/cuse.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fuse/cuse.c 2010-02-23 17:09:53.284244949 -0500 @@ -528,8 +528,18 @@ static int cuse_channel_release(struct i return rc; } @@ -28558,9 +29065,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/cuse.c linux-2.6.32.7/fs/fuse/cuse.c cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) return PTR_ERR(cuse_class); -diff -urNp linux-2.6.32.7/fs/fuse/dev.c linux-2.6.32.7/fs/fuse/dev.c ---- linux-2.6.32.7/fs/fuse/dev.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fuse/dev.c 2010-01-25 17:39:40.867441916 -0500 +diff -urNp linux-2.6.32.9/fs/fuse/dev.c linux-2.6.32.9/fs/fuse/dev.c +--- linux-2.6.32.9/fs/fuse/dev.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fuse/dev.c 2010-02-23 17:09:53.284244949 -0500 @@ -745,7 +745,7 @@ __releases(&fc->lock) * request_end(). Otherwise add it to the processing list, and set * the 'sent' flag. @@ -28666,9 +29173,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/dev.c linux-2.6.32.7/fs/fuse/dev.c const struct file_operations fuse_dev_operations = { .owner = THIS_MODULE, -diff -urNp linux-2.6.32.7/fs/fuse/dir.c linux-2.6.32.7/fs/fuse/dir.c ---- linux-2.6.32.7/fs/fuse/dir.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fuse/dir.c 2010-01-25 17:39:40.867441916 -0500 +diff -urNp linux-2.6.32.9/fs/fuse/dir.c linux-2.6.32.9/fs/fuse/dir.c +--- linux-2.6.32.9/fs/fuse/dir.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fuse/dir.c 2010-02-23 17:09:53.284244949 -0500 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -28678,9 +29185,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/dir.c linux-2.6.32.7/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.32.7/fs/fuse/fuse_i.h linux-2.6.32.7/fs/fuse/fuse_i.h ---- linux-2.6.32.7/fs/fuse/fuse_i.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/fuse/fuse_i.h 2010-01-25 17:39:40.867441916 -0500 +diff -urNp linux-2.6.32.9/fs/fuse/fuse_i.h linux-2.6.32.9/fs/fuse/fuse_i.h +--- linux-2.6.32.9/fs/fuse/fuse_i.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/fuse/fuse_i.h 2010-02-23 17:09:53.284244949 -0500 @@ -521,6 +521,16 @@ extern const struct file_operations fuse extern const struct dentry_operations fuse_dentry_operations; @@ -28698,9 +29205,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/fuse_i.h linux-2.6.32.7/fs/fuse/fuse_i.h /** * Inode to nodeid comparison. */ -diff -urNp linux-2.6.32.7/fs/gfs2/sys.c linux-2.6.32.7/fs/gfs2/sys.c ---- linux-2.6.32.7/fs/gfs2/sys.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/gfs2/sys.c 2010-01-25 17:39:40.868164104 -0500 +diff -urNp linux-2.6.32.9/fs/gfs2/sys.c linux-2.6.32.9/fs/gfs2/sys.c +--- linux-2.6.32.9/fs/gfs2/sys.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/gfs2/sys.c 2010-02-23 17:09:53.284244949 -0500 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -28719,9 +29226,9 @@ diff -urNp linux-2.6.32.7/fs/gfs2/sys.c linux-2.6.32.7/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.32.7/fs/hfs/inode.c linux-2.6.32.7/fs/hfs/inode.c ---- linux-2.6.32.7/fs/hfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/hfs/inode.c 2010-01-25 17:39:40.868164104 -0500 +diff -urNp linux-2.6.32.9/fs/hfs/inode.c linux-2.6.32.9/fs/hfs/inode.c +--- linux-2.6.32.9/fs/hfs/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/hfs/inode.c 2010-02-23 17:09:53.284244949 -0500 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -28740,9 +29247,9 @@ diff -urNp linux-2.6.32.7/fs/hfs/inode.c linux-2.6.32.7/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.32.7/fs/hfsplus/inode.c linux-2.6.32.7/fs/hfsplus/inode.c ---- linux-2.6.32.7/fs/hfsplus/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/hfsplus/inode.c 2010-01-25 17:39:40.868164104 -0500 +diff -urNp linux-2.6.32.9/fs/hfsplus/inode.c linux-2.6.32.9/fs/hfsplus/inode.c +--- linux-2.6.32.9/fs/hfsplus/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/hfsplus/inode.c 2010-02-23 17:09:53.284244949 -0500 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -28779,9 +29286,9 @@ diff -urNp linux-2.6.32.7/fs/hfsplus/inode.c linux-2.6.32.7/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.32.7/fs/ioctl.c linux-2.6.32.7/fs/ioctl.c ---- linux-2.6.32.7/fs/ioctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ioctl.c 2010-01-25 17:39:40.868164104 -0500 +diff -urNp linux-2.6.32.9/fs/ioctl.c linux-2.6.32.9/fs/ioctl.c +--- linux-2.6.32.9/fs/ioctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ioctl.c 2010-02-23 17:09:53.284244949 -0500 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -28809,9 +29316,9 @@ diff -urNp linux-2.6.32.7/fs/ioctl.c linux-2.6.32.7/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.32.7/fs/jffs2/debug.h linux-2.6.32.7/fs/jffs2/debug.h ---- linux-2.6.32.7/fs/jffs2/debug.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/jffs2/debug.h 2010-01-25 17:39:40.868164104 -0500 +diff -urNp linux-2.6.32.9/fs/jffs2/debug.h linux-2.6.32.9/fs/jffs2/debug.h +--- linux-2.6.32.9/fs/jffs2/debug.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/jffs2/debug.h 2010-02-23 17:09:53.284244949 -0500 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -28913,9 +29420,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/debug.h linux-2.6.32.7/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.32.7/fs/jffs2/erase.c linux-2.6.32.7/fs/jffs2/erase.c ---- linux-2.6.32.7/fs/jffs2/erase.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/jffs2/erase.c 2010-01-25 17:39:40.869292519 -0500 +diff -urNp linux-2.6.32.9/fs/jffs2/erase.c linux-2.6.32.9/fs/jffs2/erase.c +--- linux-2.6.32.9/fs/jffs2/erase.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/jffs2/erase.c 2010-02-23 17:09:53.284244949 -0500 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -28926,9 +29433,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/erase.c linux-2.6.32.7/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.32.7/fs/jffs2/summary.h linux-2.6.32.7/fs/jffs2/summary.h ---- linux-2.6.32.7/fs/jffs2/summary.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/jffs2/summary.h 2010-01-25 17:39:40.869292519 -0500 +diff -urNp linux-2.6.32.9/fs/jffs2/summary.h linux-2.6.32.9/fs/jffs2/summary.h +--- linux-2.6.32.9/fs/jffs2/summary.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/jffs2/summary.h 2010-02-23 17:09:53.284244949 -0500 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -28957,9 +29464,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/summary.h linux-2.6.32.7/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.32.7/fs/jffs2/wbuf.c linux-2.6.32.7/fs/jffs2/wbuf.c ---- linux-2.6.32.7/fs/jffs2/wbuf.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/jffs2/wbuf.c 2010-01-25 17:39:40.869292519 -0500 +diff -urNp linux-2.6.32.9/fs/jffs2/wbuf.c linux-2.6.32.9/fs/jffs2/wbuf.c +--- linux-2.6.32.9/fs/jffs2/wbuf.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/jffs2/wbuf.c 2010-02-23 17:09:53.284244949 -0500 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -28970,9 +29477,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/wbuf.c linux-2.6.32.7/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.32.7/fs/lockd/svc.c linux-2.6.32.7/fs/lockd/svc.c ---- linux-2.6.32.7/fs/lockd/svc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/lockd/svc.c 2010-01-25 17:39:40.870353983 -0500 +diff -urNp linux-2.6.32.9/fs/lockd/svc.c linux-2.6.32.9/fs/lockd/svc.c +--- linux-2.6.32.9/fs/lockd/svc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/lockd/svc.c 2010-02-23 17:09:53.288151568 -0500 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -28982,9 +29489,9 @@ diff -urNp linux-2.6.32.7/fs/lockd/svc.c linux-2.6.32.7/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.32.7/fs/locks.c linux-2.6.32.7/fs/locks.c ---- linux-2.6.32.7/fs/locks.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/locks.c 2010-01-25 17:39:40.870353983 -0500 +diff -urNp linux-2.6.32.9/fs/locks.c linux-2.6.32.9/fs/locks.c +--- linux-2.6.32.9/fs/locks.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/locks.c 2010-02-23 17:09:53.288151568 -0500 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -29006,9 +29513,9 @@ diff -urNp linux-2.6.32.7/fs/locks.c linux-2.6.32.7/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.32.7/fs/namei.c linux-2.6.32.7/fs/namei.c ---- linux-2.6.32.7/fs/namei.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/namei.c 2010-01-25 17:39:40.871468102 -0500 +diff -urNp linux-2.6.32.9/fs/namei.c linux-2.6.32.9/fs/namei.c +--- linux-2.6.32.9/fs/namei.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/namei.c 2010-02-23 17:09:53.288151568 -0500 @@ -638,7 +638,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); @@ -29335,9 +29842,9 @@ diff -urNp linux-2.6.32.7/fs/namei.c linux-2.6.32.7/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.32.7/fs/namespace.c linux-2.6.32.7/fs/namespace.c ---- linux-2.6.32.7/fs/namespace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/namespace.c 2010-01-25 17:39:40.872212215 -0500 +diff -urNp linux-2.6.32.9/fs/namespace.c linux-2.6.32.9/fs/namespace.c +--- linux-2.6.32.9/fs/namespace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/namespace.c 2010-02-23 17:09:53.288151568 -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); @@ -29398,9 +29905,9 @@ diff -urNp linux-2.6.32.7/fs/namespace.c linux-2.6.32.7/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.32.7/fs/nfs/inode.c linux-2.6.32.7/fs/nfs/inode.c ---- linux-2.6.32.7/fs/nfs/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/nfs/inode.c 2010-01-25 17:39:40.872212215 -0500 +diff -urNp linux-2.6.32.9/fs/nfs/inode.c linux-2.6.32.9/fs/nfs/inode.c +--- linux-2.6.32.9/fs/nfs/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/nfs/inode.c 2010-02-23 17:09:53.288151568 -0500 @@ -965,16 +965,16 @@ static int nfs_size_need_update(const st return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -29421,9 +29928,9 @@ diff -urNp linux-2.6.32.7/fs/nfs/inode.c linux-2.6.32.7/fs/nfs/inode.c } void nfs_fattr_init(struct nfs_fattr *fattr) -diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c ---- linux-2.6.32.7/fs/nfs/nfs4proc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/nfs/nfs4proc.c 2010-01-25 17:39:40.873419288 -0500 +diff -urNp linux-2.6.32.9/fs/nfs/nfs4proc.c linux-2.6.32.9/fs/nfs/nfs4proc.c +--- linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-02-23 17:04:12.571669129 -0500 ++++ linux-2.6.32.9/fs/nfs/nfs4proc.c 2010-02-23 17:09:53.288151568 -0500 @@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { @@ -29451,7 +29958,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -1589,7 +1589,7 @@ out_err: +@@ -1591,7 +1591,7 @@ out_err: static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) { @@ -29460,7 +29967,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c struct nfs4_state *res; int status; -@@ -1680,7 +1680,7 @@ static int nfs4_do_setattr(struct inode +@@ -1682,7 +1682,7 @@ static int nfs4_do_setattr(struct inode struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(inode); @@ -29469,7 +29976,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2046,7 +2046,7 @@ static int _nfs4_server_capabilities(str +@@ -2048,7 +2048,7 @@ static int _nfs4_server_capabilities(str int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) { @@ -29478,7 +29985,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2080,7 +2080,7 @@ static int _nfs4_lookup_root(struct nfs_ +@@ -2082,7 +2082,7 @@ static int _nfs4_lookup_root(struct nfs_ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *info) { @@ -29487,7 +29994,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2169,7 +2169,7 @@ static int _nfs4_proc_getattr(struct nfs +@@ -2171,7 +2171,7 @@ static int _nfs4_proc_getattr(struct nfs static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29496,7 +30003,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2257,7 +2257,7 @@ static int nfs4_proc_lookupfh(struct nfs +@@ -2259,7 +2259,7 @@ static int nfs4_proc_lookupfh(struct nfs struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29505,7 +30012,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -2286,7 +2286,7 @@ static int _nfs4_proc_lookup(struct inod +@@ -2288,7 +2288,7 @@ static int _nfs4_proc_lookup(struct inod static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29514,7 +30021,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2350,7 +2350,7 @@ static int _nfs4_proc_access(struct inod +@@ -2352,7 +2352,7 @@ static int _nfs4_proc_access(struct inod static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) { @@ -29523,7 +30030,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2406,7 +2406,7 @@ static int _nfs4_proc_readlink(struct in +@@ -2408,7 +2408,7 @@ static int _nfs4_proc_readlink(struct in static int nfs4_proc_readlink(struct inode *inode, struct page *page, unsigned int pgbase, unsigned int pglen) { @@ -29532,7 +30039,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2504,7 +2504,7 @@ static int _nfs4_proc_remove(struct inod +@@ -2506,7 +2506,7 @@ static int _nfs4_proc_remove(struct inod static int nfs4_proc_remove(struct inode *dir, struct qstr *name) { @@ -29541,7 +30048,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2578,7 +2578,7 @@ static int _nfs4_proc_rename(struct inod +@@ -2580,7 +2580,7 @@ static int _nfs4_proc_rename(struct inod static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, struct inode *new_dir, struct qstr *new_name) { @@ -29550,7 +30057,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2625,7 +2625,7 @@ static int _nfs4_proc_link(struct inode +@@ -2627,7 +2627,7 @@ static int _nfs4_proc_link(struct inode static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) { @@ -29559,7 +30066,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2717,7 +2717,7 @@ out: +@@ -2719,7 +2719,7 @@ out: static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { @@ -29568,7 +30075,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2748,7 +2748,7 @@ out: +@@ -2750,7 +2750,7 @@ out: static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) { @@ -29577,7 +30084,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2797,7 +2797,7 @@ static int _nfs4_proc_readdir(struct den +@@ -2799,7 +2799,7 @@ static int _nfs4_proc_readdir(struct den static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, u64 cookie, struct page *page, unsigned int count, int plus) { @@ -29586,7 +30093,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2845,7 +2845,7 @@ out: +@@ -2847,7 +2847,7 @@ out: static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) { @@ -29595,7 +30102,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2877,7 +2877,7 @@ static int _nfs4_proc_statfs(struct nfs_ +@@ -2879,7 +2879,7 @@ static int _nfs4_proc_statfs(struct nfs_ static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) { @@ -29604,7 +30111,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2908,7 +2908,7 @@ static int _nfs4_do_fsinfo(struct nfs_se +@@ -2910,7 +2910,7 @@ static int _nfs4_do_fsinfo(struct nfs_se static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) { @@ -29613,7 +30120,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -2954,7 +2954,7 @@ static int _nfs4_proc_pathconf(struct nf +@@ -2956,7 +2956,7 @@ static int _nfs4_proc_pathconf(struct nf static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_pathconf *pathconf) { @@ -29622,7 +30129,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -3253,7 +3253,7 @@ out_free: +@@ -3255,7 +3255,7 @@ out_free: static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) { @@ -29631,7 +30138,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c ssize_t ret; do { ret = __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -3309,7 +3309,7 @@ static int __nfs4_proc_set_acl(struct in +@@ -3311,7 +3311,7 @@ static int __nfs4_proc_set_acl(struct in static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) { @@ -29640,7 +30147,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -3574,7 +3574,7 @@ out: +@@ -3576,7 +3576,7 @@ out: int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) { struct nfs_server *server = NFS_SERVER(inode); @@ -29649,7 +30156,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3647,7 +3647,7 @@ out: +@@ -3649,7 +3649,7 @@ out: static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -29658,7 +30165,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -4021,7 +4021,7 @@ static int _nfs4_do_setlk(struct nfs4_st +@@ -4042,7 +4042,7 @@ static int _nfs4_do_setlk(struct nfs4_st static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29667,7 +30174,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -4039,7 +4039,7 @@ static int nfs4_lock_reclaim(struct nfs4 +@@ -4060,7 +4060,7 @@ static int nfs4_lock_reclaim(struct nfs4 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29676,7 +30183,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, request); -@@ -4094,7 +4094,7 @@ out: +@@ -4118,7 +4118,7 @@ out: static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -29685,7 +30192,7 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; do { -@@ -4154,7 +4154,7 @@ nfs4_proc_lock(struct file *filp, int cm +@@ -4178,7 +4178,7 @@ nfs4_proc_lock(struct file *filp, int cm int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29694,9 +30201,9 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.32.7/fs/nfsd/lockd.c linux-2.6.32.7/fs/nfsd/lockd.c ---- linux-2.6.32.7/fs/nfsd/lockd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/nfsd/lockd.c 2010-01-25 17:39:40.873419288 -0500 +diff -urNp linux-2.6.32.9/fs/nfsd/lockd.c linux-2.6.32.9/fs/nfsd/lockd.c +--- linux-2.6.32.9/fs/nfsd/lockd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/nfsd/lockd.c 2010-02-23 17:09:53.288151568 -0500 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -29706,9 +30213,9 @@ diff -urNp linux-2.6.32.7/fs/nfsd/lockd.c linux-2.6.32.7/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.32.7/fs/nfsd/vfs.c linux-2.6.32.7/fs/nfsd/vfs.c ---- linux-2.6.32.7/fs/nfsd/vfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/nfsd/vfs.c 2010-01-25 17:39:40.874437436 -0500 +diff -urNp linux-2.6.32.9/fs/nfsd/vfs.c linux-2.6.32.9/fs/nfsd/vfs.c +--- linux-2.6.32.9/fs/nfsd/vfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/nfsd/vfs.c 2010-02-23 17:09:53.288151568 -0500 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); @@ -29736,9 +30243,9 @@ diff -urNp linux-2.6.32.7/fs/nfsd/vfs.c linux-2.6.32.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.32.7/fs/nls/nls_base.c linux-2.6.32.7/fs/nls/nls_base.c ---- linux-2.6.32.7/fs/nls/nls_base.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/nls/nls_base.c 2010-01-25 17:39:40.883152088 -0500 +diff -urNp linux-2.6.32.9/fs/nls/nls_base.c linux-2.6.32.9/fs/nls/nls_base.c +--- linux-2.6.32.9/fs/nls/nls_base.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/nls/nls_base.c 2010-02-23 17:09:53.288151568 -0500 @@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -29748,9 +30255,9 @@ diff -urNp linux-2.6.32.7/fs/nls/nls_base.c linux-2.6.32.7/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.32.7/fs/ntfs/file.c linux-2.6.32.7/fs/ntfs/file.c ---- linux-2.6.32.7/fs/ntfs/file.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ntfs/file.c 2010-01-25 17:39:40.902188088 -0500 +diff -urNp linux-2.6.32.9/fs/ntfs/file.c linux-2.6.32.9/fs/ntfs/file.c +--- linux-2.6.32.9/fs/ntfs/file.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ntfs/file.c 2010-02-23 17:09:53.288151568 -0500 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -29760,9 +30267,9 @@ diff -urNp linux-2.6.32.7/fs/ntfs/file.c linux-2.6.32.7/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.7/fs/ocfs2/cluster/masklog.c linux-2.6.32.7/fs/ocfs2/cluster/masklog.c ---- linux-2.6.32.7/fs/ocfs2/cluster/masklog.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ocfs2/cluster/masklog.c 2010-01-25 17:39:40.902188088 -0500 +diff -urNp linux-2.6.32.9/fs/ocfs2/cluster/masklog.c linux-2.6.32.9/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ocfs2/cluster/masklog.c 2010-02-23 17:09:53.288151568 -0500 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -29772,9 +30279,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/cluster/masklog.c linux-2.6.32.7/fs/ocfs2/clu .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.32.7/fs/ocfs2/localalloc.c linux-2.6.32.7/fs/ocfs2/localalloc.c ---- linux-2.6.32.7/fs/ocfs2/localalloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ocfs2/localalloc.c 2010-01-25 17:39:40.902188088 -0500 +diff -urNp linux-2.6.32.9/fs/ocfs2/localalloc.c linux-2.6.32.9/fs/ocfs2/localalloc.c +--- linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ocfs2/localalloc.c 2010-02-23 17:09:53.292465795 -0500 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -29784,9 +30291,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/localalloc.c linux-2.6.32.7/fs/ocfs2/localall status = 0; bail: -diff -urNp linux-2.6.32.7/fs/ocfs2/ocfs2.h linux-2.6.32.7/fs/ocfs2/ocfs2.h ---- linux-2.6.32.7/fs/ocfs2/ocfs2.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ocfs2/ocfs2.h 2010-01-25 17:39:40.913256012 -0500 +diff -urNp linux-2.6.32.9/fs/ocfs2/ocfs2.h linux-2.6.32.9/fs/ocfs2/ocfs2.h +--- linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ocfs2/ocfs2.h 2010-02-23 17:09:53.292465795 -0500 @@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -29804,9 +30311,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/ocfs2.h linux-2.6.32.7/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.32.7/fs/ocfs2/suballoc.c linux-2.6.32.7/fs/ocfs2/suballoc.c ---- linux-2.6.32.7/fs/ocfs2/suballoc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ocfs2/suballoc.c 2010-01-25 17:39:40.913256012 -0500 +diff -urNp linux-2.6.32.9/fs/ocfs2/suballoc.c linux-2.6.32.9/fs/ocfs2/suballoc.c +--- linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ocfs2/suballoc.c 2010-02-23 17:09:53.292465795 -0500 @@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -29852,9 +30359,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/suballoc.c linux-2.6.32.7/fs/ocfs2/suballoc.c } } if (status < 0) { -diff -urNp linux-2.6.32.7/fs/ocfs2/super.c linux-2.6.32.7/fs/ocfs2/super.c ---- linux-2.6.32.7/fs/ocfs2/super.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/ocfs2/super.c 2010-01-25 17:39:40.914424986 -0500 +diff -urNp linux-2.6.32.9/fs/ocfs2/super.c linux-2.6.32.9/fs/ocfs2/super.c +--- linux-2.6.32.9/fs/ocfs2/super.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/ocfs2/super.c 2010-02-23 17:09:53.292465795 -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", @@ -29889,9 +30396,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/super.c linux-2.6.32.7/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.32.7/fs/open.c linux-2.6.32.7/fs/open.c ---- linux-2.6.32.7/fs/open.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/open.c 2010-01-25 17:39:40.914424986 -0500 +diff -urNp linux-2.6.32.9/fs/open.c linux-2.6.32.9/fs/open.c +--- linux-2.6.32.9/fs/open.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/open.c 2010-02-23 17:09:53.292465795 -0500 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -30065,9 +30572,9 @@ diff -urNp linux-2.6.32.7/fs/open.c linux-2.6.32.7/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.32.7/fs/pipe.c linux-2.6.32.7/fs/pipe.c ---- linux-2.6.32.7/fs/pipe.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/pipe.c 2010-01-25 17:39:40.915197662 -0500 +diff -urNp linux-2.6.32.9/fs/pipe.c linux-2.6.32.9/fs/pipe.c +--- linux-2.6.32.9/fs/pipe.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/pipe.c 2010-02-23 17:09:53.292465795 -0500 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -30191,9 +30698,9 @@ diff -urNp linux-2.6.32.7/fs/pipe.c linux-2.6.32.7/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.32.7/fs/proc/array.c linux-2.6.32.7/fs/proc/array.c ---- linux-2.6.32.7/fs/proc/array.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/array.c 2010-01-25 17:39:40.915197662 -0500 +diff -urNp linux-2.6.32.9/fs/proc/array.c linux-2.6.32.9/fs/proc/array.c +--- linux-2.6.32.9/fs/proc/array.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/array.c 2010-02-23 17:09:53.292465795 -0500 @@ -410,6 +410,21 @@ static void task_show_stack_usage(struct } #endif /* CONFIG_MMU */ @@ -30284,9 +30791,9 @@ diff -urNp linux-2.6.32.7/fs/proc/array.c linux-2.6.32.7/fs/proc/array.c + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c ---- linux-2.6.32.7/fs/proc/base.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/base.c 2010-01-25 17:40:16.448319801 -0500 +diff -urNp linux-2.6.32.9/fs/proc/base.c linux-2.6.32.9/fs/proc/base.c +--- linux-2.6.32.9/fs/proc/base.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/base.c 2010-02-23 17:09:53.292465795 -0500 @@ -102,6 +102,22 @@ struct pid_entry { union proc_op op; }; @@ -30596,15 +31103,12 @@ diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2808,15 +2924,34 @@ int proc_pid_readdir(struct file * filp, - ns = filp->f_dentry->d_sb->s_fs_info; - iter.task = NULL; - iter.tgid = filp->f_pos - TGID_OFFSET; -+ rcu_read_lock(); +@@ -2811,8 +2927,27 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ rcu_read_lock(); + itercred = __task_cred(iter.task); +#endif + if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task) @@ -30619,19 +31123,15 @@ diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c + __filldir = &gr_fake_filldir; + else + __filldir = filldir; -+ ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ rcu_read_unlock(); ++#endif filp->f_pos = iter.tgid + TGID_OFFSET; - if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) { + if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) { put_task_struct(iter.task); -+ rcu_read_unlock(); goto out; } - } -+ rcu_read_unlock(); - filp->f_pos = PID_MAX_LIMIT + TGID_OFFSET; - out: - put_task_struct(reaper); @@ -2838,7 +2973,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), @@ -30650,9 +31150,9 @@ diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.32.7/fs/proc/cmdline.c linux-2.6.32.7/fs/proc/cmdline.c ---- linux-2.6.32.7/fs/proc/cmdline.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/cmdline.c 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/cmdline.c linux-2.6.32.9/fs/proc/cmdline.c +--- linux-2.6.32.9/fs/proc/cmdline.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/cmdline.c 2010-02-23 17:09:53.292465795 -0500 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -30665,9 +31165,9 @@ diff -urNp linux-2.6.32.7/fs/proc/cmdline.c linux-2.6.32.7/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.32.7/fs/proc/devices.c linux-2.6.32.7/fs/proc/devices.c ---- linux-2.6.32.7/fs/proc/devices.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/devices.c 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/devices.c linux-2.6.32.9/fs/proc/devices.c +--- linux-2.6.32.9/fs/proc/devices.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/devices.c 2010-02-23 17:09:53.292465795 -0500 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -30680,9 +31180,9 @@ diff -urNp linux-2.6.32.7/fs/proc/devices.c linux-2.6.32.7/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.32.7/fs/proc/inode.c linux-2.6.32.7/fs/proc/inode.c ---- linux-2.6.32.7/fs/proc/inode.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/inode.c 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/inode.c linux-2.6.32.9/fs/proc/inode.c +--- linux-2.6.32.9/fs/proc/inode.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/inode.c 2010-02-23 17:09:53.292465795 -0500 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -30695,9 +31195,9 @@ diff -urNp linux-2.6.32.7/fs/proc/inode.c linux-2.6.32.7/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.32.7/fs/proc/internal.h linux-2.6.32.7/fs/proc/internal.h ---- linux-2.6.32.7/fs/proc/internal.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/internal.h 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/internal.h linux-2.6.32.9/fs/proc/internal.h +--- linux-2.6.32.9/fs/proc/internal.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/internal.h 2010-02-23 17:09:53.292465795 -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, @@ -30708,9 +31208,9 @@ diff -urNp linux-2.6.32.7/fs/proc/internal.h linux-2.6.32.7/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.7/fs/proc/Kconfig linux-2.6.32.7/fs/proc/Kconfig ---- linux-2.6.32.7/fs/proc/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/Kconfig 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/Kconfig linux-2.6.32.9/fs/proc/Kconfig +--- linux-2.6.32.9/fs/proc/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/Kconfig 2010-02-23 17:09:53.296048133 -0500 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -30738,9 +31238,9 @@ diff -urNp linux-2.6.32.7/fs/proc/Kconfig linux-2.6.32.7/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.7/fs/proc/kcore.c linux-2.6.32.7/fs/proc/kcore.c ---- linux-2.6.32.7/fs/proc/kcore.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/kcore.c 2010-01-25 17:39:40.916430448 -0500 +diff -urNp linux-2.6.32.9/fs/proc/kcore.c linux-2.6.32.9/fs/proc/kcore.c +--- linux-2.6.32.9/fs/proc/kcore.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/kcore.c 2010-02-23 17:09:53.296048133 -0500 @@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use static int open_kcore(struct inode *inode, struct file *filp) @@ -30751,9 +31251,9 @@ diff -urNp linux-2.6.32.7/fs/proc/kcore.c linux-2.6.32.7/fs/proc/kcore.c if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (kcore_need_update) -diff -urNp linux-2.6.32.7/fs/proc/meminfo.c linux-2.6.32.7/fs/proc/meminfo.c ---- linux-2.6.32.7/fs/proc/meminfo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/meminfo.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/meminfo.c linux-2.6.32.9/fs/proc/meminfo.c +--- linux-2.6.32.9/fs/proc/meminfo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/meminfo.c 2010-02-23 17:09:53.296048133 -0500 @@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ vmi.used >> 10, vmi.largest_chunk >> 10 @@ -30763,9 +31263,9 @@ diff -urNp linux-2.6.32.7/fs/proc/meminfo.c linux-2.6.32.7/fs/proc/meminfo.c #endif ); -diff -urNp linux-2.6.32.7/fs/proc/nommu.c linux-2.6.32.7/fs/proc/nommu.c ---- linux-2.6.32.7/fs/proc/nommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/nommu.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/nommu.c linux-2.6.32.9/fs/proc/nommu.c +--- linux-2.6.32.9/fs/proc/nommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/nommu.c 2010-02-23 17:09:53.296048133 -0500 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -30775,9 +31275,9 @@ diff -urNp linux-2.6.32.7/fs/proc/nommu.c linux-2.6.32.7/fs/proc/nommu.c } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.7/fs/proc/proc_net.c linux-2.6.32.7/fs/proc/proc_net.c ---- linux-2.6.32.7/fs/proc/proc_net.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/proc_net.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/proc_net.c linux-2.6.32.9/fs/proc/proc_net.c +--- linux-2.6.32.9/fs/proc/proc_net.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/proc_net.c 2010-02-23 17:09:53.296048133 -0500 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -30796,9 +31296,9 @@ diff -urNp linux-2.6.32.7/fs/proc/proc_net.c linux-2.6.32.7/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.32.7/fs/proc/proc_sysctl.c linux-2.6.32.7/fs/proc/proc_sysctl.c ---- linux-2.6.32.7/fs/proc/proc_sysctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/proc_sysctl.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/proc_sysctl.c linux-2.6.32.9/fs/proc/proc_sysctl.c +--- linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/proc_sysctl.c 2010-02-23 17:09:53.296048133 -0500 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -30838,9 +31338,9 @@ diff -urNp linux-2.6.32.7/fs/proc/proc_sysctl.c linux-2.6.32.7/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.32.7/fs/proc/root.c linux-2.6.32.7/fs/proc/root.c ---- linux-2.6.32.7/fs/proc/root.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/root.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/root.c linux-2.6.32.9/fs/proc/root.c +--- linux-2.6.32.9/fs/proc/root.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/root.c 2010-02-23 17:09:53.296048133 -0500 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -30857,9 +31357,9 @@ diff -urNp linux-2.6.32.7/fs/proc/root.c linux-2.6.32.7/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.32.7/fs/proc/task_mmu.c linux-2.6.32.7/fs/proc/task_mmu.c ---- linux-2.6.32.7/fs/proc/task_mmu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/task_mmu.c 2010-01-25 17:39:40.917435777 -0500 +diff -urNp linux-2.6.32.9/fs/proc/task_mmu.c linux-2.6.32.9/fs/proc/task_mmu.c +--- linux-2.6.32.9/fs/proc/task_mmu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/task_mmu.c 2010-02-23 17:09:53.296048133 -0500 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -30980,9 +31480,9 @@ diff -urNp linux-2.6.32.7/fs/proc/task_mmu.c linux-2.6.32.7/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.7/fs/proc/task_nommu.c linux-2.6.32.7/fs/proc/task_nommu.c ---- linux-2.6.32.7/fs/proc/task_nommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/proc/task_nommu.c 2010-01-25 17:39:40.918432923 -0500 +diff -urNp linux-2.6.32.9/fs/proc/task_nommu.c linux-2.6.32.9/fs/proc/task_nommu.c +--- linux-2.6.32.9/fs/proc/task_nommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/proc/task_nommu.c 2010-02-23 17:09:53.296048133 -0500 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -31001,9 +31501,9 @@ diff -urNp linux-2.6.32.7/fs/proc/task_nommu.c linux-2.6.32.7/fs/proc/task_nommu } seq_putc(m, '\n'); -diff -urNp linux-2.6.32.7/fs/readdir.c linux-2.6.32.7/fs/readdir.c ---- linux-2.6.32.7/fs/readdir.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/readdir.c 2010-01-25 17:39:40.918432923 -0500 +diff -urNp linux-2.6.32.9/fs/readdir.c linux-2.6.32.9/fs/readdir.c +--- linux-2.6.32.9/fs/readdir.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/readdir.c 2010-02-23 17:09:53.296048133 -0500 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -31093,9 +31593,9 @@ diff -urNp linux-2.6.32.7/fs/readdir.c linux-2.6.32.7/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.32.7/fs/reiserfs/do_balan.c linux-2.6.32.7/fs/reiserfs/do_balan.c ---- linux-2.6.32.7/fs/reiserfs/do_balan.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/reiserfs/do_balan.c 2010-01-25 17:39:40.959563277 -0500 +diff -urNp linux-2.6.32.9/fs/reiserfs/do_balan.c linux-2.6.32.9/fs/reiserfs/do_balan.c +--- linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/reiserfs/do_balan.c 2010-02-23 17:09:53.296048133 -0500 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -31105,9 +31605,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/do_balan.c linux-2.6.32.7/fs/reiserfs/do_b do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.32.7/fs/reiserfs/item_ops.c linux-2.6.32.7/fs/reiserfs/item_ops.c ---- linux-2.6.32.7/fs/reiserfs/item_ops.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/reiserfs/item_ops.c 2010-01-25 17:39:40.960151903 -0500 +diff -urNp linux-2.6.32.9/fs/reiserfs/item_ops.c linux-2.6.32.9/fs/reiserfs/item_ops.c +--- linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/reiserfs/item_ops.c 2010-02-23 17:09:53.296048133 -0500 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -31162,9 +31662,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/item_ops.c linux-2.6.32.7/fs/reiserfs/item &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.32.7/fs/reiserfs/procfs.c linux-2.6.32.7/fs/reiserfs/procfs.c ---- linux-2.6.32.7/fs/reiserfs/procfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/reiserfs/procfs.c 2010-01-25 17:39:40.960151903 -0500 +diff -urNp linux-2.6.32.9/fs/reiserfs/procfs.c linux-2.6.32.9/fs/reiserfs/procfs.c +--- linux-2.6.32.9/fs/reiserfs/procfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/reiserfs/procfs.c 2010-02-23 17:09:53.296048133 -0500 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -31174,9 +31674,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/procfs.c linux-2.6.32.7/fs/reiserfs/procfs SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.32.7/fs/select.c linux-2.6.32.7/fs/select.c ---- linux-2.6.32.7/fs/select.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/select.c 2010-01-25 17:39:40.960151903 -0500 +diff -urNp linux-2.6.32.9/fs/select.c linux-2.6.32.9/fs/select.c +--- linux-2.6.32.9/fs/select.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/select.c 2010-02-23 17:09:53.296048133 -0500 @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -31193,9 +31693,9 @@ diff -urNp linux-2.6.32.7/fs/select.c linux-2.6.32.7/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.32.7/fs/seq_file.c linux-2.6.32.7/fs/seq_file.c ---- linux-2.6.32.7/fs/seq_file.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/seq_file.c 2010-01-25 17:39:40.960151903 -0500 +diff -urNp linux-2.6.32.9/fs/seq_file.c linux-2.6.32.9/fs/seq_file.c +--- linux-2.6.32.9/fs/seq_file.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/seq_file.c 2010-02-23 17:09:53.296048133 -0500 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -31236,9 +31736,9 @@ diff -urNp linux-2.6.32.7/fs/seq_file.c linux-2.6.32.7/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.32.7/fs/smbfs/symlink.c linux-2.6.32.7/fs/smbfs/symlink.c ---- linux-2.6.32.7/fs/smbfs/symlink.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/smbfs/symlink.c 2010-01-25 17:39:40.964437549 -0500 +diff -urNp linux-2.6.32.9/fs/smbfs/symlink.c linux-2.6.32.9/fs/smbfs/symlink.c +--- linux-2.6.32.9/fs/smbfs/symlink.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/smbfs/symlink.c 2010-02-23 17:09:53.296048133 -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) @@ -31248,9 +31748,9 @@ diff -urNp linux-2.6.32.7/fs/smbfs/symlink.c linux-2.6.32.7/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.32.7/fs/splice.c linux-2.6.32.7/fs/splice.c ---- linux-2.6.32.7/fs/splice.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/splice.c 2010-01-25 17:39:40.965404168 -0500 +diff -urNp linux-2.6.32.9/fs/splice.c linux-2.6.32.9/fs/splice.c +--- linux-2.6.32.9/fs/splice.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/splice.c 2010-02-23 17:09:53.300060401 -0500 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -31389,9 +31889,9 @@ diff -urNp linux-2.6.32.7/fs/splice.c linux-2.6.32.7/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.32.7/fs/sysfs/file.c linux-2.6.32.7/fs/sysfs/file.c ---- linux-2.6.32.7/fs/sysfs/file.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/sysfs/file.c 2010-01-25 17:39:40.965404168 -0500 +diff -urNp linux-2.6.32.9/fs/sysfs/file.c linux-2.6.32.9/fs/sysfs/file.c +--- linux-2.6.32.9/fs/sysfs/file.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/sysfs/file.c 2010-02-23 17:09:53.300060401 -0500 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -31428,9 +31928,9 @@ diff -urNp linux-2.6.32.7/fs/sysfs/file.c linux-2.6.32.7/fs/sysfs/file.c int error = -EACCES; char *p; -diff -urNp linux-2.6.32.7/fs/sysfs/symlink.c linux-2.6.32.7/fs/sysfs/symlink.c ---- linux-2.6.32.7/fs/sysfs/symlink.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/sysfs/symlink.c 2010-01-25 17:39:40.975519594 -0500 +diff -urNp linux-2.6.32.9/fs/sysfs/symlink.c linux-2.6.32.9/fs/sysfs/symlink.c +--- linux-2.6.32.9/fs/sysfs/symlink.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/sysfs/symlink.c 2010-02-23 17:09:53.300060401 -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) @@ -31440,9 +31940,9 @@ diff -urNp linux-2.6.32.7/fs/sysfs/symlink.c linux-2.6.32.7/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.32.7/fs/udf/balloc.c linux-2.6.32.7/fs/udf/balloc.c ---- linux-2.6.32.7/fs/udf/balloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/udf/balloc.c 2010-01-25 17:39:40.975519594 -0500 +diff -urNp linux-2.6.32.9/fs/udf/balloc.c linux-2.6.32.9/fs/udf/balloc.c +--- linux-2.6.32.9/fs/udf/balloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/udf/balloc.c 2010-02-23 17:09:53.300060401 -0500 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -31465,9 +31965,9 @@ diff -urNp linux-2.6.32.7/fs/udf/balloc.c linux-2.6.32.7/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.7/fs/utimes.c linux-2.6.32.7/fs/utimes.c ---- linux-2.6.32.7/fs/utimes.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/utimes.c 2010-01-25 17:39:40.975519594 -0500 +diff -urNp linux-2.6.32.9/fs/utimes.c linux-2.6.32.9/fs/utimes.c +--- linux-2.6.32.9/fs/utimes.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/utimes.c 2010-02-23 17:09:53.300060401 -0500 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -31489,9 +31989,9 @@ diff -urNp linux-2.6.32.7/fs/utimes.c linux-2.6.32.7/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.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c 2010-01-25 17:39:40.975519594 -0500 +diff -urNp linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/xfs/linux-2.6/xfs_iops.c 2010-02-23 17:09:53.300060401 -0500 @@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) @@ -31501,9 +32001,9 @@ diff -urNp linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.7/fs/xfs/linu if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.32.7/fs/xfs/xfs_bmap.c linux-2.6.32.7/fs/xfs/xfs_bmap.c ---- linux-2.6.32.7/fs/xfs/xfs_bmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/fs/xfs/xfs_bmap.c 2010-01-25 17:39:40.976427457 -0500 +diff -urNp linux-2.6.32.9/fs/xfs/xfs_bmap.c linux-2.6.32.9/fs/xfs/xfs_bmap.c +--- linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/fs/xfs/xfs_bmap.c 2010-02-23 17:09:53.300060401 -0500 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -31513,9 +32013,9 @@ diff -urNp linux-2.6.32.7/fs/xfs/xfs_bmap.c linux-2.6.32.7/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.32.7/grsecurity/gracl_alloc.c linux-2.6.32.7/grsecurity/gracl_alloc.c ---- linux-2.6.32.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_alloc.c 2010-01-25 17:39:40.977439695 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_alloc.c linux-2.6.32.9/grsecurity/gracl_alloc.c +--- linux-2.6.32.9/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_alloc.c 2010-02-23 17:09:53.300060401 -0500 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -31622,9 +32122,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_alloc.c linux-2.6.32.7/grsecurity/gra + else + return 1; +} -diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c ---- linux-2.6.32.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl.c 2010-01-25 17:39:40.978422732 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl.c linux-2.6.32.9/grsecurity/gracl.c +--- linux-2.6.32.9/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,3918 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -35437,7 +35937,7 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c + read_lock(&tasklist_lock); + task = find_task_by_vpid(pid); + if (task) { -+ task_lock(task); ++ gr_fs_read_lock(task); +#ifdef CONFIG_GRKERNSEC_CHROOT + if (proc_is_chrooted(task)) + ret = -EACCES; @@ -35457,7 +35957,7 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c + ret = -EACCES; + } + -+ task_unlock(task); ++ gr_fs_read_unlock(task); + } else + ret = -ENOENT; + @@ -35544,9 +36044,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.32.7/grsecurity/gracl_cap.c linux-2.6.32.7/grsecurity/gracl_cap.c ---- linux-2.6.32.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_cap.c 2010-01-25 17:39:40.978422732 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_cap.c linux-2.6.32.9/grsecurity/gracl_cap.c +--- linux-2.6.32.9/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_cap.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -35679,9 +36179,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_cap.c linux-2.6.32.7/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.32.7/grsecurity/gracl_fs.c linux-2.6.32.7/grsecurity/gracl_fs.c ---- linux-2.6.32.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_fs.c 2010-01-25 17:39:40.979435589 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_fs.c linux-2.6.32.9/grsecurity/gracl_fs.c +--- linux-2.6.32.9/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_fs.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -36107,9 +36607,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_fs.c linux-2.6.32.7/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.32.7/grsecurity/gracl_ip.c linux-2.6.32.7/grsecurity/gracl_ip.c ---- linux-2.6.32.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_ip.c 2010-01-25 17:39:40.979435589 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_ip.c linux-2.6.32.9/grsecurity/gracl_ip.c +--- linux-2.6.32.9/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_ip.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -36450,9 +36950,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_ip.c linux-2.6.32.7/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.32.7/grsecurity/gracl_learn.c linux-2.6.32.7/grsecurity/gracl_learn.c ---- linux-2.6.32.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_learn.c 2010-01-25 17:39:40.979435589 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_learn.c linux-2.6.32.9/grsecurity/gracl_learn.c +--- linux-2.6.32.9/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_learn.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -36665,9 +37165,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_learn.c linux-2.6.32.7/grsecurity/gra + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.32.7/grsecurity/gracl_res.c linux-2.6.32.7/grsecurity/gracl_res.c ---- linux-2.6.32.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_res.c 2010-01-25 17:39:40.979435589 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_res.c linux-2.6.32.9/grsecurity/gracl_res.c +--- linux-2.6.32.9/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_res.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -36734,9 +37234,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_res.c linux-2.6.32.7/grsecurity/gracl + rcu_read_unlock(); + return; +} -diff -urNp linux-2.6.32.7/grsecurity/gracl_segv.c linux-2.6.32.7/grsecurity/gracl_segv.c ---- linux-2.6.32.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_segv.c 2010-01-25 17:39:40.979435589 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_segv.c linux-2.6.32.9/grsecurity/gracl_segv.c +--- linux-2.6.32.9/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_segv.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,310 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -37048,9 +37548,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_segv.c linux-2.6.32.7/grsecurity/grac + + return; +} -diff -urNp linux-2.6.32.7/grsecurity/gracl_shm.c linux-2.6.32.7/grsecurity/gracl_shm.c ---- linux-2.6.32.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/gracl_shm.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/gracl_shm.c linux-2.6.32.9/grsecurity/gracl_shm.c +--- linux-2.6.32.9/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/gracl_shm.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -37089,9 +37589,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_shm.c linux-2.6.32.7/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_chdir.c linux-2.6.32.7/grsecurity/grsec_chdir.c ---- linux-2.6.32.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_chdir.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_chdir.c linux-2.6.32.9/grsecurity/grsec_chdir.c +--- linux-2.6.32.9/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_chdir.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -37112,9 +37612,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chdir.c linux-2.6.32.7/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/grsec_chroot.c ---- linux-2.6.32.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_chroot.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_chroot.c linux-2.6.32.9/grsecurity/grsec_chroot.c +--- linux-2.6.32.9/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_chroot.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,348 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -37145,14 +37645,14 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/gr + if (spid) { + struct task_struct *p; + p = pid_task(spid, PIDTYPE_PID); -+ task_lock(p); ++ gr_fs_read_lock(p); + if (unlikely(!have_same_root(current, p))) { -+ task_unlock(p); ++ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); + return 0; + } -+ task_unlock(p); ++ gr_fs_read_unlock(p); + } + read_unlock(&tasklist_lock); +#endif @@ -37202,13 +37702,13 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/gr + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) + return 0; + -+ task_lock(p); ++ gr_fs_read_lock(p); + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || + !have_same_root(current, p)) { -+ task_unlock(p); ++ gr_fs_read_unlock(p); + return 1; + } -+ task_unlock(p); ++ gr_fs_read_unlock(p); +#endif + return 0; +} @@ -37303,29 +37803,29 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/gr + if (pid) { + struct task_struct *p; + p = pid_task(pid, PIDTYPE_PID); -+ task_lock(p); ++ gr_fs_read_lock(p); + starttime = p->start_time.tv_sec; + if (unlikely(!have_same_root(current, p) && + time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) { -+ task_unlock(p); ++ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); + return 0; + } -+ task_unlock(p); ++ gr_fs_read_unlock(p); + } else { + pid = find_vpid(shm_lapid); + if (pid) { + struct task_struct *p; + p = pid_task(pid, PIDTYPE_PID); -+ task_lock(p); ++ gr_fs_read_lock(p); + if (unlikely(!have_same_root(current, p))) { -+ task_unlock(p); ++ gr_fs_read_unlock(p); + read_unlock(&tasklist_lock); + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); + return 0; + } -+ task_unlock(p); ++ gr_fs_read_unlock(p); + } + } + @@ -37464,9 +37964,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.32.7/grsecurity/grsec_disabled.c linux-2.6.32.7/grsecurity/grsec_disabled.c ---- linux-2.6.32.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_disabled.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_disabled.c linux-2.6.32.9/grsecurity/grsec_disabled.c +--- linux-2.6.32.9/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_disabled.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -37894,9 +38394,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_disabled.c linux-2.6.32.7/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.32.7/grsecurity/grsec_exec.c linux-2.6.32.7/grsecurity/grsec_exec.c ---- linux-2.6.32.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_exec.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_exec.c linux-2.6.32.9/grsecurity/grsec_exec.c +--- linux-2.6.32.9/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_exec.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -37987,9 +38487,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_exec.c linux-2.6.32.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_fifo.c linux-2.6.32.7/grsecurity/grsec_fifo.c ---- linux-2.6.32.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_fifo.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_fifo.c linux-2.6.32.9/grsecurity/grsec_fifo.c +--- linux-2.6.32.9/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_fifo.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38015,9 +38515,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_fifo.c linux-2.6.32.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_fork.c linux-2.6.32.7/grsecurity/grsec_fork.c ---- linux-2.6.32.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_fork.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_fork.c linux-2.6.32.9/grsecurity/grsec_fork.c +--- linux-2.6.32.9/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_fork.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38034,9 +38534,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_fork.c linux-2.6.32.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_init.c linux-2.6.32.7/grsecurity/grsec_init.c ---- linux-2.6.32.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_init.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_init.c linux-2.6.32.9/grsecurity/grsec_init.c +--- linux-2.6.32.9/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_init.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,231 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38269,9 +38769,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_init.c linux-2.6.32.7/grsecurity/grse + + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_link.c linux-2.6.32.7/grsecurity/grsec_link.c ---- linux-2.6.32.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_link.c 2010-01-25 17:39:40.980422600 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_link.c linux-2.6.32.9/grsecurity/grsec_link.c +--- linux-2.6.32.9/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_link.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38316,9 +38816,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_link.c linux-2.6.32.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_log.c linux-2.6.32.7/grsecurity/grsec_log.c ---- linux-2.6.32.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_log.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_log.c linux-2.6.32.9/grsecurity/grsec_log.c +--- linux-2.6.32.9/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_log.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,296 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38616,9 +39116,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_log.c linux-2.6.32.7/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_mem.c linux-2.6.32.7/grsecurity/grsec_mem.c ---- linux-2.6.32.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_mem.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_mem.c linux-2.6.32.9/grsecurity/grsec_mem.c +--- linux-2.6.32.9/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_mem.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38705,9 +39205,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_mem.c linux-2.6.32.7/grsecurity/grsec + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_mount.c linux-2.6.32.7/grsecurity/grsec_mount.c ---- linux-2.6.32.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_mount.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_mount.c linux-2.6.32.9/grsecurity/grsec_mount.c +--- linux-2.6.32.9/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_mount.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38771,9 +39271,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_mount.c linux-2.6.32.7/grsecurity/grs +#endif + return 0; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_sig.c linux-2.6.32.7/grsecurity/grsec_sig.c ---- linux-2.6.32.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_sig.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_sig.c linux-2.6.32.9/grsecurity/grsec_sig.c +--- linux-2.6.32.9/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_sig.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38840,9 +39340,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sig.c linux-2.6.32.7/grsecurity/grsec + return; +} + -diff -urNp linux-2.6.32.7/grsecurity/grsec_sock.c linux-2.6.32.7/grsecurity/grsec_sock.c ---- linux-2.6.32.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_sock.c 2010-01-25 19:59:21.258136279 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_sock.c linux-2.6.32.9/grsecurity/grsec_sock.c +--- linux-2.6.32.9/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_sock.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,271 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39115,9 +39615,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sock.c linux-2.6.32.7/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_sysctl.c linux-2.6.32.7/grsecurity/grsec_sysctl.c ---- linux-2.6.32.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_sysctl.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_sysctl.c linux-2.6.32.9/grsecurity/grsec_sysctl.c +--- linux-2.6.32.9/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_sysctl.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,419 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39538,9 +40038,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sysctl.c linux-2.6.32.7/grsecurity/gr + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.32.7/grsecurity/grsec_textrel.c linux-2.6.32.7/grsecurity/grsec_textrel.c ---- linux-2.6.32.7/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_textrel.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_textrel.c linux-2.6.32.9/grsecurity/grsec_textrel.c +--- linux-2.6.32.9/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_textrel.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39558,9 +40058,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_textrel.c linux-2.6.32.7/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_time.c linux-2.6.32.7/grsecurity/grsec_time.c ---- linux-2.6.32.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_time.c 2010-01-25 17:39:40.981426611 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_time.c linux-2.6.32.9/grsecurity/grsec_time.c +--- linux-2.6.32.9/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_time.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39575,9 +40075,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_time.c linux-2.6.32.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.32.7/grsecurity/grsec_tpe.c linux-2.6.32.7/grsecurity/grsec_tpe.c ---- linux-2.6.32.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsec_tpe.c 2010-01-25 17:39:40.982430149 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsec_tpe.c linux-2.6.32.9/grsecurity/grsec_tpe.c +--- linux-2.6.32.9/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsec_tpe.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39617,9 +40117,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_tpe.c linux-2.6.32.7/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.32.7/grsecurity/grsum.c linux-2.6.32.7/grsecurity/grsum.c ---- linux-2.6.32.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/grsum.c 2010-01-25 17:39:40.982430149 -0500 +diff -urNp linux-2.6.32.9/grsecurity/grsum.c linux-2.6.32.9/grsecurity/grsum.c +--- linux-2.6.32.9/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/grsum.c 2010-02-23 17:09:53.304046495 -0500 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -39680,9 +40180,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsum.c linux-2.6.32.7/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.32.7/grsecurity/Kconfig linux-2.6.32.7/grsecurity/Kconfig ---- linux-2.6.32.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/Kconfig 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/grsecurity/Kconfig linux-2.6.32.9/grsecurity/Kconfig +--- linux-2.6.32.9/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/Kconfig 2010-02-23 17:09:53.308131663 -0500 @@ -0,0 +1,937 @@ +# +# grecurity configuration @@ -39834,8 +40334,8 @@ diff -urNp linux-2.6.32.7/grsecurity/Kconfig linux-2.6.32.7/grsecurity/Kconfig + select PAX_EI_PAX + select PAX_PT_PAX_FLAGS + select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if (X86 && (!X86_32 || X86_WP_WORKS_OK)) -+ select PAX_MEMORY_UDEREF if (X86_32) ++ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) ++ select PAX_MEMORY_UDEREF if (X86_32 && !XEN) + select PAX_RANDKSTACK if (X86_TSC && !X86_64) + select PAX_SEGMEXEC if (X86_32) + select PAX_PAGEEXEC @@ -40621,9 +41121,9 @@ diff -urNp linux-2.6.32.7/grsecurity/Kconfig linux-2.6.32.7/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.32.7/grsecurity/Makefile linux-2.6.32.7/grsecurity/Makefile ---- linux-2.6.32.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/grsecurity/Makefile 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/grsecurity/Makefile linux-2.6.32.9/grsecurity/Makefile +--- linux-2.6.32.9/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/grsecurity/Makefile 2010-02-23 17:09:53.308131663 -0500 @@ -0,0 +1,29 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2009 it has been completely redesigned by Brad Spengler @@ -40654,9 +41154,9 @@ diff -urNp linux-2.6.32.7/grsecurity/Makefile linux-2.6.32.7/grsecurity/Makefile + @-chmod -f 700 . + @echo ' grsec: protected kernel image paths' +endif -diff -urNp linux-2.6.32.7/include/acpi/acpi_drivers.h linux-2.6.32.7/include/acpi/acpi_drivers.h ---- linux-2.6.32.7/include/acpi/acpi_drivers.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/acpi/acpi_drivers.h 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/include/acpi/acpi_drivers.h linux-2.6.32.9/include/acpi/acpi_drivers.h +--- linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/acpi/acpi_drivers.h 2010-02-23 17:09:53.308131663 -0500 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -40686,9 +41186,9 @@ diff -urNp linux-2.6.32.7/include/acpi/acpi_drivers.h linux-2.6.32.7/include/acp void *context) { return -ENODEV; -diff -urNp linux-2.6.32.7/include/asm-generic/atomic-long.h linux-2.6.32.7/include/asm-generic/atomic-long.h ---- linux-2.6.32.7/include/asm-generic/atomic-long.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/atomic-long.h 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/atomic-long.h linux-2.6.32.9/include/asm-generic/atomic-long.h +--- linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/atomic-long.h 2010-02-23 17:09:53.308131663 -0500 @@ -22,6 +22,12 @@ typedef atomic64_t atomic_long_t; @@ -40909,9 +41409,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/atomic-long.h linux-2.6.32.7/inclu +#endif + #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ -diff -urNp linux-2.6.32.7/include/asm-generic/dma-mapping-common.h linux-2.6.32.7/include/asm-generic/dma-mapping-common.h ---- linux-2.6.32.7/include/asm-generic/dma-mapping-common.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/dma-mapping-common.h 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/dma-mapping-common.h linux-2.6.32.9/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/dma-mapping-common.h 2010-02-23 17:09:53.308131663 -0500 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -41020,9 +41520,9 @@ diff -urNp linux-2.6.32.7/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.7/include/asm-generic/futex.h linux-2.6.32.7/include/asm-generic/futex.h ---- linux-2.6.32.7/include/asm-generic/futex.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/futex.h 2010-01-25 17:39:40.988423918 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/futex.h linux-2.6.32.9/include/asm-generic/futex.h +--- linux-2.6.32.9/include/asm-generic/futex.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/futex.h 2010-02-23 17:09:53.308131663 -0500 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -41041,9 +41541,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/futex.h linux-2.6.32.7/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.32.7/include/asm-generic/int-l64.h linux-2.6.32.7/include/asm-generic/int-l64.h ---- linux-2.6.32.7/include/asm-generic/int-l64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/int-l64.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/int-l64.h linux-2.6.32.9/include/asm-generic/int-l64.h +--- linux-2.6.32.9/include/asm-generic/int-l64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/int-l64.h 2010-02-23 17:09:53.308131663 -0500 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -41053,9 +41553,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/int-l64.h linux-2.6.32.7/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.7/include/asm-generic/int-ll64.h linux-2.6.32.7/include/asm-generic/int-ll64.h ---- linux-2.6.32.7/include/asm-generic/int-ll64.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/int-ll64.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/int-ll64.h linux-2.6.32.9/include/asm-generic/int-ll64.h +--- linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/int-ll64.h 2010-02-23 17:09:53.308131663 -0500 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -41065,9 +41565,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/int-ll64.h linux-2.6.32.7/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.32.7/include/asm-generic/kmap_types.h linux-2.6.32.7/include/asm-generic/kmap_types.h ---- linux-2.6.32.7/include/asm-generic/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/kmap_types.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/kmap_types.h linux-2.6.32.9/include/asm-generic/kmap_types.h +--- linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/kmap_types.h 2010-02-23 17:09:53.308131663 -0500 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, KMAP_D(16) KM_IRQ_PTE, KMAP_D(17) KM_NMI, @@ -41078,9 +41578,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/kmap_types.h linux-2.6.32.7/includ }; #undef KMAP_D -diff -urNp linux-2.6.32.7/include/asm-generic/pgtable.h linux-2.6.32.7/include/asm-generic/pgtable.h ---- linux-2.6.32.7/include/asm-generic/pgtable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/pgtable.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/pgtable.h linux-2.6.32.9/include/asm-generic/pgtable.h +--- linux-2.6.32.9/include/asm-generic/pgtable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/pgtable.h 2010-02-23 17:09:53.308131663 -0500 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -41096,9 +41596,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/pgtable.h linux-2.6.32.7/include/a #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.32.7/include/asm-generic/vmlinux.lds.h linux-2.6.32.7/include/asm-generic/vmlinux.lds.h ---- linux-2.6.32.7/include/asm-generic/vmlinux.lds.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/asm-generic/vmlinux.lds.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/asm-generic/vmlinux.lds.h linux-2.6.32.9/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/asm-generic/vmlinux.lds.h 2010-02-23 17:09:53.308131663 -0500 @@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ @@ -41137,9 +41637,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/vmlinux.lds.h linux-2.6.32.7/inclu /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.32.7/include/drm/drm_pciids.h linux-2.6.32.7/include/drm/drm_pciids.h ---- linux-2.6.32.7/include/drm/drm_pciids.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/drm/drm_pciids.h 2010-01-25 17:39:40.989425437 -0500 +diff -urNp linux-2.6.32.9/include/drm/drm_pciids.h linux-2.6.32.9/include/drm/drm_pciids.h +--- linux-2.6.32.9/include/drm/drm_pciids.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/drm/drm_pciids.h 2010-02-23 17:09:53.308131663 -0500 @@ -375,7 +375,7 @@ {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -41243,9 +41743,9 @@ diff -urNp linux-2.6.32.7/include/drm/drm_pciids.h linux-2.6.32.7/include/drm/dr {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.32.7/include/drm/drmP.h linux-2.6.32.7/include/drm/drmP.h ---- linux-2.6.32.7/include/drm/drmP.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/drm/drmP.h 2010-01-25 17:39:40.990424527 -0500 +diff -urNp linux-2.6.32.9/include/drm/drmP.h linux-2.6.32.9/include/drm/drmP.h +--- linux-2.6.32.9/include/drm/drmP.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/drm/drmP.h 2010-02-23 17:09:53.308131663 -0500 @@ -814,7 +814,7 @@ struct drm_driver { void (*vgaarb_irq)(struct drm_device *dev, bool state); @@ -41273,9 +41773,9 @@ diff -urNp linux-2.6.32.7/include/drm/drmP.h linux-2.6.32.7/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.32.7/include/linux/a.out.h linux-2.6.32.7/include/linux/a.out.h ---- linux-2.6.32.7/include/linux/a.out.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/a.out.h 2010-01-25 17:39:40.991299866 -0500 +diff -urNp linux-2.6.32.9/include/linux/a.out.h linux-2.6.32.9/include/linux/a.out.h +--- linux-2.6.32.9/include/linux/a.out.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/a.out.h 2010-02-23 17:09:53.308131663 -0500 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -41291,9 +41791,9 @@ diff -urNp linux-2.6.32.7/include/linux/a.out.h linux-2.6.32.7/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.32.7/include/linux/atmdev.h linux-2.6.32.7/include/linux/atmdev.h ---- linux-2.6.32.7/include/linux/atmdev.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/atmdev.h 2010-01-25 17:39:40.991299866 -0500 +diff -urNp linux-2.6.32.9/include/linux/atmdev.h linux-2.6.32.9/include/linux/atmdev.h +--- linux-2.6.32.9/include/linux/atmdev.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/atmdev.h 2010-02-23 17:09:53.308131663 -0500 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -41303,9 +41803,9 @@ diff -urNp linux-2.6.32.7/include/linux/atmdev.h linux-2.6.32.7/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.7/include/linux/backlight.h linux-2.6.32.7/include/linux/backlight.h ---- linux-2.6.32.7/include/linux/backlight.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/backlight.h 2010-01-25 17:39:40.991299866 -0500 +diff -urNp linux-2.6.32.9/include/linux/backlight.h linux-2.6.32.9/include/linux/backlight.h +--- linux-2.6.32.9/include/linux/backlight.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/backlight.h 2010-02-23 17:09:53.308131663 -0500 @@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; @@ -41347,9 +41847,9 @@ diff -urNp linux-2.6.32.7/include/linux/backlight.h linux-2.6.32.7/include/linux 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.7/include/linux/binfmts.h linux-2.6.32.7/include/linux/binfmts.h ---- linux-2.6.32.7/include/linux/binfmts.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/binfmts.h 2010-01-25 17:39:40.991299866 -0500 +diff -urNp linux-2.6.32.9/include/linux/binfmts.h linux-2.6.32.9/include/linux/binfmts.h +--- linux-2.6.32.9/include/linux/binfmts.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/binfmts.h 2010-02-23 17:09:53.311553777 -0500 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -41358,9 +41858,9 @@ diff -urNp linux-2.6.32.7/include/linux/binfmts.h linux-2.6.32.7/include/linux/b unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.32.7/include/linux/blkdev.h linux-2.6.32.7/include/linux/blkdev.h ---- linux-2.6.32.7/include/linux/blkdev.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/blkdev.h 2010-01-25 17:39:40.991299866 -0500 +diff -urNp linux-2.6.32.9/include/linux/blkdev.h linux-2.6.32.9/include/linux/blkdev.h +--- linux-2.6.32.9/include/linux/blkdev.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/blkdev.h 2010-02-23 17:09:53.311553777 -0500 @@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc #endif /* CONFIG_BLK_DEV_INTEGRITY */ @@ -41392,9 +41892,9 @@ diff -urNp linux-2.6.32.7/include/linux/blkdev.h linux-2.6.32.7/include/linux/bl }; extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, -diff -urNp linux-2.6.32.7/include/linux/cache.h linux-2.6.32.7/include/linux/cache.h ---- linux-2.6.32.7/include/linux/cache.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/cache.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/cache.h linux-2.6.32.9/include/linux/cache.h +--- linux-2.6.32.9/include/linux/cache.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/cache.h 2010-02-23 17:09:53.311553777 -0500 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -41406,9 +41906,9 @@ diff -urNp linux-2.6.32.7/include/linux/cache.h linux-2.6.32.7/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.32.7/include/linux/capability.h linux-2.6.32.7/include/linux/capability.h ---- linux-2.6.32.7/include/linux/capability.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/capability.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/capability.h linux-2.6.32.9/include/linux/capability.h +--- linux-2.6.32.9/include/linux/capability.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/capability.h 2010-02-23 17:09:53.311553777 -0500 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -41417,9 +41917,9 @@ diff -urNp linux-2.6.32.7/include/linux/capability.h linux-2.6.32.7/include/linu /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.32.7/include/linux/compiler-gcc4.h linux-2.6.32.7/include/linux/compiler-gcc4.h ---- linux-2.6.32.7/include/linux/compiler-gcc4.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/compiler-gcc4.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/compiler-gcc4.h linux-2.6.32.9/include/linux/compiler-gcc4.h +--- linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/compiler-gcc4.h 2010-02-23 17:09:53.311553777 -0500 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -41429,9 +41929,9 @@ diff -urNp linux-2.6.32.7/include/linux/compiler-gcc4.h linux-2.6.32.7/include/l +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.32.7/include/linux/compiler.h linux-2.6.32.7/include/linux/compiler.h ---- linux-2.6.32.7/include/linux/compiler.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/compiler.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/compiler.h linux-2.6.32.9/include/linux/compiler.h +--- linux-2.6.32.9/include/linux/compiler.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/compiler.h 2010-02-23 17:09:53.311553777 -0500 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -41455,9 +41955,9 @@ diff -urNp linux-2.6.32.7/include/linux/compiler.h linux-2.6.32.7/include/linux/ /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.32.7/include/linux/decompress/mm.h linux-2.6.32.7/include/linux/decompress/mm.h ---- linux-2.6.32.7/include/linux/decompress/mm.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/decompress/mm.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/decompress/mm.h linux-2.6.32.9/include/linux/decompress/mm.h +--- linux-2.6.32.9/include/linux/decompress/mm.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/decompress/mm.h 2010-02-23 17:09:53.311553777 -0500 @@ -68,7 +68,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -41467,9 +41967,9 @@ diff -urNp linux-2.6.32.7/include/linux/decompress/mm.h linux-2.6.32.7/include/l #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.32.7/include/linux/dma-mapping.h linux-2.6.32.7/include/linux/dma-mapping.h ---- linux-2.6.32.7/include/linux/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/dma-mapping.h 2010-01-25 17:39:40.992433501 -0500 +diff -urNp linux-2.6.32.9/include/linux/dma-mapping.h linux-2.6.32.9/include/linux/dma-mapping.h +--- linux-2.6.32.9/include/linux/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/dma-mapping.h 2010-02-23 17:09:53.311553777 -0500 @@ -16,50 +16,50 @@ enum dma_data_direction { }; @@ -41528,18 +42028,17 @@ diff -urNp linux-2.6.32.7/include/linux/dma-mapping.h linux-2.6.32.7/include/lin enum dma_data_direction dir); - int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); - int (*dma_supported)(struct device *dev, u64 mask); -- int (*set_dma_mask)(struct device *dev, u64 mask); -- int is_phys; + int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr); + int (* const dma_supported)(struct device *dev, u64 mask); -+ int (* const set_dma_mask)(struct device *dev, u64 mask); + int (*set_dma_mask)(struct device *dev, u64 mask); +- int is_phys; + const int is_phys; }; #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -diff -urNp linux-2.6.32.7/include/linux/dst.h linux-2.6.32.7/include/linux/dst.h ---- linux-2.6.32.7/include/linux/dst.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/dst.h 2010-01-25 17:39:40.993423351 -0500 +diff -urNp linux-2.6.32.9/include/linux/dst.h linux-2.6.32.9/include/linux/dst.h +--- linux-2.6.32.9/include/linux/dst.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/dst.h 2010-02-23 17:09:53.311553777 -0500 @@ -380,7 +380,7 @@ struct dst_node struct thread_pool *pool; @@ -41549,9 +42048,9 @@ diff -urNp linux-2.6.32.7/include/linux/dst.h linux-2.6.32.7/include/linux/dst.h /* * How frequently and how many times transaction -diff -urNp linux-2.6.32.7/include/linux/elf.h linux-2.6.32.7/include/linux/elf.h ---- linux-2.6.32.7/include/linux/elf.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/elf.h 2010-01-25 17:39:40.993423351 -0500 +diff -urNp linux-2.6.32.9/include/linux/elf.h linux-2.6.32.9/include/linux/elf.h +--- linux-2.6.32.9/include/linux/elf.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/elf.h 2010-02-23 17:09:53.311553777 -0500 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -41624,9 +42123,9 @@ diff -urNp linux-2.6.32.7/include/linux/elf.h linux-2.6.32.7/include/linux/elf.h #endif -diff -urNp linux-2.6.32.7/include/linux/fs.h linux-2.6.32.7/include/linux/fs.h ---- linux-2.6.32.7/include/linux/fs.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/fs.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/fs.h linux-2.6.32.9/include/linux/fs.h +--- linux-2.6.32.9/include/linux/fs.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/fs.h 2010-02-23 17:09:53.311553777 -0500 @@ -87,6 +87,10 @@ struct inodes_stat_t { */ #define FMODE_NOCMTIME ((__force fmode_t)2048) @@ -41787,9 +42286,9 @@ diff -urNp linux-2.6.32.7/include/linux/fs.h linux-2.6.32.7/include/linux/fs.h }; /* -diff -urNp linux-2.6.32.7/include/linux/fs_struct.h linux-2.6.32.7/include/linux/fs_struct.h ---- linux-2.6.32.7/include/linux/fs_struct.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/fs_struct.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/fs_struct.h linux-2.6.32.9/include/linux/fs_struct.h +--- linux-2.6.32.9/include/linux/fs_struct.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/fs_struct.h 2010-02-23 17:09:53.311553777 -0500 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -41799,9 +42298,9 @@ diff -urNp linux-2.6.32.7/include/linux/fs_struct.h linux-2.6.32.7/include/linux rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.32.7/include/linux/genhd.h linux-2.6.32.7/include/linux/genhd.h ---- linux-2.6.32.7/include/linux/genhd.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/genhd.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/genhd.h linux-2.6.32.9/include/linux/genhd.h +--- linux-2.6.32.9/include/linux/genhd.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/genhd.h 2010-02-23 17:09:53.311553777 -0500 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -41811,9 +42310,9 @@ diff -urNp linux-2.6.32.7/include/linux/genhd.h linux-2.6.32.7/include/linux/gen struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.32.7/include/linux/gracl.h linux-2.6.32.7/include/linux/gracl.h ---- linux-2.6.32.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/gracl.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/gracl.h linux-2.6.32.9/include/linux/gracl.h +--- linux-2.6.32.9/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/gracl.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,309 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -42124,9 +42623,9 @@ diff -urNp linux-2.6.32.7/include/linux/gracl.h linux-2.6.32.7/include/linux/gra + +#endif + -diff -urNp linux-2.6.32.7/include/linux/gralloc.h linux-2.6.32.7/include/linux/gralloc.h ---- linux-2.6.32.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/gralloc.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/gralloc.h linux-2.6.32.9/include/linux/gralloc.h +--- linux-2.6.32.9/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/gralloc.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -42137,9 +42636,9 @@ diff -urNp linux-2.6.32.7/include/linux/gralloc.h linux-2.6.32.7/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.32.7/include/linux/grdefs.h linux-2.6.32.7/include/linux/grdefs.h ---- linux-2.6.32.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/grdefs.h 2010-01-25 17:39:40.994432214 -0500 +diff -urNp linux-2.6.32.9/include/linux/grdefs.h linux-2.6.32.9/include/linux/grdefs.h +--- linux-2.6.32.9/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/grdefs.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -42277,9 +42776,9 @@ diff -urNp linux-2.6.32.7/include/linux/grdefs.h linux-2.6.32.7/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.32.7/include/linux/grinternal.h linux-2.6.32.7/include/linux/grinternal.h ---- linux-2.6.32.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/grinternal.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/grinternal.h linux-2.6.32.9/include/linux/grinternal.h +--- linux-2.6.32.9/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/grinternal.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,212 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -42493,9 +42992,9 @@ diff -urNp linux-2.6.32.7/include/linux/grinternal.h linux-2.6.32.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.32.7/include/linux/grmsg.h linux-2.6.32.7/include/linux/grmsg.h ---- linux-2.6.32.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/grmsg.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/grmsg.h linux-2.6.32.9/include/linux/grmsg.h +--- linux-2.6.32.9/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/grmsg.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,107 @@ +#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" @@ -42604,9 +43103,9 @@ diff -urNp linux-2.6.32.7/include/linux/grmsg.h linux-2.6.32.7/include/linux/grm +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " -diff -urNp linux-2.6.32.7/include/linux/grsecurity.h linux-2.6.32.7/include/linux/grsecurity.h ---- linux-2.6.32.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/include/linux/grsecurity.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/grsecurity.h linux-2.6.32.9/include/linux/grsecurity.h +--- linux-2.6.32.9/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/include/linux/grsecurity.h 2010-02-23 17:09:53.311553777 -0500 @@ -0,0 +1,200 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -42808,9 +43307,9 @@ diff -urNp linux-2.6.32.7/include/linux/grsecurity.h linux-2.6.32.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.32.7/include/linux/hdpu_features.h linux-2.6.32.7/include/linux/hdpu_features.h ---- linux-2.6.32.7/include/linux/hdpu_features.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/hdpu_features.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/hdpu_features.h linux-2.6.32.9/include/linux/hdpu_features.h +--- linux-2.6.32.9/include/linux/hdpu_features.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/hdpu_features.h 2010-02-23 17:09:53.311553777 -0500 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -42820,9 +43319,9 @@ diff -urNp linux-2.6.32.7/include/linux/hdpu_features.h linux-2.6.32.7/include/l unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.32.7/include/linux/highmem.h linux-2.6.32.7/include/linux/highmem.h ---- linux-2.6.32.7/include/linux/highmem.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/highmem.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/highmem.h linux-2.6.32.9/include/linux/highmem.h +--- linux-2.6.32.9/include/linux/highmem.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/highmem.h 2010-02-23 17:09:53.311553777 -0500 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -42842,9 +43341,34 @@ diff -urNp linux-2.6.32.7/include/linux/highmem.h linux-2.6.32.7/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.32.7/include/linux/interrupt.h linux-2.6.32.7/include/linux/interrupt.h ---- linux-2.6.32.7/include/linux/interrupt.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/interrupt.h 2010-01-25 17:39:40.995431593 -0500 +diff -urNp linux-2.6.32.9/include/linux/init_task.h linux-2.6.32.9/include/linux/init_task.h +--- linux-2.6.32.9/include/linux/init_task.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/init_task.h 2010-02-23 17:09:53.311553777 -0500 +@@ -115,6 +115,13 @@ extern struct cred init_cred; + # define INIT_PERF_EVENTS(tsk) + #endif + ++#ifdef CONFIG_GRKERNSEC ++# define INIT_GR_FS_LOCK \ ++ .gr_fs_lock = __RW_LOCK_UNLOCKED(gr_fs_lock), ++#else ++# define INIT_GR_FS_LOCK ++#endif ++ + /* + * INIT_TASK is used to set up the first task table, touch at + * your own risk!. Base=0, limit=0x1fffff (=2MB) +@@ -184,6 +191,7 @@ extern struct cred init_cred; + INIT_FTRACE_GRAPH \ + INIT_TRACE_RECURSION \ + INIT_TASK_RCU_PREEMPT(tsk) \ ++ INIT_GR_FS_LOCK \ + } + + +diff -urNp linux-2.6.32.9/include/linux/interrupt.h linux-2.6.32.9/include/linux/interrupt.h +--- linux-2.6.32.9/include/linux/interrupt.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/interrupt.h 2010-02-23 17:09:53.311553777 -0500 @@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. @@ -42854,9 +43378,24 @@ diff -urNp linux-2.6.32.7/include/linux/interrupt.h linux-2.6.32.7/include/linux /* softirq mask and active fields moved to irq_cpustat_t in * asm/hardirq.h to get better cache usage. KAO -diff -urNp linux-2.6.32.7/include/linux/jbd2.h linux-2.6.32.7/include/linux/jbd2.h ---- linux-2.6.32.7/include/linux/jbd2.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/jbd2.h 2010-01-25 17:39:40.996429608 -0500 +@@ -365,12 +365,12 @@ extern char *softirq_to_name[NR_SOFTIRQS + + struct softirq_action + { +- void (*action)(struct softirq_action *); ++ void (*action)(void); + }; + + asmlinkage void do_softirq(void); + asmlinkage void __do_softirq(void); +-extern void open_softirq(int nr, void (*action)(struct softirq_action *)); ++extern void open_softirq(int nr, void (*action)(void)); + 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.9/include/linux/jbd2.h linux-2.6.32.9/include/linux/jbd2.h +--- linux-2.6.32.9/include/linux/jbd2.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/jbd2.h 2010-02-23 17:09:53.311553777 -0500 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -42866,9 +43405,9 @@ diff -urNp linux-2.6.32.7/include/linux/jbd2.h linux-2.6.32.7/include/linux/jbd2 #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.7/include/linux/jbd.h linux-2.6.32.7/include/linux/jbd.h ---- linux-2.6.32.7/include/linux/jbd.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/jbd.h 2010-01-25 17:39:40.996429608 -0500 +diff -urNp linux-2.6.32.9/include/linux/jbd.h linux-2.6.32.9/include/linux/jbd.h +--- linux-2.6.32.9/include/linux/jbd.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/jbd.h 2010-02-23 17:09:53.311553777 -0500 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -42878,9 +43417,9 @@ diff -urNp linux-2.6.32.7/include/linux/jbd.h linux-2.6.32.7/include/linux/jbd.h #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.32.7/include/linux/kallsyms.h linux-2.6.32.7/include/linux/kallsyms.h ---- linux-2.6.32.7/include/linux/kallsyms.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/kallsyms.h 2010-01-25 17:39:40.996429608 -0500 +diff -urNp linux-2.6.32.9/include/linux/kallsyms.h linux-2.6.32.9/include/linux/kallsyms.h +--- linux-2.6.32.9/include/linux/kallsyms.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/kallsyms.h 2010-02-23 17:09:53.316454635 -0500 @@ -15,7 +15,8 @@ struct module; @@ -42901,9 +43440,9 @@ diff -urNp linux-2.6.32.7/include/linux/kallsyms.h linux-2.6.32.7/include/linux/ /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.32.7/include/linux/kgdb.h linux-2.6.32.7/include/linux/kgdb.h ---- linux-2.6.32.7/include/linux/kgdb.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/kgdb.h 2010-01-25 17:39:40.996429608 -0500 +diff -urNp linux-2.6.32.9/include/linux/kgdb.h linux-2.6.32.9/include/linux/kgdb.h +--- linux-2.6.32.9/include/linux/kgdb.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/kgdb.h 2010-02-23 17:09:53.316454635 -0500 @@ -251,20 +251,20 @@ struct kgdb_arch { */ struct kgdb_io { @@ -42934,9 +43473,9 @@ diff -urNp linux-2.6.32.7/include/linux/kgdb.h linux-2.6.32.7/include/linux/kgdb 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.7/include/linux/kobject.h linux-2.6.32.7/include/linux/kobject.h ---- linux-2.6.32.7/include/linux/kobject.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/kobject.h 2010-01-25 17:39:40.998424129 -0500 +diff -urNp linux-2.6.32.9/include/linux/kobject.h linux-2.6.32.9/include/linux/kobject.h +--- linux-2.6.32.9/include/linux/kobject.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/kobject.h 2010-02-23 17:09:53.316454635 -0500 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -42985,9 +43524,9 @@ diff -urNp linux-2.6.32.7/include/linux/kobject.h linux-2.6.32.7/include/linux/k struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.32.7/include/linux/kvm_host.h linux-2.6.32.7/include/linux/kvm_host.h ---- linux-2.6.32.7/include/linux/kvm_host.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/kvm_host.h 2010-01-25 17:39:40.998424129 -0500 +diff -urNp linux-2.6.32.9/include/linux/kvm_host.h linux-2.6.32.9/include/linux/kvm_host.h +--- linux-2.6.32.9/include/linux/kvm_host.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/kvm_host.h 2010-02-23 17:09:53.316454635 -0500 @@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -43006,9 +43545,9 @@ diff -urNp linux-2.6.32.7/include/linux/kvm_host.h linux-2.6.32.7/include/linux/ void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/libata.h ---- linux-2.6.32.7/include/linux/libata.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/libata.h 2010-01-25 17:39:40.999427893 -0500 +diff -urNp linux-2.6.32.9/include/linux/libata.h linux-2.6.32.9/include/linux/libata.h +--- linux-2.6.32.9/include/linux/libata.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/libata.h 2010-02-23 17:09:53.316454635 -0500 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -43024,7 +43563,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li #endif /* ATA_DEBUG */ #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) -@@ -521,11 +521,11 @@ struct ata_ioports { +@@ -524,11 +524,11 @@ struct ata_ioports { struct ata_host { spinlock_t lock; @@ -43038,7 +43577,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li unsigned long flags; #ifdef CONFIG_ATA_ACPI acpi_handle acpi_handle; -@@ -706,7 +706,7 @@ struct ata_link { +@@ -709,7 +709,7 @@ struct ata_link { struct ata_port { struct Scsi_Host *scsi_host; /* our co-allocated scsi host */ @@ -43047,7 +43586,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li spinlock_t *lock; /* Flags owned by the EH context. Only EH should touch these once the port is active */ -@@ -888,7 +888,7 @@ struct ata_port_info { +@@ -891,7 +891,7 @@ struct ata_port_info { unsigned long pio_mask; unsigned long mwdma_mask; unsigned long udma_mask; @@ -43056,7 +43595,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li void *private_data; }; -@@ -912,7 +912,7 @@ extern const unsigned long sata_deb_timi +@@ -915,7 +915,7 @@ extern const unsigned long sata_deb_timi extern const unsigned long sata_deb_timing_hotplug[]; extern const unsigned long sata_deb_timing_long[]; @@ -43065,7 +43604,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li extern const struct ata_port_info ata_dummy_port_info; static inline const unsigned long * -@@ -958,7 +958,7 @@ extern int ata_host_activate(struct ata_ +@@ -961,7 +961,7 @@ extern int ata_host_activate(struct ata_ struct scsi_host_template *sht); extern void ata_host_detach(struct ata_host *host); extern void ata_host_init(struct ata_host *, struct device *, @@ -43074,9 +43613,9 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li 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.7/include/linux/lockd/bind.h linux-2.6.32.7/include/linux/lockd/bind.h ---- linux-2.6.32.7/include/linux/lockd/bind.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/lockd/bind.h 2010-01-25 17:39:40.999427893 -0500 +diff -urNp linux-2.6.32.9/include/linux/lockd/bind.h linux-2.6.32.9/include/linux/lockd/bind.h +--- linux-2.6.32.9/include/linux/lockd/bind.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/lockd/bind.h 2010-02-23 17:09:53.316454635 -0500 @@ -23,13 +23,13 @@ struct svc_rqst; * This is the set of functions for lockd->nfsd communication */ @@ -43094,9 +43633,9 @@ diff -urNp linux-2.6.32.7/include/linux/lockd/bind.h linux-2.6.32.7/include/linu /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.32.7/include/linux/mm.h linux-2.6.32.7/include/linux/mm.h ---- linux-2.6.32.7/include/linux/mm.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/mm.h 2010-01-25 17:39:40.999427893 -0500 +diff -urNp linux-2.6.32.9/include/linux/mm.h linux-2.6.32.9/include/linux/mm.h +--- linux-2.6.32.9/include/linux/mm.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/mm.h 2010-02-23 17:09:53.316454635 -0500 @@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ @@ -43159,9 +43698,9 @@ diff -urNp linux-2.6.32.7/include/linux/mm.h linux-2.6.32.7/include/linux/mm.h #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.32.7/include/linux/mm_types.h linux-2.6.32.7/include/linux/mm_types.h ---- linux-2.6.32.7/include/linux/mm_types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/mm_types.h 2010-01-25 17:39:40.999427893 -0500 +diff -urNp linux-2.6.32.9/include/linux/mm_types.h linux-2.6.32.9/include/linux/mm_types.h +--- linux-2.6.32.9/include/linux/mm_types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/mm_types.h 2010-02-23 17:09:53.316454635 -0500 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -43196,9 +43735,9 @@ diff -urNp linux-2.6.32.7/include/linux/mm_types.h linux-2.6.32.7/include/linux/ }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.32.7/include/linux/mmu_notifier.h linux-2.6.32.7/include/linux/mmu_notifier.h ---- linux-2.6.32.7/include/linux/mmu_notifier.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/mmu_notifier.h 2010-01-25 17:39:40.999427893 -0500 +diff -urNp linux-2.6.32.9/include/linux/mmu_notifier.h linux-2.6.32.9/include/linux/mmu_notifier.h +--- linux-2.6.32.9/include/linux/mmu_notifier.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/mmu_notifier.h 2010-02-23 17:09:53.316454635 -0500 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ @@ -43215,9 +43754,9 @@ diff -urNp linux-2.6.32.7/include/linux/mmu_notifier.h linux-2.6.32.7/include/li }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.32.7/include/linux/mod_devicetable.h linux-2.6.32.7/include/linux/mod_devicetable.h ---- linux-2.6.32.7/include/linux/mod_devicetable.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/mod_devicetable.h 2010-01-25 17:39:41.000424921 -0500 +diff -urNp linux-2.6.32.9/include/linux/mod_devicetable.h linux-2.6.32.9/include/linux/mod_devicetable.h +--- linux-2.6.32.9/include/linux/mod_devicetable.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/mod_devicetable.h 2010-02-23 17:09:53.316454635 -0500 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -43236,9 +43775,9 @@ diff -urNp linux-2.6.32.7/include/linux/mod_devicetable.h linux-2.6.32.7/include struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.32.7/include/linux/module.h linux-2.6.32.7/include/linux/module.h ---- linux-2.6.32.7/include/linux/module.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/module.h 2010-01-25 17:39:41.000424921 -0500 +diff -urNp linux-2.6.32.9/include/linux/module.h linux-2.6.32.9/include/linux/module.h +--- linux-2.6.32.9/include/linux/module.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/module.h 2010-02-23 17:09:53.316454635 -0500 @@ -287,16 +287,16 @@ struct module int (*init)(void); @@ -43311,9 +43850,9 @@ diff -urNp linux-2.6.32.7/include/linux/module.h linux-2.6.32.7/include/linux/mo } /* Search for module by name: must hold module_mutex. */ -diff -urNp linux-2.6.32.7/include/linux/moduleloader.h linux-2.6.32.7/include/linux/moduleloader.h ---- linux-2.6.32.7/include/linux/moduleloader.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/moduleloader.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/moduleloader.h linux-2.6.32.9/include/linux/moduleloader.h +--- linux-2.6.32.9/include/linux/moduleloader.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/moduleloader.h 2010-02-23 17:09:53.316454635 -0500 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -43330,15 +43869,15 @@ diff -urNp linux-2.6.32.7/include/linux/moduleloader.h linux-2.6.32.7/include/li +#ifdef CONFIG_PAX_KERNEXEC +void module_free_exec(struct module *mod, void *module_region); +#else -+#define module_free_exec(x, y) module_free(x, y) ++#define module_free_exec(x, y) module_free((x), (y)) +#endif + /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.32.7/include/linux/namei.h linux-2.6.32.7/include/linux/namei.h ---- linux-2.6.32.7/include/linux/namei.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/namei.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/namei.h linux-2.6.32.9/include/linux/namei.h +--- linux-2.6.32.9/include/linux/namei.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/namei.h 2010-02-23 17:09:53.316454635 -0500 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -43363,9 +43902,9 @@ diff -urNp linux-2.6.32.7/include/linux/namei.h linux-2.6.32.7/include/linux/nam { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.32.7/include/linux/nodemask.h linux-2.6.32.7/include/linux/nodemask.h ---- linux-2.6.32.7/include/linux/nodemask.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/nodemask.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/nodemask.h linux-2.6.32.9/include/linux/nodemask.h +--- linux-2.6.32.9/include/linux/nodemask.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/nodemask.h 2010-02-23 17:09:53.316454635 -0500 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -43382,9 +43921,9 @@ diff -urNp linux-2.6.32.7/include/linux/nodemask.h linux-2.6.32.7/include/linux/ }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.32.7/include/linux/oprofile.h linux-2.6.32.7/include/linux/oprofile.h ---- linux-2.6.32.7/include/linux/oprofile.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/oprofile.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/oprofile.h linux-2.6.32.9/include/linux/oprofile.h +--- linux-2.6.32.9/include/linux/oprofile.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/oprofile.h 2010-02-23 17:09:53.316454635 -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); @@ -43397,9 +43936,9 @@ diff -urNp linux-2.6.32.7/include/linux/oprofile.h linux-2.6.32.7/include/linux/ /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.32.7/include/linux/pipe_fs_i.h linux-2.6.32.7/include/linux/pipe_fs_i.h ---- linux-2.6.32.7/include/linux/pipe_fs_i.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/pipe_fs_i.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/pipe_fs_i.h linux-2.6.32.9/include/linux/pipe_fs_i.h +--- linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/pipe_fs_i.h 2010-02-23 17:09:53.316454635 -0500 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -43413,9 +43952,9 @@ diff -urNp linux-2.6.32.7/include/linux/pipe_fs_i.h linux-2.6.32.7/include/linux unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.32.7/include/linux/poison.h linux-2.6.32.7/include/linux/poison.h ---- linux-2.6.32.7/include/linux/poison.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/poison.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/poison.h linux-2.6.32.9/include/linux/poison.h +--- linux-2.6.32.9/include/linux/poison.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/poison.h 2010-02-23 17:09:53.316454635 -0500 @@ -7,8 +7,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -43427,9 +43966,9 @@ diff -urNp linux-2.6.32.7/include/linux/poison.h linux-2.6.32.7/include/linux/po /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.32.7/include/linux/proc_fs.h linux-2.6.32.7/include/linux/proc_fs.h ---- linux-2.6.32.7/include/linux/proc_fs.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/proc_fs.h 2010-01-25 17:39:41.001276086 -0500 +diff -urNp linux-2.6.32.9/include/linux/proc_fs.h linux-2.6.32.9/include/linux/proc_fs.h +--- linux-2.6.32.9/include/linux/proc_fs.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/proc_fs.h 2010-02-23 17:09:53.316454635 -0500 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -43450,9 +43989,9 @@ diff -urNp linux-2.6.32.7/include/linux/proc_fs.h linux-2.6.32.7/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.32.7/include/linux/random.h linux-2.6.32.7/include/linux/random.h ---- linux-2.6.32.7/include/linux/random.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/random.h 2010-01-25 17:39:41.032837080 -0500 +diff -urNp linux-2.6.32.9/include/linux/random.h linux-2.6.32.9/include/linux/random.h +--- linux-2.6.32.9/include/linux/random.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/random.h 2010-02-23 17:09:53.316454635 -0500 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -43465,9 +44004,9 @@ diff -urNp linux-2.6.32.7/include/linux/random.h linux-2.6.32.7/include/linux/ra #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs.h linux-2.6.32.7/include/linux/reiserfs_fs.h ---- linux-2.6.32.7/include/linux/reiserfs_fs.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/reiserfs_fs.h 2010-01-25 17:39:41.033186102 -0500 +diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs.h linux-2.6.32.9/include/linux/reiserfs_fs.h +--- linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/reiserfs_fs.h 2010-02-23 17:09:53.316454635 -0500 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -43514,9 +44053,9 @@ diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs.h linux-2.6.32.7/include/lin #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.7/include/linux/reiserfs_fs_sb.h linux-2.6.32.7/include/linux/reiserfs_fs_sb.h ---- linux-2.6.32.7/include/linux/reiserfs_fs_sb.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/reiserfs_fs_sb.h 2010-01-25 17:39:41.033186102 -0500 +diff -urNp linux-2.6.32.9/include/linux/reiserfs_fs_sb.h linux-2.6.32.9/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/reiserfs_fs_sb.h 2010-02-23 17:09:53.320537081 -0500 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -43526,9 +44065,9 @@ diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs_sb.h linux-2.6.32.7/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sched.h ---- linux-2.6.32.7/include/linux/sched.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/sched.h 2010-01-25 17:39:41.034385602 -0500 +diff -urNp linux-2.6.32.9/include/linux/sched.h linux-2.6.32.9/include/linux/sched.h +--- linux-2.6.32.9/include/linux/sched.h 2010-02-23 17:04:12.651619895 -0500 ++++ linux-2.6.32.9/include/linux/sched.h 2010-02-23 17:09:53.320537081 -0500 @@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; @@ -43616,13 +44155,14 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch struct io_context *io_context; unsigned long ptrace_message; -@@ -1517,6 +1529,18 @@ struct task_struct { +@@ -1517,6 +1529,19 @@ struct task_struct { unsigned long default_timer_slack_ns; struct list_head *scm_work_list; + +#ifdef CONFIG_GRKERNSEC + /* grsecurity */ ++ rwlock_t gr_fs_lock; + struct acl_subject_label *acl; + struct acl_role_label *role; + struct file *exec_file; @@ -43635,7 +44175,7 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* Index of current stored adress in ret_stack */ int curr_ret_stack; -@@ -1541,6 +1565,52 @@ struct task_struct { +@@ -1541,6 +1566,52 @@ struct task_struct { unsigned long stack_start; }; @@ -43688,7 +44228,7 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -2140,7 +2210,7 @@ extern void __cleanup_sighand(struct sig +@@ -2140,7 +2211,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -43697,7 +44237,41 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2253,8 +2323,8 @@ static inline void unlock_task_sighand(s +@@ -2242,6 +2313,33 @@ static inline void task_unlock(struct ta + spin_unlock(&p->alloc_lock); + } + ++/* grsec: protects only ->fs as task_lock is overkill and we can't ++ be using a spin_lock in interrupt context ++*/ ++#ifdef CONFIG_GRKERNSEC ++#define gr_fs_write_lock_irqsave(x, y) \ ++ write_lock_irqsave(&x->gr_fs_lock, y) ++#define gr_fs_write_unlock_irqrestore(x, y) \ ++ write_unlock_irqrestore(&x->gr_fs_lock, y) ++#else ++#define gr_fs_write_lock_irqsave(x, y) ++#define gr_fs_write_unlock_irqrestore(x, y) ++#endif ++ ++static inline void gr_fs_read_lock(struct task_struct *p) ++{ ++#ifdef CONFIG_GRKERNSEC ++ read_lock(&p->gr_fs_lock); ++#endif ++} ++ ++static inline void gr_fs_read_unlock(struct task_struct *p) ++{ ++#ifdef CONFIG_GRKERNSEC ++ read_unlock(&p->gr_fs_lock); ++#endif ++} ++ + extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk, + unsigned long *flags); + +@@ -2253,8 +2351,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -43708,7 +44282,7 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -@@ -2269,13 +2339,31 @@ static inline unsigned long *end_of_stac +@@ -2269,13 +2367,31 @@ static inline unsigned long *end_of_stac #endif @@ -43742,9 +44316,9 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch extern void thread_info_cache_init(void); #ifdef CONFIG_DEBUG_STACK_USAGE -diff -urNp linux-2.6.32.7/include/linux/screen_info.h linux-2.6.32.7/include/linux/screen_info.h ---- linux-2.6.32.7/include/linux/screen_info.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/screen_info.h 2010-01-25 17:39:41.034385602 -0500 +diff -urNp linux-2.6.32.9/include/linux/screen_info.h linux-2.6.32.9/include/linux/screen_info.h +--- linux-2.6.32.9/include/linux/screen_info.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/screen_info.h 2010-02-23 17:09:53.320537081 -0500 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -43755,9 +44329,9 @@ diff -urNp linux-2.6.32.7/include/linux/screen_info.h linux-2.6.32.7/include/lin } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.32.7/include/linux/security.h linux-2.6.32.7/include/linux/security.h ---- linux-2.6.32.7/include/linux/security.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/security.h 2010-01-25 17:39:41.035109382 -0500 +diff -urNp linux-2.6.32.9/include/linux/security.h linux-2.6.32.9/include/linux/security.h +--- linux-2.6.32.9/include/linux/security.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/security.h 2010-02-23 17:09:53.320537081 -0500 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -43766,9 +44340,9 @@ diff -urNp linux-2.6.32.7/include/linux/security.h linux-2.6.32.7/include/linux/ #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.32.7/include/linux/shm.h linux-2.6.32.7/include/linux/shm.h ---- linux-2.6.32.7/include/linux/shm.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/shm.h 2010-01-25 17:39:41.035109382 -0500 +diff -urNp linux-2.6.32.9/include/linux/shm.h linux-2.6.32.9/include/linux/shm.h +--- linux-2.6.32.9/include/linux/shm.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/shm.h 2010-02-23 17:09:53.320537081 -0500 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -43780,9 +44354,9 @@ diff -urNp linux-2.6.32.7/include/linux/shm.h linux-2.6.32.7/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.32.7/include/linux/slab.h linux-2.6.32.7/include/linux/slab.h ---- linux-2.6.32.7/include/linux/slab.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/slab.h 2010-01-25 17:39:41.035109382 -0500 +diff -urNp linux-2.6.32.9/include/linux/slab.h linux-2.6.32.9/include/linux/slab.h +--- linux-2.6.32.9/include/linux/slab.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/slab.h 2010-02-23 17:09:53.320537081 -0500 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -43854,9 +44428,9 @@ diff -urNp linux-2.6.32.7/include/linux/slab.h linux-2.6.32.7/include/linux/slab +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.32.7/include/linux/slub_def.h linux-2.6.32.7/include/linux/slub_def.h ---- linux-2.6.32.7/include/linux/slub_def.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/slub_def.h 2010-01-25 17:39:41.035109382 -0500 +diff -urNp linux-2.6.32.9/include/linux/slub_def.h linux-2.6.32.9/include/linux/slub_def.h +--- linux-2.6.32.9/include/linux/slub_def.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/slub_def.h 2010-02-23 17:09:53.320537081 -0500 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -43866,9 +44440,9 @@ diff -urNp linux-2.6.32.7/include/linux/slub_def.h linux-2.6.32.7/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.32.7/include/linux/sonet.h linux-2.6.32.7/include/linux/sonet.h ---- linux-2.6.32.7/include/linux/sonet.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/sonet.h 2010-01-25 17:39:41.035109382 -0500 +diff -urNp linux-2.6.32.9/include/linux/sonet.h linux-2.6.32.9/include/linux/sonet.h +--- linux-2.6.32.9/include/linux/sonet.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/sonet.h 2010-02-23 17:09:53.320537081 -0500 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -43878,9 +44452,9 @@ diff -urNp linux-2.6.32.7/include/linux/sonet.h linux-2.6.32.7/include/linux/son __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.32.7/include/linux/suspend.h linux-2.6.32.7/include/linux/suspend.h ---- linux-2.6.32.7/include/linux/suspend.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/suspend.h 2010-01-25 17:39:41.036213895 -0500 +diff -urNp linux-2.6.32.9/include/linux/suspend.h linux-2.6.32.9/include/linux/suspend.h +--- linux-2.6.32.9/include/linux/suspend.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/suspend.h 2010-02-23 17:09:53.320537081 -0500 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; * which require special recovery actions in that situation. */ @@ -43969,9 +44543,9 @@ diff -urNp linux-2.6.32.7/include/linux/suspend.h linux-2.6.32.7/include/linux/s 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.7/include/linux/sysctl.h linux-2.6.32.7/include/linux/sysctl.h ---- linux-2.6.32.7/include/linux/sysctl.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/sysctl.h 2010-01-25 17:39:41.036213895 -0500 +diff -urNp linux-2.6.32.9/include/linux/sysctl.h linux-2.6.32.9/include/linux/sysctl.h +--- linux-2.6.32.9/include/linux/sysctl.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/sysctl.h 2010-02-23 17:09:53.320537081 -0500 @@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -43985,9 +44559,9 @@ diff -urNp linux-2.6.32.7/include/linux/sysctl.h linux-2.6.32.7/include/linux/sy /* CTL_VM names: */ enum -diff -urNp linux-2.6.32.7/include/linux/sysfs.h linux-2.6.32.7/include/linux/sysfs.h ---- linux-2.6.32.7/include/linux/sysfs.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/sysfs.h 2010-01-25 17:39:41.036213895 -0500 +diff -urNp linux-2.6.32.9/include/linux/sysfs.h linux-2.6.32.9/include/linux/sysfs.h +--- linux-2.6.32.9/include/linux/sysfs.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/sysfs.h 2010-02-23 17:09:53.320537081 -0500 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -43999,9 +44573,9 @@ diff -urNp linux-2.6.32.7/include/linux/sysfs.h linux-2.6.32.7/include/linux/sys }; struct sysfs_dirent; -diff -urNp linux-2.6.32.7/include/linux/thread_info.h linux-2.6.32.7/include/linux/thread_info.h ---- linux-2.6.32.7/include/linux/thread_info.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/thread_info.h 2010-01-25 17:39:41.036213895 -0500 +diff -urNp linux-2.6.32.9/include/linux/thread_info.h linux-2.6.32.9/include/linux/thread_info.h +--- linux-2.6.32.9/include/linux/thread_info.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/thread_info.h 2010-02-23 17:09:53.320537081 -0500 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -44011,9 +44585,9 @@ diff -urNp linux-2.6.32.7/include/linux/thread_info.h linux-2.6.32.7/include/lin u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.32.7/include/linux/tty.h linux-2.6.32.7/include/linux/tty.h ---- linux-2.6.32.7/include/linux/tty.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/tty.h 2010-01-25 17:39:41.036213895 -0500 +diff -urNp linux-2.6.32.9/include/linux/tty.h linux-2.6.32.9/include/linux/tty.h +--- linux-2.6.32.9/include/linux/tty.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/tty.h 2010-02-23 17:09:53.320537081 -0500 @@ -13,6 +13,7 @@ #include <linux/tty_driver.h> #include <linux/tty_ldisc.h> @@ -44049,9 +44623,9 @@ diff -urNp linux-2.6.32.7/include/linux/tty.h linux-2.6.32.7/include/linux/tty.h /* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; -diff -urNp linux-2.6.32.7/include/linux/tty_ldisc.h linux-2.6.32.7/include/linux/tty_ldisc.h ---- linux-2.6.32.7/include/linux/tty_ldisc.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/tty_ldisc.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/linux/tty_ldisc.h linux-2.6.32.9/include/linux/tty_ldisc.h +--- linux-2.6.32.9/include/linux/tty_ldisc.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/tty_ldisc.h 2010-02-23 17:09:53.320537081 -0500 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -44061,9 +44635,9 @@ diff -urNp linux-2.6.32.7/include/linux/tty_ldisc.h linux-2.6.32.7/include/linux }; struct tty_ldisc { -diff -urNp linux-2.6.32.7/include/linux/types.h linux-2.6.32.7/include/linux/types.h ---- linux-2.6.32.7/include/linux/types.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/types.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/linux/types.h linux-2.6.32.9/include/linux/types.h +--- linux-2.6.32.9/include/linux/types.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/types.h 2010-02-23 17:09:53.320537081 -0500 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -44091,9 +44665,9 @@ diff -urNp linux-2.6.32.7/include/linux/types.h linux-2.6.32.7/include/linux/typ #endif struct ustat { -diff -urNp linux-2.6.32.7/include/linux/uaccess.h linux-2.6.32.7/include/linux/uaccess.h ---- linux-2.6.32.7/include/linux/uaccess.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/uaccess.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/linux/uaccess.h linux-2.6.32.9/include/linux/uaccess.h +--- linux-2.6.32.9/include/linux/uaccess.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/uaccess.h 2010-02-23 17:09:53.324062460 -0500 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -44125,9 +44699,9 @@ diff -urNp linux-2.6.32.7/include/linux/uaccess.h linux-2.6.32.7/include/linux/u +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.32.7/include/linux/vmalloc.h linux-2.6.32.7/include/linux/vmalloc.h ---- linux-2.6.32.7/include/linux/vmalloc.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/linux/vmalloc.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/linux/vmalloc.h linux-2.6.32.9/include/linux/vmalloc.h +--- linux-2.6.32.9/include/linux/vmalloc.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/linux/vmalloc.h 2010-02-23 17:09:53.324062460 -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 */ @@ -44222,9 +44796,9 @@ diff -urNp linux-2.6.32.7/include/linux/vmalloc.h linux-2.6.32.7/include/linux/v +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.32.7/include/net/irda/ircomm_tty.h linux-2.6.32.7/include/net/irda/ircomm_tty.h ---- linux-2.6.32.7/include/net/irda/ircomm_tty.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/net/irda/ircomm_tty.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/net/irda/ircomm_tty.h linux-2.6.32.9/include/net/irda/ircomm_tty.h +--- linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/net/irda/ircomm_tty.h 2010-02-23 17:09:53.324062460 -0500 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -44236,9 +44810,9 @@ diff -urNp linux-2.6.32.7/include/net/irda/ircomm_tty.h linux-2.6.32.7/include/n /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.32.7/include/net/neighbour.h linux-2.6.32.7/include/net/neighbour.h ---- linux-2.6.32.7/include/net/neighbour.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/net/neighbour.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/net/neighbour.h linux-2.6.32.9/include/net/neighbour.h +--- linux-2.6.32.9/include/net/neighbour.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/net/neighbour.h 2010-02-23 17:09:53.324062460 -0500 @@ -125,12 +125,12 @@ struct neighbour struct neigh_ops { @@ -44258,9 +44832,9 @@ diff -urNp linux-2.6.32.7/include/net/neighbour.h linux-2.6.32.7/include/net/nei }; struct pneigh_entry -diff -urNp linux-2.6.32.7/include/net/sctp/sctp.h linux-2.6.32.7/include/net/sctp/sctp.h ---- linux-2.6.32.7/include/net/sctp/sctp.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/net/sctp/sctp.h 2010-01-25 17:39:41.037233192 -0500 +diff -urNp linux-2.6.32.9/include/net/sctp/sctp.h linux-2.6.32.9/include/net/sctp/sctp.h +--- linux-2.6.32.9/include/net/sctp/sctp.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/net/sctp/sctp.h 2010-02-23 17:09:53.324062460 -0500 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -44272,9 +44846,9 @@ diff -urNp linux-2.6.32.7/include/net/sctp/sctp.h linux-2.6.32.7/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.32.7/include/net/tcp.h linux-2.6.32.7/include/net/tcp.h ---- linux-2.6.32.7/include/net/tcp.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/net/tcp.h 2010-01-25 17:39:41.038425649 -0500 +diff -urNp linux-2.6.32.9/include/net/tcp.h linux-2.6.32.9/include/net/tcp.h +--- linux-2.6.32.9/include/net/tcp.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/net/tcp.h 2010-02-23 17:09:53.324062460 -0500 @@ -1420,6 +1420,7 @@ enum tcp_seq_states { struct tcp_seq_afinfo { char *name; @@ -44283,9 +44857,9 @@ diff -urNp linux-2.6.32.7/include/net/tcp.h linux-2.6.32.7/include/net/tcp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.7/include/net/udp.h linux-2.6.32.7/include/net/udp.h ---- linux-2.6.32.7/include/net/udp.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/net/udp.h 2010-01-25 17:39:41.038425649 -0500 +diff -urNp linux-2.6.32.9/include/net/udp.h linux-2.6.32.9/include/net/udp.h +--- linux-2.6.32.9/include/net/udp.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/net/udp.h 2010-02-23 17:09:53.324062460 -0500 @@ -187,6 +187,7 @@ struct udp_seq_afinfo { char *name; sa_family_t family; @@ -44294,9 +44868,9 @@ diff -urNp linux-2.6.32.7/include/net/udp.h linux-2.6.32.7/include/net/udp.h struct file_operations seq_fops; struct seq_operations seq_ops; }; -diff -urNp linux-2.6.32.7/include/sound/ac97_codec.h linux-2.6.32.7/include/sound/ac97_codec.h ---- linux-2.6.32.7/include/sound/ac97_codec.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/sound/ac97_codec.h 2010-01-25 17:39:41.038425649 -0500 +diff -urNp linux-2.6.32.9/include/sound/ac97_codec.h linux-2.6.32.9/include/sound/ac97_codec.h +--- linux-2.6.32.9/include/sound/ac97_codec.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/sound/ac97_codec.h 2010-02-23 17:09:53.324062460 -0500 @@ -419,15 +419,15 @@ struct snd_ac97; @@ -44329,9 +44903,48 @@ diff -urNp linux-2.6.32.7/include/sound/ac97_codec.h linux-2.6.32.7/include/soun void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.32.7/include/video/uvesafb.h linux-2.6.32.7/include/video/uvesafb.h ---- linux-2.6.32.7/include/video/uvesafb.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/include/video/uvesafb.h 2010-01-25 17:39:41.039171660 -0500 +diff -urNp linux-2.6.32.9/include/trace/events/irq.h linux-2.6.32.9/include/trace/events/irq.h +--- linux-2.6.32.9/include/trace/events/irq.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/trace/events/irq.h 2010-02-23 17:09:53.324062460 -0500 +@@ -34,7 +34,7 @@ + */ + TRACE_EVENT(irq_handler_entry, + +- TP_PROTO(int irq, struct irqaction *action), ++ TP_PROTO(int irq, const struct irqaction *action), + + TP_ARGS(irq, action), + +@@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry, + */ + TRACE_EVENT(irq_handler_exit, + +- TP_PROTO(int irq, struct irqaction *action, int ret), ++ TP_PROTO(int irq, const struct irqaction *action, int ret), + + TP_ARGS(irq, action, ret), + +@@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit, + */ + TRACE_EVENT(softirq_entry, + +- TP_PROTO(struct softirq_action *h, struct softirq_action *vec), ++ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec), + + TP_ARGS(h, vec), + +@@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry, + */ + TRACE_EVENT(softirq_exit, + +- TP_PROTO(struct softirq_action *h, struct softirq_action *vec), ++ TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec), + + TP_ARGS(h, vec), + +diff -urNp linux-2.6.32.9/include/video/uvesafb.h linux-2.6.32.9/include/video/uvesafb.h +--- linux-2.6.32.9/include/video/uvesafb.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/include/video/uvesafb.h 2010-02-23 17:09:53.324062460 -0500 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -44340,9 +44953,9 @@ diff -urNp linux-2.6.32.7/include/video/uvesafb.h linux-2.6.32.7/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.32.7/init/do_mounts.c linux-2.6.32.7/init/do_mounts.c ---- linux-2.6.32.7/init/do_mounts.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/do_mounts.c 2010-01-25 17:39:41.050935989 -0500 +diff -urNp linux-2.6.32.9/init/do_mounts.c linux-2.6.32.9/init/do_mounts.c +--- linux-2.6.32.9/init/do_mounts.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/do_mounts.c 2010-02-23 17:09:53.324062460 -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) @@ -44388,9 +45001,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts.c linux-2.6.32.7/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.7/init/do_mounts.h linux-2.6.32.7/init/do_mounts.h ---- linux-2.6.32.7/init/do_mounts.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/do_mounts.h 2010-01-25 17:39:41.053149708 -0500 +diff -urNp linux-2.6.32.9/init/do_mounts.h linux-2.6.32.9/init/do_mounts.h +--- linux-2.6.32.9/init/do_mounts.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/do_mounts.h 2010-02-23 17:09:53.324062460 -0500 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -44410,9 +45023,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts.h linux-2.6.32.7/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.32.7/init/do_mounts_initrd.c linux-2.6.32.7/init/do_mounts_initrd.c ---- linux-2.6.32.7/init/do_mounts_initrd.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/do_mounts_initrd.c 2010-01-25 17:39:41.055426418 -0500 +diff -urNp linux-2.6.32.9/init/do_mounts_initrd.c linux-2.6.32.9/init/do_mounts_initrd.c +--- linux-2.6.32.9/init/do_mounts_initrd.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/do_mounts_initrd.c 2010-02-23 17:09:53.324062460 -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); @@ -44496,9 +45109,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts_initrd.c linux-2.6.32.7/init/do_mounts_ + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.32.7/init/do_mounts_md.c linux-2.6.32.7/init/do_mounts_md.c ---- linux-2.6.32.7/init/do_mounts_md.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/do_mounts_md.c 2010-01-25 17:39:41.067292994 -0500 +diff -urNp linux-2.6.32.9/init/do_mounts_md.c linux-2.6.32.9/init/do_mounts_md.c +--- linux-2.6.32.9/init/do_mounts_md.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/do_mounts_md.c 2010-02-23 17:09:53.324062460 -0500 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -44526,9 +45139,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts_md.c linux-2.6.32.7/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.32.7/init/initramfs.c linux-2.6.32.7/init/initramfs.c ---- linux-2.6.32.7/init/initramfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/initramfs.c 2010-01-25 17:39:41.069300088 -0500 +diff -urNp linux-2.6.32.9/init/initramfs.c linux-2.6.32.9/init/initramfs.c +--- linux-2.6.32.9/init/initramfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/initramfs.c 2010-02-23 17:09:53.324062460 -0500 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -44637,9 +45250,9 @@ diff -urNp linux-2.6.32.7/init/initramfs.c linux-2.6.32.7/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.32.7/init/Kconfig linux-2.6.32.7/init/Kconfig ---- linux-2.6.32.7/init/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/Kconfig 2010-01-25 17:39:41.074459565 -0500 +diff -urNp linux-2.6.32.9/init/Kconfig linux-2.6.32.9/init/Kconfig +--- linux-2.6.32.9/init/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/Kconfig 2010-02-23 17:09:53.324062460 -0500 @@ -1026,7 +1026,7 @@ config SLUB_DEBUG config COMPAT_BRK @@ -44661,9 +45274,9 @@ diff -urNp linux-2.6.32.7/init/Kconfig linux-2.6.32.7/init/Kconfig config RT_MUTEXES boolean -diff -urNp linux-2.6.32.7/init/main.c linux-2.6.32.7/init/main.c ---- linux-2.6.32.7/init/main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/main.c 2010-01-25 17:39:41.075431418 -0500 +diff -urNp linux-2.6.32.9/init/main.c linux-2.6.32.9/init/main.c +--- linux-2.6.32.9/init/main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/main.c 2010-02-23 17:09:53.324062460 -0500 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); @@ -44793,9 +45406,9 @@ diff -urNp linux-2.6.32.7/init/main.c linux-2.6.32.7/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.7/init/noinitramfs.c linux-2.6.32.7/init/noinitramfs.c ---- linux-2.6.32.7/init/noinitramfs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/init/noinitramfs.c 2010-01-25 17:39:41.076314755 -0500 +diff -urNp linux-2.6.32.9/init/noinitramfs.c linux-2.6.32.9/init/noinitramfs.c +--- linux-2.6.32.9/init/noinitramfs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/init/noinitramfs.c 2010-02-23 17:09:53.324062460 -0500 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -44814,9 +45427,9 @@ diff -urNp linux-2.6.32.7/init/noinitramfs.c linux-2.6.32.7/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.32.7/ipc/ipc_sysctl.c linux-2.6.32.7/ipc/ipc_sysctl.c ---- linux-2.6.32.7/ipc/ipc_sysctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/ipc/ipc_sysctl.c 2010-01-25 17:39:41.076314755 -0500 +diff -urNp linux-2.6.32.9/ipc/ipc_sysctl.c linux-2.6.32.9/ipc/ipc_sysctl.c +--- linux-2.6.32.9/ipc/ipc_sysctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/ipc/ipc_sysctl.c 2010-02-23 17:09:53.324062460 -0500 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -44835,9 +45448,9 @@ diff -urNp linux-2.6.32.7/ipc/ipc_sysctl.c linux-2.6.32.7/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.32.7/ipc/mqueue.c linux-2.6.32.7/ipc/mqueue.c ---- linux-2.6.32.7/ipc/mqueue.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/ipc/mqueue.c 2010-01-25 17:39:41.076314755 -0500 +diff -urNp linux-2.6.32.9/ipc/mqueue.c linux-2.6.32.9/ipc/mqueue.c +--- linux-2.6.32.9/ipc/mqueue.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/ipc/mqueue.c 2010-02-23 17:09:53.324062460 -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)); @@ -44846,9 +45459,9 @@ diff -urNp linux-2.6.32.7/ipc/mqueue.c linux-2.6.32.7/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.7/ipc/shm.c linux-2.6.32.7/ipc/shm.c ---- linux-2.6.32.7/ipc/shm.c 2010-01-25 20:04:15.549151745 -0500 -+++ linux-2.6.32.7/ipc/shm.c 2010-01-25 20:04:25.168099298 -0500 +diff -urNp linux-2.6.32.9/ipc/shm.c linux-2.6.32.9/ipc/shm.c +--- linux-2.6.32.9/ipc/shm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/ipc/shm.c 2010-02-23 17:09:53.324062460 -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 @@ -44901,9 +45514,9 @@ diff -urNp linux-2.6.32.7/ipc/shm.c linux-2.6.32.7/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.32.7/kernel/acct.c linux-2.6.32.7/kernel/acct.c ---- linux-2.6.32.7/kernel/acct.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/acct.c 2010-01-25 17:39:41.077441091 -0500 +diff -urNp linux-2.6.32.9/kernel/acct.c linux-2.6.32.9/kernel/acct.c +--- linux-2.6.32.9/kernel/acct.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/acct.c 2010-02-23 17:09:53.328047341 -0500 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -44913,9 +45526,9 @@ diff -urNp linux-2.6.32.7/kernel/acct.c linux-2.6.32.7/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.7/kernel/capability.c linux-2.6.32.7/kernel/capability.c ---- linux-2.6.32.7/kernel/capability.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/capability.c 2010-01-25 17:39:41.077441091 -0500 +diff -urNp linux-2.6.32.9/kernel/capability.c linux-2.6.32.9/kernel/capability.c +--- linux-2.6.32.9/kernel/capability.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/capability.c 2010-02-23 17:09:53.328047341 -0500 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -44939,9 +45552,9 @@ diff -urNp linux-2.6.32.7/kernel/capability.c linux-2.6.32.7/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.32.7/kernel/configs.c linux-2.6.32.7/kernel/configs.c ---- linux-2.6.32.7/kernel/configs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/configs.c 2010-01-25 17:39:41.077441091 -0500 +diff -urNp linux-2.6.32.9/kernel/configs.c linux-2.6.32.9/kernel/configs.c +--- linux-2.6.32.9/kernel/configs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/configs.c 2010-02-23 17:09:53.328047341 -0500 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -44962,9 +45575,9 @@ diff -urNp linux-2.6.32.7/kernel/configs.c linux-2.6.32.7/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.32.7/kernel/cpu.c linux-2.6.32.7/kernel/cpu.c ---- linux-2.6.32.7/kernel/cpu.c 2010-01-25 20:04:15.562557635 -0500 -+++ linux-2.6.32.7/kernel/cpu.c 2010-01-25 20:04:25.175451082 -0500 +diff -urNp linux-2.6.32.9/kernel/cpu.c linux-2.6.32.9/kernel/cpu.c +--- linux-2.6.32.9/kernel/cpu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/cpu.c 2010-02-23 17:09:53.328047341 -0500 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -44974,9 +45587,9 @@ diff -urNp linux-2.6.32.7/kernel/cpu.c linux-2.6.32.7/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.7/kernel/cred.c linux-2.6.32.7/kernel/cred.c ---- linux-2.6.32.7/kernel/cred.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/cred.c 2010-01-25 17:39:41.077441091 -0500 +diff -urNp linux-2.6.32.9/kernel/cred.c linux-2.6.32.9/kernel/cred.c +--- linux-2.6.32.9/kernel/cred.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/cred.c 2010-02-23 17:09:53.328047341 -0500 @@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -44986,9 +45599,9 @@ diff -urNp linux-2.6.32.7/kernel/cred.c linux-2.6.32.7/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.32.7/kernel/exit.c linux-2.6.32.7/kernel/exit.c ---- linux-2.6.32.7/kernel/exit.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/exit.c 2010-01-25 17:39:41.078429700 -0500 +diff -urNp linux-2.6.32.9/kernel/exit.c linux-2.6.32.9/kernel/exit.c +--- linux-2.6.32.9/kernel/exit.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/exit.c 2010-02-23 17:09:53.328047341 -0500 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -45078,9 +45691,9 @@ diff -urNp linux-2.6.32.7/kernel/exit.c linux-2.6.32.7/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c ---- linux-2.6.32.7/kernel/fork.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/fork.c 2010-01-25 17:39:41.078429700 -0500 +diff -urNp linux-2.6.32.9/kernel/fork.c linux-2.6.32.9/kernel/fork.c +--- linux-2.6.32.9/kernel/fork.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/fork.c 2010-02-23 17:09:53.328047341 -0500 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ @@ -45150,7 +45763,7 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c write_unlock(&fs->lock); return 0; } -@@ -1027,6 +1053,9 @@ static struct task_struct *copy_process( +@@ -1027,10 +1053,13 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -45159,8 +45772,25 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c + if (atomic_read(&p->real_cred->user->processes) >= p->signal->rlim[RLIMIT_NPROC].rlim_cur) { - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1179,6 +1208,8 @@ static struct task_struct *copy_process( +- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && +- p->real_cred->user != INIT_USER) ++ if (p->real_cred->user != INIT_USER && ++ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN)) + goto bad_fork_free; + } + +@@ -1059,6 +1088,10 @@ static struct task_struct *copy_process( + p->vfork_done = NULL; + spin_lock_init(&p->alloc_lock); + ++#ifdef CONFIG_GRKERNSEC ++ rwlock_init(&p->gr_fs_lock); ++#endif ++ + init_sigpending(&p->pending); + + p->utime = cputime_zero; +@@ -1179,6 +1212,8 @@ static struct task_struct *copy_process( goto bad_fork_free_pid; } @@ -45169,7 +45799,7 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1344,6 +1375,8 @@ bad_fork_cleanup_count: +@@ -1344,6 +1379,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -45178,7 +45808,7 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c return ERR_PTR(retval); } -@@ -1437,6 +1470,8 @@ long do_fork(unsigned long clone_flags, +@@ -1437,6 +1474,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -45187,7 +45817,7 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1569,7 +1604,7 @@ static int unshare_fs(unsigned long unsh +@@ -1569,7 +1608,7 @@ static int unshare_fs(unsigned long unsh return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -45196,7 +45826,13 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1692,7 +1727,7 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1689,14 +1728,18 @@ SYSCALL_DEFINE1(unshare, unsigned long, + task_lock(current); + + if (new_fs) { ++ unsigned long flags; ++ ++ gr_fs_write_lock_irqsave(current, flags); fs = current->fs; write_lock(&fs->lock); current->fs = new_fs; @@ -45205,9 +45841,14 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c ---- linux-2.6.32.7/kernel/futex.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/futex.c 2010-01-25 17:39:41.078429700 -0500 + write_unlock(&fs->lock); ++ gr_fs_write_unlock_irqrestore(current, flags); + } + + if (new_mm) { +diff -urNp linux-2.6.32.9/kernel/futex.c linux-2.6.32.9/kernel/futex.c +--- linux-2.6.32.9/kernel/futex.c 2010-02-23 17:04:12.667616804 -0500 ++++ linux-2.6.32.9/kernel/futex.c 2010-02-23 17:09:53.328047341 -0500 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -45228,7 +45869,7 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c /* * The futex address must be "naturally" aligned. */ -@@ -1828,7 +1834,7 @@ retry: +@@ -1852,7 +1858,7 @@ retry: restart = ¤t_thread_info()->restart_block; restart->fn = futex_wait_restart; @@ -45237,7 +45878,7 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; -@@ -2361,7 +2367,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2385,7 +2391,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi { struct robust_list_head __user *head; unsigned long ret; @@ -45249,7 +45890,7 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c if (!futex_cmpxchg_enabled) return -ENOSYS; -@@ -2377,11 +2386,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2401,11 +2410,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi if (!p) goto err_unlock; ret = -EPERM; @@ -45266,7 +45907,7 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c head = p->robust_list; rcu_read_unlock(); } -@@ -2443,7 +2457,7 @@ retry: +@@ -2467,7 +2481,7 @@ retry: */ static inline int fetch_robust_entry(struct robust_list __user **entry, struct robust_list __user * __user *head, @@ -45275,9 +45916,9 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.32.7/kernel/futex_compat.c linux-2.6.32.7/kernel/futex_compat.c ---- linux-2.6.32.7/kernel/futex_compat.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/futex_compat.c 2010-01-25 17:39:41.079430227 -0500 +diff -urNp linux-2.6.32.9/kernel/futex_compat.c linux-2.6.32.9/kernel/futex_compat.c +--- linux-2.6.32.9/kernel/futex_compat.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/futex_compat.c 2010-02-23 17:09:53.328047341 -0500 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -45315,9 +45956,9 @@ diff -urNp linux-2.6.32.7/kernel/futex_compat.c linux-2.6.32.7/kernel/futex_comp head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.32.7/kernel/gcov/base.c linux-2.6.32.7/kernel/gcov/base.c ---- linux-2.6.32.7/kernel/gcov/base.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/gcov/base.c 2010-01-25 17:39:41.079430227 -0500 +diff -urNp linux-2.6.32.9/kernel/gcov/base.c linux-2.6.32.9/kernel/gcov/base.c +--- linux-2.6.32.9/kernel/gcov/base.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/gcov/base.c 2010-02-23 17:09:53.328047341 -0500 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -45339,9 +45980,21 @@ diff -urNp linux-2.6.32.7/kernel/gcov/base.c linux-2.6.32.7/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.32.7/kernel/kallsyms.c linux-2.6.32.7/kernel/kallsyms.c ---- linux-2.6.32.7/kernel/kallsyms.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/kallsyms.c 2010-01-25 17:39:41.079430227 -0500 +diff -urNp linux-2.6.32.9/kernel/hrtimer.c linux-2.6.32.9/kernel/hrtimer.c +--- linux-2.6.32.9/kernel/hrtimer.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/hrtimer.c 2010-02-23 17:09:53.328047341 -0500 +@@ -1364,7 +1364,7 @@ void hrtimer_peek_ahead_timers(void) + local_irq_restore(flags); + } + +-static void run_hrtimer_softirq(struct softirq_action *h) ++static void run_hrtimer_softirq(void) + { + hrtimer_peek_ahead_timers(); + } +diff -urNp linux-2.6.32.9/kernel/kallsyms.c linux-2.6.32.9/kernel/kallsyms.c +--- linux-2.6.32.9/kernel/kallsyms.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/kallsyms.c 2010-02-23 17:09:53.328047341 -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) @@ -45416,9 +46069,9 @@ diff -urNp linux-2.6.32.7/kernel/kallsyms.c linux-2.6.32.7/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -diff -urNp linux-2.6.32.7/kernel/kgdb.c linux-2.6.32.7/kernel/kgdb.c ---- linux-2.6.32.7/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/kgdb.c 2010-01-25 17:39:41.079430227 -0500 +diff -urNp linux-2.6.32.9/kernel/kgdb.c linux-2.6.32.9/kernel/kgdb.c +--- linux-2.6.32.9/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/kgdb.c 2010-02-23 17:09:53.331561124 -0500 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -45446,9 +46099,9 @@ diff -urNp linux-2.6.32.7/kernel/kgdb.c linux-2.6.32.7/kernel/kgdb.c { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.32.7/kernel/kmod.c linux-2.6.32.7/kernel/kmod.c ---- linux-2.6.32.7/kernel/kmod.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/kmod.c 2010-01-25 17:39:41.079430227 -0500 +diff -urNp linux-2.6.32.9/kernel/kmod.c linux-2.6.32.9/kernel/kmod.c +--- linux-2.6.32.9/kernel/kmod.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/kmod.c 2010-02-23 17:09:53.331561124 -0500 @@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -45468,9 +46121,9 @@ diff -urNp linux-2.6.32.7/kernel/kmod.c linux-2.6.32.7/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 -diff -urNp linux-2.6.32.7/kernel/kprobes.c linux-2.6.32.7/kernel/kprobes.c ---- linux-2.6.32.7/kernel/kprobes.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/kprobes.c 2010-01-25 17:39:41.080425476 -0500 +diff -urNp linux-2.6.32.9/kernel/kprobes.c linux-2.6.32.9/kernel/kprobes.c +--- linux-2.6.32.9/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/kprobes.c 2010-02-23 17:09:53.331561124 -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. @@ -45489,9 +46142,9 @@ diff -urNp linux-2.6.32.7/kernel/kprobes.c linux-2.6.32.7/kernel/kprobes.c kfree(kip); } return 1; -diff -urNp linux-2.6.32.7/kernel/lockdep.c linux-2.6.32.7/kernel/lockdep.c ---- linux-2.6.32.7/kernel/lockdep.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/lockdep.c 2010-01-25 17:39:41.080425476 -0500 +diff -urNp linux-2.6.32.9/kernel/lockdep.c linux-2.6.32.9/kernel/lockdep.c +--- linux-2.6.32.9/kernel/lockdep.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/lockdep.c 2010-02-23 17:09:53.331561124 -0500 @@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -45521,9 +46174,9 @@ diff -urNp linux-2.6.32.7/kernel/lockdep.c linux-2.6.32.7/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c ---- linux-2.6.32.7/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/module.c 2010-01-25 17:39:41.081427324 -0500 +diff -urNp linux-2.6.32.9/kernel/module.c linux-2.6.32.9/kernel/module.c +--- linux-2.6.32.9/kernel/module.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/module.c 2010-02-23 17:09:53.331561124 -0500 @@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); @@ -45561,19 +46214,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -555,7 +556,11 @@ static void percpu_modcopy(void *pcpudes - int cpu; - - for_each_possible_cpu(cpu) -+#ifdef CONFIG_X86_32 -+ memcpy(pcpudest + __per_cpu_offset[cpu], from, size); -+#else - memcpy(pcpudest + per_cpu_offset(cpu), from, size); -+#endif - } - - #else /* ... !CONFIG_SMP */ -@@ -1543,7 +1548,8 @@ static void free_module(struct module *m +@@ -1543,7 +1544,8 @@ static void free_module(struct module *m destroy_params(mod->kp, mod->num_kp); /* This may be NULL, but that's OK */ @@ -45583,7 +46224,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c kfree(mod->args); if (mod->percpu) percpu_modfree(mod->percpu); -@@ -1552,10 +1558,12 @@ static void free_module(struct module *m +@@ -1552,10 +1554,12 @@ static void free_module(struct module *m percpu_modfree(mod->refptr); #endif /* Free lock-classes: */ @@ -45598,7 +46239,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c #ifdef CONFIG_MPU update_protections(current->mm); -@@ -1649,7 +1657,9 @@ static int simplify_symbols(Elf_Shdr *se +@@ -1649,7 +1653,9 @@ static int simplify_symbols(Elf_Shdr *se strtab + sym[i].st_name, mod); /* Ok if resolved. */ if (ksym) { @@ -45608,7 +46249,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c break; } -@@ -1668,7 +1678,9 @@ static int simplify_symbols(Elf_Shdr *se +@@ -1668,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se secbase = (unsigned long)mod->percpu; else secbase = sechdrs[sym[i].st_shndx].sh_addr; @@ -45618,7 +46259,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c break; } } -@@ -1729,11 +1741,12 @@ static void layout_sections(struct modul +@@ -1729,11 +1737,12 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || strstarts(secstrings + s->sh_name, ".init")) continue; @@ -45634,7 +46275,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c } DEBUGP("Init section allocation order:\n"); -@@ -1746,12 +1759,13 @@ static void layout_sections(struct modul +@@ -1746,12 +1755,13 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || !strstarts(secstrings + s->sh_name, ".init")) continue; @@ -45652,7 +46293,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c } } -@@ -1855,9 +1869,8 @@ static int is_exported(const char *name, +@@ -1855,9 +1865,8 @@ static int is_exported(const char *name, /* As per nm */ static char elf_type(const Elf_Sym *sym, @@ -45664,7 +46305,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c { if (ELF_ST_BIND(sym->st_info) == STB_WEAK) { if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT) -@@ -1932,7 +1945,7 @@ static unsigned long layout_symtab(struc +@@ -1932,7 +1941,7 @@ static unsigned long layout_symtab(struc /* Put symbol section at end of init part of module. */ symsect->sh_flags |= SHF_ALLOC; @@ -45673,7 +46314,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c symindex) | INIT_OFFSET_MASK; DEBUGP("\t%s\n", secstrings + symsect->sh_name); -@@ -1949,19 +1962,19 @@ static unsigned long layout_symtab(struc +@@ -1949,19 +1958,19 @@ static unsigned long layout_symtab(struc } /* Append room for core symbols at end of core part. */ @@ -45698,7 +46339,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c return symoffs; } -@@ -1985,12 +1998,14 @@ static void add_kallsyms(struct module * +@@ -1985,12 +1994,14 @@ static void add_kallsyms(struct module * mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym); mod->strtab = (void *)sechdrs[strindex].sh_addr; @@ -45715,7 +46356,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c src = mod->symtab; *dst = *src; for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { -@@ -2002,10 +2017,12 @@ static void add_kallsyms(struct module * +@@ -2002,10 +2013,12 @@ static void add_kallsyms(struct module * } mod->core_num_syms = ndst; @@ -45729,7 +46370,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c } #else static inline unsigned long layout_symtab(struct module *mod, -@@ -2042,16 +2059,30 @@ static void dynamic_debug_setup(struct _ +@@ -2042,16 +2055,30 @@ static void dynamic_debug_setup(struct _ #endif } @@ -45765,7 +46406,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c } return ret; } -@@ -2063,8 +2094,8 @@ static void kmemleak_load_module(struct +@@ -2063,8 +2090,8 @@ static void kmemleak_load_module(struct unsigned int i; /* only scan the sections containing data */ @@ -45776,7 +46417,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c sizeof(struct module), GFP_KERNEL); for (i = 1; i < hdr->e_shnum; i++) { -@@ -2074,8 +2105,8 @@ static void kmemleak_load_module(struct +@@ -2074,8 +2101,8 @@ static void kmemleak_load_module(struct && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0) continue; @@ -45787,7 +46428,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c sechdrs[i].sh_size, GFP_KERNEL); } } -@@ -2261,7 +2292,7 @@ static noinline struct module *load_modu +@@ -2261,7 +2288,7 @@ static noinline struct module *load_modu secstrings, &stroffs, strmap); /* Do the allocs. */ @@ -45796,7 +46437,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2272,23 +2303,47 @@ static noinline struct module *load_modu +@@ -2272,23 +2299,47 @@ static noinline struct module *load_modu err = -ENOMEM; goto free_percpu; } @@ -45826,9 +46467,12 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c + ptr = module_alloc_update_bounds_rx(mod->core_size_rx); + kmemleak_not_leak(ptr); + if (!ptr) { -+ err = -ENOMEM; + err = -ENOMEM; +- goto free_core; + goto free_init_rw; -+ } + } +- memset(ptr, 0, mod->init_size); +- mod->module_init = ptr; + + pax_open_kernel(); + memset(ptr, 0, mod->core_size_rx); @@ -45838,12 +46482,9 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c + ptr = module_alloc_update_bounds_rx(mod->init_size_rx); + kmemleak_not_leak(ptr); + if (!ptr && mod->init_size_rx) { - err = -ENOMEM; -- goto free_core; ++ err = -ENOMEM; + goto free_core_rx; - } -- memset(ptr, 0, mod->init_size); -- mod->module_init = ptr; ++ } + + pax_open_kernel(); + memset(ptr, 0, mod->init_size_rx); @@ -45852,7 +46493,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ DEBUGP("final section addresses:\n"); -@@ -2298,17 +2353,41 @@ static noinline struct module *load_modu +@@ -2298,17 +2349,41 @@ static noinline struct module *load_modu if (!(sechdrs[i].sh_flags & SHF_ALLOC)) continue; @@ -45876,10 +46517,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c + } + + if (sechdrs[i].sh_type != SHT_NOBITS) { - -- if (sechdrs[i].sh_type != SHT_NOBITS) -- memcpy(dest, (void *)sechdrs[i].sh_addr, -- sechdrs[i].sh_size); ++ +#ifdef CONFIG_PAX_KERNEXEC + if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) { + pax_open_kernel(); @@ -45887,7 +46525,10 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c + pax_close_kernel(); + } else +#endif -+ + +- if (sechdrs[i].sh_type != SHT_NOBITS) +- memcpy(dest, (void *)sechdrs[i].sh_addr, +- sechdrs[i].sh_size); + memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size); + } /* Update sh_addr to point to copy in image. */ @@ -45903,7 +46544,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); } /* Module has been moved. */ -@@ -2320,7 +2399,7 @@ static noinline struct module *load_modu +@@ -2320,7 +2395,7 @@ static noinline struct module *load_modu mod->name); if (!mod->refptr) { err = -ENOMEM; @@ -45912,7 +46553,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c } #endif /* Now we've moved module, initialize linked lists, etc. */ -@@ -2429,8 +2508,8 @@ static noinline struct module *load_modu +@@ -2429,8 +2504,8 @@ static noinline struct module *load_modu /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { @@ -45922,7 +46563,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* Not a valid relocation section? */ if (info >= hdr->e_shnum) -@@ -2491,12 +2570,12 @@ static noinline struct module *load_modu +@@ -2491,12 +2566,12 @@ static noinline struct module *load_modu * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -45941,7 +46582,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c set_fs(old_fs); -@@ -2544,12 +2623,16 @@ static noinline struct module *load_modu +@@ -2544,12 +2619,16 @@ static noinline struct module *load_modu free_unload: module_unload_free(mod); #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) @@ -45962,7 +46603,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* mod will be freed with core. Don't access it beyond this line! */ free_percpu: if (percpu) -@@ -2651,10 +2734,12 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2651,10 +2730,12 @@ SYSCALL_DEFINE3(init_module, void __user mod->symtab = mod->core_symtab; mod->strtab = mod->core_strtab; #endif @@ -45979,7 +46620,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c mutex_unlock(&module_mutex); return 0; -@@ -2685,10 +2770,16 @@ static const char *get_ksymbol(struct mo +@@ -2685,10 +2766,16 @@ static const char *get_ksymbol(struct mo unsigned long nextval; /* At worse, next value is at end of module */ @@ -45999,7 +46640,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* Scan for closest preceeding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -2934,7 +3025,7 @@ static int m_show(struct seq_file *m, vo +@@ -2934,7 +3021,7 @@ static int m_show(struct seq_file *m, vo char buf[8]; seq_printf(m, "%s %u", @@ -46008,7 +46649,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c print_unload_info(m, mod); /* Informative for users. */ -@@ -2943,7 +3034,7 @@ static int m_show(struct seq_file *m, vo +@@ -2943,7 +3030,7 @@ static int m_show(struct seq_file *m, vo mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -46017,7 +46658,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c /* Taints info */ if (mod->taints) -@@ -2979,7 +3070,17 @@ static const struct file_operations proc +@@ -2979,7 +3066,17 @@ static const struct file_operations proc static int __init proc_modules_init(void) { @@ -46035,7 +46676,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c return 0; } module_init(proc_modules_init); -@@ -3038,12 +3139,12 @@ struct module *__module_address(unsigned +@@ -3038,12 +3135,12 @@ struct module *__module_address(unsigned { struct module *mod; @@ -46051,7 +46692,7 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c return mod; return NULL; } -@@ -3077,11 +3178,20 @@ bool is_module_text_address(unsigned lon +@@ -3077,11 +3174,20 @@ bool is_module_text_address(unsigned lon */ struct module *__module_text_address(unsigned long addr) { @@ -46075,9 +46716,9 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.32.7/kernel/panic.c linux-2.6.32.7/kernel/panic.c ---- linux-2.6.32.7/kernel/panic.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/panic.c 2010-01-25 17:39:41.082412843 -0500 +diff -urNp linux-2.6.32.9/kernel/panic.c linux-2.6.32.9/kernel/panic.c +--- linux-2.6.32.9/kernel/panic.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/panic.c 2010-02-23 17:09:53.331561124 -0500 @@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) @@ -46088,9 +46729,9 @@ diff -urNp linux-2.6.32.7/kernel/panic.c linux-2.6.32.7/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.32.7/kernel/params.c linux-2.6.32.7/kernel/params.c ---- linux-2.6.32.7/kernel/params.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/params.c 2010-01-25 17:39:41.082412843 -0500 +diff -urNp linux-2.6.32.9/kernel/params.c linux-2.6.32.9/kernel/params.c +--- linux-2.6.32.9/kernel/params.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/params.c 2010-02-23 17:09:53.331561124 -0500 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -46109,9 +46750,9 @@ diff -urNp linux-2.6.32.7/kernel/params.c linux-2.6.32.7/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.32.7/kernel/pid.c linux-2.6.32.7/kernel/pid.c ---- linux-2.6.32.7/kernel/pid.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/pid.c 2010-01-25 17:39:41.082412843 -0500 +diff -urNp linux-2.6.32.9/kernel/pid.c linux-2.6.32.9/kernel/pid.c +--- linux-2.6.32.9/kernel/pid.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/pid.c 2010-02-23 17:09:53.331561124 -0500 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -46145,9 +46786,9 @@ diff -urNp linux-2.6.32.7/kernel/pid.c linux-2.6.32.7/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.32.7/kernel/posix-cpu-timers.c linux-2.6.32.7/kernel/posix-cpu-timers.c ---- linux-2.6.32.7/kernel/posix-cpu-timers.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/posix-cpu-timers.c 2010-01-25 17:39:41.082412843 -0500 +diff -urNp linux-2.6.32.9/kernel/posix-cpu-timers.c linux-2.6.32.9/kernel/posix-cpu-timers.c +--- linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/posix-cpu-timers.c 2010-02-23 17:09:53.331561124 -0500 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -46172,9 +46813,9 @@ diff -urNp linux-2.6.32.7/kernel/posix-cpu-timers.c linux-2.6.32.7/kernel/posix- if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { /* * At the soft limit, send a SIGXCPU every second. -diff -urNp linux-2.6.32.7/kernel/power/hibernate.c linux-2.6.32.7/kernel/power/hibernate.c ---- linux-2.6.32.7/kernel/power/hibernate.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/power/hibernate.c 2010-01-25 17:39:41.083426302 -0500 +diff -urNp linux-2.6.32.9/kernel/power/hibernate.c linux-2.6.32.9/kernel/power/hibernate.c +--- linux-2.6.32.9/kernel/power/hibernate.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/power/hibernate.c 2010-02-23 17:09:53.331561124 -0500 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -46192,9 +46833,9 @@ diff -urNp linux-2.6.32.7/kernel/power/hibernate.c linux-2.6.32.7/kernel/power/h { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.32.7/kernel/power/poweroff.c linux-2.6.32.7/kernel/power/poweroff.c ---- linux-2.6.32.7/kernel/power/poweroff.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/power/poweroff.c 2010-01-25 17:39:41.083426302 -0500 +diff -urNp linux-2.6.32.9/kernel/power/poweroff.c linux-2.6.32.9/kernel/power/poweroff.c +--- linux-2.6.32.9/kernel/power/poweroff.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/power/poweroff.c 2010-02-23 17:09:53.336191874 -0500 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -46204,9 +46845,9 @@ diff -urNp linux-2.6.32.7/kernel/power/poweroff.c linux-2.6.32.7/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.32.7/kernel/power/process.c linux-2.6.32.7/kernel/power/process.c ---- linux-2.6.32.7/kernel/power/process.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/power/process.c 2010-01-25 17:39:41.083426302 -0500 +diff -urNp linux-2.6.32.9/kernel/power/process.c linux-2.6.32.9/kernel/power/process.c +--- linux-2.6.32.9/kernel/power/process.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/power/process.c 2010-02-23 17:09:53.336191874 -0500 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; @@ -46246,9 +46887,9 @@ diff -urNp linux-2.6.32.7/kernel/power/process.c linux-2.6.32.7/kernel/power/pro do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.32.7/kernel/power/suspend.c linux-2.6.32.7/kernel/power/suspend.c ---- linux-2.6.32.7/kernel/power/suspend.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/power/suspend.c 2010-01-25 17:39:41.083426302 -0500 +diff -urNp linux-2.6.32.9/kernel/power/suspend.c linux-2.6.32.9/kernel/power/suspend.c +--- linux-2.6.32.9/kernel/power/suspend.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/power/suspend.c 2010-02-23 17:09:53.336191874 -0500 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -46265,9 +46906,9 @@ diff -urNp linux-2.6.32.7/kernel/power/suspend.c linux-2.6.32.7/kernel/power/sus { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.32.7/kernel/printk.c linux-2.6.32.7/kernel/printk.c ---- linux-2.6.32.7/kernel/printk.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/printk.c 2010-01-25 17:39:41.083426302 -0500 +diff -urNp linux-2.6.32.9/kernel/printk.c linux-2.6.32.9/kernel/printk.c +--- linux-2.6.32.9/kernel/printk.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/printk.c 2010-02-23 17:09:53.336191874 -0500 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -46280,9 +46921,9 @@ diff -urNp linux-2.6.32.7/kernel/printk.c linux-2.6.32.7/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.32.7/kernel/ptrace.c linux-2.6.32.7/kernel/ptrace.c ---- linux-2.6.32.7/kernel/ptrace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/ptrace.c 2010-01-25 17:39:41.084483897 -0500 +diff -urNp linux-2.6.32.9/kernel/ptrace.c linux-2.6.32.9/kernel/ptrace.c +--- linux-2.6.32.9/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/ptrace.c 2010-02-23 17:09:53.336191874 -0500 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -46353,9 +46994,21 @@ diff -urNp linux-2.6.32.7/kernel/ptrace.c linux-2.6.32.7/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.32.7/kernel/relay.c linux-2.6.32.7/kernel/relay.c ---- linux-2.6.32.7/kernel/relay.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/relay.c 2010-01-25 17:39:41.085160978 -0500 +diff -urNp linux-2.6.32.9/kernel/rcutree.c linux-2.6.32.9/kernel/rcutree.c +--- linux-2.6.32.9/kernel/rcutree.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/rcutree.c 2010-02-23 17:09:53.336191874 -0500 +@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state + /* + * Do softirq processing for the current CPU. + */ +-static void rcu_process_callbacks(struct softirq_action *unused) ++static void rcu_process_callbacks(void) + { + /* + * Memory references from any prior RCU read-side critical sections +diff -urNp linux-2.6.32.9/kernel/relay.c linux-2.6.32.9/kernel/relay.c +--- linux-2.6.32.9/kernel/relay.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/relay.c 2010-02-23 17:09:53.336191874 -0500 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -46365,9 +47018,9 @@ diff -urNp linux-2.6.32.7/kernel/relay.c linux-2.6.32.7/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.32.7/kernel/resource.c linux-2.6.32.7/kernel/resource.c ---- linux-2.6.32.7/kernel/resource.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/resource.c 2010-01-25 17:39:41.085160978 -0500 +diff -urNp linux-2.6.32.9/kernel/resource.c linux-2.6.32.9/kernel/resource.c +--- linux-2.6.32.9/kernel/resource.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/resource.c 2010-02-23 17:09:53.336191874 -0500 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -46387,9 +47040,18 @@ diff -urNp linux-2.6.32.7/kernel/resource.c linux-2.6.32.7/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.32.7/kernel/sched.c linux-2.6.32.7/kernel/sched.c ---- linux-2.6.32.7/kernel/sched.c 2010-01-25 20:04:15.598098059 -0500 -+++ linux-2.6.32.7/kernel/sched.c 2010-01-25 20:04:25.191109426 -0500 +diff -urNp linux-2.6.32.9/kernel/sched.c linux-2.6.32.9/kernel/sched.c +--- linux-2.6.32.9/kernel/sched.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/sched.c 2010-02-23 17:09:53.336191874 -0500 +@@ -4822,7 +4822,7 @@ out: + * In CONFIG_NO_HZ case, the idle load balance owner will do the + * rebalancing for all the cpus for whom scheduler ticks are stopped. + */ +-static void run_rebalance_domains(struct softirq_action *h) ++static void run_rebalance_domains(void) + { + int this_cpu = smp_processor_id(); + struct rq *this_rq = cpu_rq(this_cpu); @@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -46436,9 +47098,9 @@ diff -urNp linux-2.6.32.7/kernel/sched.c linux-2.6.32.7/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.32.7/kernel/signal.c linux-2.6.32.7/kernel/signal.c ---- linux-2.6.32.7/kernel/signal.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/signal.c 2010-01-25 17:39:41.089430610 -0500 +diff -urNp linux-2.6.32.9/kernel/signal.c linux-2.6.32.9/kernel/signal.c +--- linux-2.6.32.9/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/signal.c 2010-02-23 17:09:53.340074701 -0500 @@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc */ user = get_uid(__task_cred(t)->user); @@ -46491,9 +47153,9 @@ diff -urNp linux-2.6.32.7/kernel/signal.c linux-2.6.32.7/kernel/signal.c return ret; } -diff -urNp linux-2.6.32.7/kernel/smp.c linux-2.6.32.7/kernel/smp.c ---- linux-2.6.32.7/kernel/smp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/smp.c 2010-01-25 17:39:41.089430610 -0500 +diff -urNp linux-2.6.32.9/kernel/smp.c linux-2.6.32.9/kernel/smp.c +--- linux-2.6.32.9/kernel/smp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/smp.c 2010-02-23 17:09:53.340074701 -0500 @@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -46521,9 +47183,9 @@ diff -urNp linux-2.6.32.7/kernel/smp.c linux-2.6.32.7/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.32.7/kernel/softirq.c linux-2.6.32.7/kernel/softirq.c ---- linux-2.6.32.7/kernel/softirq.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/softirq.c 2010-01-25 17:39:41.089430610 -0500 +diff -urNp linux-2.6.32.9/kernel/softirq.c linux-2.6.32.9/kernel/softirq.c +--- linux-2.6.32.9/kernel/softirq.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/softirq.c 2010-02-23 17:09:53.340074701 -0500 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -46533,9 +47195,54 @@ diff -urNp linux-2.6.32.7/kernel/softirq.c linux-2.6.32.7/kernel/softirq.c "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", "TASKLET", "SCHED", "HRTIMER", "RCU" }; -diff -urNp linux-2.6.32.7/kernel/sys.c linux-2.6.32.7/kernel/sys.c ---- linux-2.6.32.7/kernel/sys.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/sys.c 2010-01-25 17:39:41.090393345 -0500 +@@ -190,7 +190,7 @@ EXPORT_SYMBOL(local_bh_enable_ip); + + asmlinkage void __do_softirq(void) + { +- struct softirq_action *h; ++ const struct softirq_action *h; + __u32 pending; + int max_restart = MAX_SOFTIRQ_RESTART; + int cpu; +@@ -216,7 +216,7 @@ restart: + kstat_incr_softirqs_this_cpu(h - softirq_vec); + + trace_softirq_entry(h, softirq_vec); +- h->action(h); ++ h->action(); + trace_softirq_exit(h, softirq_vec); + if (unlikely(prev_count != preempt_count())) { + printk(KERN_ERR "huh, entered softirq %td %s %p" +@@ -340,7 +340,7 @@ void raise_softirq(unsigned int nr) + local_irq_restore(flags); + } + +-void open_softirq(int nr, void (*action)(struct softirq_action *)) ++void open_softirq(int nr, void (*action)(void)) + { + softirq_vec[nr].action = action; + } +@@ -396,7 +396,7 @@ void __tasklet_hi_schedule_first(struct + + EXPORT_SYMBOL(__tasklet_hi_schedule_first); + +-static void tasklet_action(struct softirq_action *a) ++static void tasklet_action(void) + { + struct tasklet_struct *list; + +@@ -431,7 +431,7 @@ static void tasklet_action(struct softir + } + } + +-static void tasklet_hi_action(struct softirq_action *a) ++static void tasklet_hi_action(void) + { + struct tasklet_struct *list; + +diff -urNp linux-2.6.32.9/kernel/sys.c linux-2.6.32.9/kernel/sys.c +--- linux-2.6.32.9/kernel/sys.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/sys.c 2010-02-23 17:09:53.340074701 -0500 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -46671,9 +47378,9 @@ diff -urNp linux-2.6.32.7/kernel/sys.c linux-2.6.32.7/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.32.7/kernel/sysctl.c linux-2.6.32.7/kernel/sysctl.c ---- linux-2.6.32.7/kernel/sysctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/sysctl.c 2010-01-25 17:39:41.090393345 -0500 +diff -urNp linux-2.6.32.9/kernel/sysctl.c linux-2.6.32.9/kernel/sysctl.c +--- linux-2.6.32.9/kernel/sysctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/sysctl.c 2010-02-23 17:09:53.340074701 -0500 @@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); @@ -46795,9 +47502,9 @@ diff -urNp linux-2.6.32.7/kernel/sysctl.c linux-2.6.32.7/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.32.7/kernel/taskstats.c linux-2.6.32.7/kernel/taskstats.c ---- linux-2.6.32.7/kernel/taskstats.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/taskstats.c 2010-01-25 17:39:41.091355913 -0500 +diff -urNp linux-2.6.32.9/kernel/taskstats.c linux-2.6.32.9/kernel/taskstats.c +--- linux-2.6.32.9/kernel/taskstats.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/taskstats.c 2010-02-23 17:09:53.340074701 -0500 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -46821,9 +47528,9 @@ diff -urNp linux-2.6.32.7/kernel/taskstats.c linux-2.6.32.7/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.32.7/kernel/time/tick-broadcast.c linux-2.6.32.7/kernel/time/tick-broadcast.c ---- linux-2.6.32.7/kernel/time/tick-broadcast.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/time/tick-broadcast.c 2010-01-25 17:39:41.091355913 -0500 +diff -urNp linux-2.6.32.9/kernel/time/tick-broadcast.c linux-2.6.32.9/kernel/time/tick-broadcast.c +--- linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/time/tick-broadcast.c 2010-02-23 17:09:53.340074701 -0500 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -46833,9 +47540,9 @@ diff -urNp linux-2.6.32.7/kernel/time/tick-broadcast.c linux-2.6.32.7/kernel/tim cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.32.7/kernel/time.c linux-2.6.32.7/kernel/time.c ---- linux-2.6.32.7/kernel/time.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/time.c 2010-01-25 17:39:41.091355913 -0500 +diff -urNp linux-2.6.32.9/kernel/time.c linux-2.6.32.9/kernel/time.c +--- linux-2.6.32.9/kernel/time.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/time.c 2010-02-23 17:09:53.340074701 -0500 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -46873,9 +47580,21 @@ diff -urNp linux-2.6.32.7/kernel/time.c linux-2.6.32.7/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.32.7/kernel/trace/ftrace.c linux-2.6.32.7/kernel/trace/ftrace.c ---- linux-2.6.32.7/kernel/trace/ftrace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/ftrace.c 2010-01-25 17:39:41.092433407 -0500 +diff -urNp linux-2.6.32.9/kernel/timer.c linux-2.6.32.9/kernel/timer.c +--- linux-2.6.32.9/kernel/timer.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/timer.c 2010-02-23 17:09:53.340074701 -0500 +@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) + /* + * This function runs timers and the timer-tq in bottom half context. + */ +-static void run_timer_softirq(struct softirq_action *h) ++static void run_timer_softirq(void) + { + struct tvec_base *base = __get_cpu_var(tvec_bases); + +diff -urNp linux-2.6.32.9/kernel/trace/ftrace.c linux-2.6.32.9/kernel/trace/ftrace.c +--- linux-2.6.32.9/kernel/trace/ftrace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/ftrace.c 2010-02-23 17:09:53.340074701 -0500 @@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, ip = rec->ip; @@ -46897,9 +47616,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/ftrace.c linux-2.6.32.7/kernel/trace/ftra } /* -diff -urNp linux-2.6.32.7/kernel/trace/Kconfig linux-2.6.32.7/kernel/trace/Kconfig ---- linux-2.6.32.7/kernel/trace/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/Kconfig 2010-01-25 17:39:41.092433407 -0500 +diff -urNp linux-2.6.32.9/kernel/trace/Kconfig linux-2.6.32.9/kernel/trace/Kconfig +--- linux-2.6.32.9/kernel/trace/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/Kconfig 2010-02-23 17:09:53.340074701 -0500 @@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" @@ -46916,9 +47635,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/Kconfig linux-2.6.32.7/kernel/trace/Kconf select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.32.7/kernel/trace/trace.c linux-2.6.32.7/kernel/trace/trace.c ---- linux-2.6.32.7/kernel/trace/trace.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/trace.c 2010-01-25 17:39:41.093259491 -0500 +diff -urNp linux-2.6.32.9/kernel/trace/trace.c linux-2.6.32.9/kernel/trace/trace.c +--- linux-2.6.32.9/kernel/trace/trace.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/trace.c 2010-02-23 17:09:53.343560823 -0500 @@ -3792,10 +3792,9 @@ static const struct file_operations trac }; #endif @@ -46943,9 +47662,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace.c linux-2.6.32.7/kernel/trace/trace static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.32.7/kernel/trace/trace_events.c linux-2.6.32.7/kernel/trace/trace_events.c ---- linux-2.6.32.7/kernel/trace/trace_events.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/trace_events.c 2010-01-25 17:39:41.093259491 -0500 +diff -urNp linux-2.6.32.9/kernel/trace/trace_events.c linux-2.6.32.9/kernel/trace/trace_events.c +--- linux-2.6.32.9/kernel/trace/trace_events.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/trace_events.c 2010-02-23 17:09:53.343560823 -0500 @@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list * Modules must own their file_operations to keep up with * reference counting. @@ -46955,9 +47674,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_events.c linux-2.6.32.7/kernel/trac struct ftrace_module_file_ops { struct list_head list; struct module *mod; -diff -urNp linux-2.6.32.7/kernel/trace/trace_output.c linux-2.6.32.7/kernel/trace/trace_output.c ---- linux-2.6.32.7/kernel/trace/trace_output.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/trace_output.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/kernel/trace/trace_output.c linux-2.6.32.9/kernel/trace/trace_output.c +--- linux-2.6.32.9/kernel/trace/trace_output.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/trace_output.c 2010-02-23 17:09:53.343560823 -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); @@ -46967,9 +47686,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_output.c linux-2.6.32.7/kernel/trac if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.32.7/kernel/trace/trace_stack.c linux-2.6.32.7/kernel/trace/trace_stack.c ---- linux-2.6.32.7/kernel/trace/trace_stack.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/trace/trace_stack.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/kernel/trace/trace_stack.c linux-2.6.32.9/kernel/trace/trace_stack.c +--- linux-2.6.32.9/kernel/trace/trace_stack.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/trace/trace_stack.c 2010-02-23 17:09:53.343560823 -0500 @@ -50,7 +50,7 @@ static inline void check_stack(void) return; @@ -46979,9 +47698,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_stack.c linux-2.6.32.7/kernel/trace return; local_irq_save(flags); -diff -urNp linux-2.6.32.7/kernel/utsname_sysctl.c linux-2.6.32.7/kernel/utsname_sysctl.c ---- linux-2.6.32.7/kernel/utsname_sysctl.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/kernel/utsname_sysctl.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/kernel/utsname_sysctl.c linux-2.6.32.9/kernel/utsname_sysctl.c +--- linux-2.6.32.9/kernel/utsname_sysctl.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/kernel/utsname_sysctl.c 2010-02-23 17:09:53.343560823 -0500 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -47000,9 +47719,9 @@ diff -urNp linux-2.6.32.7/kernel/utsname_sysctl.c linux-2.6.32.7/kernel/utsname_ }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.32.7/lib/bug.c linux-2.6.32.7/lib/bug.c ---- linux-2.6.32.7/lib/bug.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/bug.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/lib/bug.c linux-2.6.32.9/lib/bug.c +--- linux-2.6.32.9/lib/bug.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/bug.c 2010-02-23 17:09:53.343560823 -0500 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l return BUG_TRAP_TYPE_NONE; @@ -47012,9 +47731,9 @@ diff -urNp linux-2.6.32.7/lib/bug.c linux-2.6.32.7/lib/bug.c printk(KERN_EMERG "------------[ cut here ]------------\n"); -diff -urNp linux-2.6.32.7/lib/debugobjects.c linux-2.6.32.7/lib/debugobjects.c ---- linux-2.6.32.7/lib/debugobjects.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/debugobjects.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/lib/debugobjects.c linux-2.6.32.9/lib/debugobjects.c +--- linux-2.6.32.9/lib/debugobjects.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/debugobjects.c 2010-02-23 17:09:53.343560823 -0500 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi if (limit > 4) return; @@ -47024,9 +47743,9 @@ diff -urNp linux-2.6.32.7/lib/debugobjects.c linux-2.6.32.7/lib/debugobjects.c if (is_on_stack == onstack) return; -diff -urNp linux-2.6.32.7/lib/dma-debug.c linux-2.6.32.7/lib/dma-debug.c ---- linux-2.6.32.7/lib/dma-debug.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/dma-debug.c 2010-01-25 17:39:41.094167076 -0500 +diff -urNp linux-2.6.32.9/lib/dma-debug.c linux-2.6.32.9/lib/dma-debug.c +--- linux-2.6.32.9/lib/dma-debug.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/dma-debug.c 2010-02-23 17:09:53.343560823 -0500 @@ -861,7 +861,7 @@ out: static void check_for_stack(struct device *dev, void *addr) @@ -47036,9 +47755,26 @@ diff -urNp linux-2.6.32.7/lib/dma-debug.c linux-2.6.32.7/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.7/lib/inflate.c linux-2.6.32.7/lib/inflate.c ---- linux-2.6.32.7/lib/inflate.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/inflate.c 2010-01-25 17:39:41.095431188 -0500 +diff -urNp linux-2.6.32.9/lib/idr.c linux-2.6.32.9/lib/idr.c +--- linux-2.6.32.9/lib/idr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/idr.c 2010-02-23 17:10:38.011844955 -0500 +@@ -156,10 +156,12 @@ static int sub_alloc(struct idr *idp, in + id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; + + /* if already at the top layer, we need to grow */ +- if (!(p = pa[l])) { ++ if (id >= (1 << (idp->layers * IDR_BITS))) { + *starting_id = id; + return IDR_NEED_TO_GROW; + } ++ p = pa[l]; ++ BUG_ON(!p); + + /* If we need to go up one layer, continue the + * loop; otherwise, restart from the top. +diff -urNp linux-2.6.32.9/lib/inflate.c linux-2.6.32.9/lib/inflate.c +--- linux-2.6.32.9/lib/inflate.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/inflate.c 2010-02-23 17:09:53.343560823 -0500 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -47048,9 +47784,9 @@ diff -urNp linux-2.6.32.7/lib/inflate.c linux-2.6.32.7/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.32.7/lib/Kconfig.debug linux-2.6.32.7/lib/Kconfig.debug ---- linux-2.6.32.7/lib/Kconfig.debug 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/Kconfig.debug 2010-01-25 17:39:41.095431188 -0500 +diff -urNp linux-2.6.32.9/lib/Kconfig.debug linux-2.6.32.9/lib/Kconfig.debug +--- linux-2.6.32.9/lib/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/Kconfig.debug 2010-02-23 17:09:53.343560823 -0500 @@ -905,7 +905,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS @@ -47060,9 +47796,9 @@ diff -urNp linux-2.6.32.7/lib/Kconfig.debug linux-2.6.32.7/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.7/lib/kobject.c linux-2.6.32.7/lib/kobject.c ---- linux-2.6.32.7/lib/kobject.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/kobject.c 2010-01-25 17:39:41.096167640 -0500 +diff -urNp linux-2.6.32.9/lib/kobject.c linux-2.6.32.9/lib/kobject.c +--- linux-2.6.32.9/lib/kobject.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/kobject.c 2010-02-23 17:09:53.343560823 -0500 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -47090,9 +47826,9 @@ diff -urNp linux-2.6.32.7/lib/kobject.c linux-2.6.32.7/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.32.7/lib/kobject_uevent.c linux-2.6.32.7/lib/kobject_uevent.c ---- linux-2.6.32.7/lib/kobject_uevent.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/kobject_uevent.c 2010-01-25 17:39:41.096167640 -0500 +diff -urNp linux-2.6.32.9/lib/kobject_uevent.c linux-2.6.32.9/lib/kobject_uevent.c +--- linux-2.6.32.9/lib/kobject_uevent.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/kobject_uevent.c 2010-02-23 17:09:53.343560823 -0500 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -47102,9 +47838,9 @@ diff -urNp linux-2.6.32.7/lib/kobject_uevent.c linux-2.6.32.7/lib/kobject_uevent u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.32.7/lib/parser.c linux-2.6.32.7/lib/parser.c ---- linux-2.6.32.7/lib/parser.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/parser.c 2010-01-25 17:39:41.096167640 -0500 +diff -urNp linux-2.6.32.9/lib/parser.c linux-2.6.32.9/lib/parser.c +--- linux-2.6.32.9/lib/parser.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/parser.c 2010-02-23 17:09:53.343560823 -0500 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -47114,9 +47850,9 @@ diff -urNp linux-2.6.32.7/lib/parser.c linux-2.6.32.7/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.32.7/lib/radix-tree.c linux-2.6.32.7/lib/radix-tree.c ---- linux-2.6.32.7/lib/radix-tree.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/radix-tree.c 2010-01-25 17:39:41.096167640 -0500 +diff -urNp linux-2.6.32.9/lib/radix-tree.c linux-2.6.32.9/lib/radix-tree.c +--- linux-2.6.32.9/lib/radix-tree.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/radix-tree.c 2010-02-23 17:09:53.343560823 -0500 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -47126,9 +47862,9 @@ diff -urNp linux-2.6.32.7/lib/radix-tree.c linux-2.6.32.7/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.32.7/lib/random32.c linux-2.6.32.7/lib/random32.c ---- linux-2.6.32.7/lib/random32.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/lib/random32.c 2010-01-25 17:39:41.096167640 -0500 +diff -urNp linux-2.6.32.9/lib/random32.c linux-2.6.32.9/lib/random32.c +--- linux-2.6.32.9/lib/random32.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/lib/random32.c 2010-02-23 17:09:53.343560823 -0500 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -47138,14 +47874,14 @@ diff -urNp linux-2.6.32.7/lib/random32.c linux-2.6.32.7/lib/random32.c } /** -diff -urNp linux-2.6.32.7/localversion-grsec linux-2.6.32.7/localversion-grsec ---- linux-2.6.32.7/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.32.7/localversion-grsec 2010-01-25 17:39:41.097296689 -0500 +diff -urNp linux-2.6.32.9/localversion-grsec linux-2.6.32.9/localversion-grsec +--- linux-2.6.32.9/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32.9/localversion-grsec 2010-02-23 17:09:53.343560823 -0500 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.32.7/Makefile linux-2.6.32.7/Makefile ---- linux-2.6.32.7/Makefile 2010-01-25 20:04:14.527344760 -0500 -+++ linux-2.6.32.7/Makefile 2010-01-25 20:04:24.352555064 -0500 +diff -urNp linux-2.6.32.9/Makefile linux-2.6.32.9/Makefile +--- linux-2.6.32.9/Makefile 2010-02-23 17:04:11.556067453 -0500 ++++ linux-2.6.32.9/Makefile 2010-02-23 17:09:53.343560823 -0500 @@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc @@ -47166,9 +47902,9 @@ diff -urNp linux-2.6.32.7/Makefile linux-2.6.32.7/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c ---- linux-2.6.32.7/mm/filemap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/filemap.c 2010-01-25 17:39:41.097296689 -0500 +diff -urNp linux-2.6.32.9/mm/filemap.c linux-2.6.32.9/mm/filemap.c +--- linux-2.6.32.9/mm/filemap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/filemap.c 2010-02-23 17:09:53.343560823 -0500 @@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; @@ -47178,7 +47914,7 @@ diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c file_accessed(file); vma->vm_ops = &generic_file_vm_ops; vma->vm_flags |= VM_CAN_NONLINEAR; -@@ -1982,6 +1982,7 @@ inline int generic_write_checks(struct f +@@ -2018,6 +2018,7 @@ inline int generic_write_checks(struct f *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -47186,9 +47922,9 @@ diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.32.7/mm/fremap.c linux-2.6.32.7/mm/fremap.c ---- linux-2.6.32.7/mm/fremap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/fremap.c 2010-01-25 17:39:41.098425899 -0500 +diff -urNp linux-2.6.32.9/mm/fremap.c linux-2.6.32.9/mm/fremap.c +--- linux-2.6.32.9/mm/fremap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/fremap.c 2010-02-23 17:09:53.343560823 -0500 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -47201,9 +47937,9 @@ diff -urNp linux-2.6.32.7/mm/fremap.c linux-2.6.32.7/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.32.7/mm/highmem.c linux-2.6.32.7/mm/highmem.c ---- linux-2.6.32.7/mm/highmem.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/highmem.c 2010-01-25 17:39:41.098425899 -0500 +diff -urNp linux-2.6.32.9/mm/highmem.c linux-2.6.32.9/mm/highmem.c +--- linux-2.6.32.9/mm/highmem.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/highmem.c 2010-02-23 17:09:53.343560823 -0500 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -47229,9 +47965,9 @@ diff -urNp linux-2.6.32.7/mm/highmem.c linux-2.6.32.7/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.32.7/mm/hugetlb.c linux-2.6.32.7/mm/hugetlb.c ---- linux-2.6.32.7/mm/hugetlb.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/hugetlb.c 2010-01-25 17:39:41.098425899 -0500 +diff -urNp linux-2.6.32.9/mm/hugetlb.c linux-2.6.32.9/mm/hugetlb.c +--- linux-2.6.32.9/mm/hugetlb.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/hugetlb.c 2010-02-23 17:09:53.348068268 -0500 @@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -47311,9 +48047,9 @@ diff -urNp linux-2.6.32.7/mm/hugetlb.c linux-2.6.32.7/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.7/mm/Kconfig linux-2.6.32.7/mm/Kconfig ---- linux-2.6.32.7/mm/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/Kconfig 2010-01-25 17:39:41.099202007 -0500 +diff -urNp linux-2.6.32.9/mm/Kconfig linux-2.6.32.9/mm/Kconfig +--- linux-2.6.32.9/mm/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/Kconfig 2010-02-23 17:09:53.348068268 -0500 @@ -228,7 +228,7 @@ config KSM config DEFAULT_MMAP_MIN_ADDR int "Low address space to protect from user allocation" @@ -47323,9 +48059,9 @@ diff -urNp linux-2.6.32.7/mm/Kconfig linux-2.6.32.7/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.7/mm/maccess.c linux-2.6.32.7/mm/maccess.c ---- linux-2.6.32.7/mm/maccess.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/maccess.c 2010-01-25 17:39:41.099202007 -0500 +diff -urNp linux-2.6.32.9/mm/maccess.c linux-2.6.32.9/mm/maccess.c +--- linux-2.6.32.9/mm/maccess.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/maccess.c 2010-02-23 17:09:53.348068268 -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. @@ -47344,9 +48080,9 @@ diff -urNp linux-2.6.32.7/mm/maccess.c linux-2.6.32.7/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.32.7/mm/madvise.c linux-2.6.32.7/mm/madvise.c ---- linux-2.6.32.7/mm/madvise.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/madvise.c 2010-01-25 17:39:41.099202007 -0500 +diff -urNp linux-2.6.32.9/mm/madvise.c linux-2.6.32.9/mm/madvise.c +--- linux-2.6.32.9/mm/madvise.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/madvise.c 2010-02-23 17:09:53.348068268 -0500 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -47423,9 +48159,9 @@ diff -urNp linux-2.6.32.7/mm/madvise.c linux-2.6.32.7/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.32.7/mm/memory.c linux-2.6.32.7/mm/memory.c ---- linux-2.6.32.7/mm/memory.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/memory.c 2010-01-25 17:39:41.099202007 -0500 +diff -urNp linux-2.6.32.9/mm/memory.c linux-2.6.32.9/mm/memory.c +--- linux-2.6.32.9/mm/memory.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/memory.c 2010-02-23 17:09:53.348068268 -0500 @@ -48,6 +48,7 @@ #include <linux/ksm.h> #include <linux/rmap.h> @@ -47830,9 +48566,9 @@ diff -urNp linux-2.6.32.7/mm/memory.c linux-2.6.32.7/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.7/mm/memory-failure.c linux-2.6.32.7/mm/memory-failure.c ---- linux-2.6.32.7/mm/memory-failure.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/memory-failure.c 2010-01-25 17:39:41.100425102 -0500 +diff -urNp linux-2.6.32.9/mm/memory-failure.c linux-2.6.32.9/mm/memory-failure.c +--- linux-2.6.32.9/mm/memory-failure.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/memory-failure.c 2010-02-23 17:09:53.348068268 -0500 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r int sysctl_memory_failure_recovery __read_mostly = 1; @@ -47851,9 +48587,9 @@ diff -urNp linux-2.6.32.7/mm/memory-failure.c linux-2.6.32.7/mm/memory-failure.c /* * We need/can do nothing about count=0 pages. -diff -urNp linux-2.6.32.7/mm/mempolicy.c linux-2.6.32.7/mm/mempolicy.c ---- linux-2.6.32.7/mm/mempolicy.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/mempolicy.c 2010-01-25 17:39:41.101196760 -0500 +diff -urNp linux-2.6.32.9/mm/mempolicy.c linux-2.6.32.9/mm/mempolicy.c +--- linux-2.6.32.9/mm/mempolicy.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/mempolicy.c 2010-02-23 17:09:53.348068268 -0500 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -47934,10 +48670,10 @@ diff -urNp linux-2.6.32.7/mm/mempolicy.c linux-2.6.32.7/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.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c ---- linux-2.6.32.7/mm/migrate.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/migrate.c 2010-01-25 17:39:41.101196760 -0500 -@@ -1103,6 +1103,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +diff -urNp linux-2.6.32.9/mm/migrate.c linux-2.6.32.9/mm/migrate.c +--- linux-2.6.32.9/mm/migrate.c 2010-02-23 17:04:12.687619162 -0500 ++++ linux-2.6.32.9/mm/migrate.c 2010-02-23 17:36:13.156353174 -0500 +@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -47952,7 +48688,7 @@ diff -urNp linux-2.6.32.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c /* * Check if this process has the right to modify the specified * process. The right exists if the process has administrative -@@ -1112,8 +1120,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +@@ -1115,8 +1123,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, rcu_read_lock(); tcred = __task_cred(task); if (cred->euid != tcred->suid && cred->euid != tcred->uid && @@ -47962,9 +48698,9 @@ diff -urNp linux-2.6.32.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.32.7/mm/mlock.c linux-2.6.32.7/mm/mlock.c ---- linux-2.6.32.7/mm/mlock.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/mlock.c 2010-01-25 17:39:41.101196760 -0500 +diff -urNp linux-2.6.32.9/mm/mlock.c linux-2.6.32.9/mm/mlock.c +--- linux-2.6.32.9/mm/mlock.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/mlock.c 2010-02-23 17:09:56.652716557 -0500 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -48033,9 +48769,9 @@ diff -urNp linux-2.6.32.7/mm/mlock.c linux-2.6.32.7/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.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c ---- linux-2.6.32.7/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/mmap.c 2010-01-25 17:49:13.109168923 -0500 +diff -urNp linux-2.6.32.9/mm/mmap.c linux-2.6.32.9/mm/mmap.c +--- linux-2.6.32.9/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/mmap.c 2010-02-23 17:09:56.652716557 -0500 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -48728,34 +49464,37 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1818,6 +2066,108 @@ detach_vmas_to_be_unmapped(struct mm_str - * Split a vma into two pieces at address 'addr', a new vma is allocated - * either for the first part or the tail. - */ -+ +@@ -1824,10 +2072,25 @@ int split_vma(struct mm_struct * mm, str + struct mempolicy *pol; + struct vm_area_struct *new; + +#ifdef CONFIG_PAX_SEGMEXEC -+int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, -+ unsigned long addr, int new_below) -+{ -+ struct mempolicy *pol; -+ struct vm_area_struct *new, *vma_m, *new_m = NULL; ++ struct vm_area_struct *vma_m, *new_m = NULL; + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE; ++#endif + -+ if (is_vm_hugetlb_page(vma) && (addr & ~HPAGE_MASK)) -+ return -EINVAL; -+ + if (is_vm_hugetlb_page(vma) && (addr & + ~(huge_page_mask(hstate_vma(vma))))) + return -EINVAL; + ++#ifdef CONFIG_PAX_SEGMEXEC + vma_m = pax_find_mirror_vma(vma); -+ if (vma_m) { ++ ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) { + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE); + if (mm->map_count >= sysctl_max_map_count-1) + return -ENOMEM; -+ } else if (mm->map_count >= sysctl_max_map_count) -+ return -ENOMEM; -+ -+ new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); -+ if (!new) -+ return -ENOMEM; ++ } else ++#endif + + if (mm->map_count >= sysctl_max_map_count) + return -ENOMEM; + +@@ -1835,6 +2098,16 @@ int split_vma(struct mm_struct * mm, str + if (!new) + return -ENOMEM; + ++#ifdef CONFIG_PAX_SEGMEXEC + if (vma_m) { + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); + if (!new_m) { @@ -48763,17 +49502,16 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c + return -ENOMEM; + } + } ++#endif + -+ /* most fields are the same, copy all, and then fixup */ -+ *new = *vma; -+ -+ if (new_below) -+ new->vm_end = addr; -+ else { -+ new->vm_start = addr; -+ new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); -+ } -+ + /* most fields are the same, copy all, and then fixup */ + *new = *vma; + +@@ -1845,8 +2118,29 @@ int split_vma(struct mm_struct * mm, str + new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); + } + ++#ifdef CONFIG_PAX_SEGMEXEC + if (vma_m) { + *new_m = *vma_m; + new_m->vm_mirror = new; @@ -48786,31 +49524,24 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT); + } + } ++#endif + -+ pol = mpol_dup(vma_policy(vma)); -+ if (IS_ERR(pol)) { + pol = mpol_dup(vma_policy(vma)); + if (IS_ERR(pol)) { ++ ++#ifdef CONFIG_PAX_SEGMEXEC + if (new_m) + kmem_cache_free(vm_area_cachep, new_m); -+ kmem_cache_free(vm_area_cachep, new); -+ return PTR_ERR(pol); -+ } -+ vma_set_policy(new, pol); -+ -+ if (new->vm_file) { -+ get_file(new->vm_file); -+ if (vma->vm_flags & VM_EXECUTABLE) -+ added_exe_file_vma(mm); -+ } -+ -+ if (new->vm_ops && new->vm_ops->open) -+ new->vm_ops->open(new); -+ -+ if (new_below) -+ vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + -+ ((addr - new->vm_start) >> PAGE_SHIFT), new); -+ else -+ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); ++#endif + + kmem_cache_free(vm_area_cachep, new); + return PTR_ERR(pol); + } +@@ -1867,6 +2161,28 @@ int split_vma(struct mm_struct * mm, str + else + vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); + ++#ifdef CONFIG_PAX_SEGMEXEC + if (vma_m) { + mpol_get(pol); + vma_set_policy(new_m, pol); @@ -48830,27 +49561,18 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c + else + vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m); + } ++#endif + -+ return 0; -+} -+#else - int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, - unsigned long addr, int new_below) - { -@@ -1869,17 +2219,37 @@ int split_vma(struct mm_struct * mm, str - return 0; } -+#endif - /* Munmap is split into 2 main parts -- this part which finds - * what needs doing, and the areas themselves, which do the +@@ -1875,11 +2191,30 @@ int split_vma(struct mm_struct * mm, str * work. This now handles partial unmappings. * Jeremy Fitzhardinge <jeremy@goop.org> */ +#ifdef CONFIG_PAX_SEGMEXEC -+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) -+{ + int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) + { + int ret = __do_munmap(mm, start, len); + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) + return ret; @@ -48860,9 +49582,9 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c + +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#else - int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) ++int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +#endif - { ++{ unsigned long end; struct vm_area_struct *vma, *prev, *last; @@ -48875,7 +49597,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -1943,6 +2313,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -1943,6 +2278,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -48884,7 +49606,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c return 0; } -@@ -1955,22 +2327,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -1955,22 +2292,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a profile_munmap(addr); @@ -48913,7 +49635,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -1984,6 +2352,11 @@ unsigned long do_brk(unsigned long addr, +@@ -1984,6 +2317,11 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -48925,7 +49647,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -1995,16 +2368,30 @@ unsigned long do_brk(unsigned long addr, +@@ -1995,16 +2333,30 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -48957,7 +49679,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; -@@ -2021,22 +2408,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2021,22 +2373,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -48984,7 +49706,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2050,10 +2437,21 @@ unsigned long do_brk(unsigned long addr, +@@ -2050,10 +2402,21 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -49007,7 +49729,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -2062,11 +2460,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2062,11 +2425,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: @@ -49022,7 +49744,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c return addr; } -@@ -2113,8 +2512,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2113,8 +2477,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. */ @@ -49034,7 +49756,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2128,6 +2529,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2128,6 +2494,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -49045,7 +49767,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/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 -@@ -2150,7 +2555,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2150,7 +2520,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; @@ -49068,7 +49790,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c return 0; } -@@ -2168,6 +2588,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2168,6 +2553,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -49077,7 +49799,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2211,6 +2633,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2211,6 +2598,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -49113,7 +49835,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2221,7 +2672,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2221,7 +2637,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; @@ -49122,7 +49844,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2290,6 +2741,15 @@ int install_special_mapping(struct mm_st +@@ -2290,6 +2706,15 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -49138,9 +49860,9 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/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.7/mm/mprotect.c linux-2.6.32.7/mm/mprotect.c ---- linux-2.6.32.7/mm/mprotect.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/mprotect.c 2010-01-25 17:39:41.103216205 -0500 +diff -urNp linux-2.6.32.9/mm/mprotect.c linux-2.6.32.9/mm/mprotect.c +--- linux-2.6.32.9/mm/mprotect.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/mprotect.c 2010-02-23 17:09:56.652716557 -0500 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> @@ -49331,9 +50053,9 @@ diff -urNp linux-2.6.32.7/mm/mprotect.c linux-2.6.32.7/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.32.7/mm/mremap.c linux-2.6.32.7/mm/mremap.c ---- linux-2.6.32.7/mm/mremap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/mremap.c 2010-01-25 17:51:07.728131761 -0500 +diff -urNp linux-2.6.32.9/mm/mremap.c linux-2.6.32.9/mm/mremap.c +--- linux-2.6.32.9/mm/mremap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/mremap.c 2010-02-23 17:09:56.652716557 -0500 @@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -49434,9 +50156,9 @@ diff -urNp linux-2.6.32.7/mm/mremap.c linux-2.6.32.7/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.32.7/mm/nommu.c linux-2.6.32.7/mm/nommu.c ---- linux-2.6.32.7/mm/nommu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/nommu.c 2010-01-25 17:39:41.113789566 -0500 +diff -urNp linux-2.6.32.9/mm/nommu.c linux-2.6.32.9/mm/nommu.c +--- linux-2.6.32.9/mm/nommu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/nommu.c 2010-02-23 17:09:56.652716557 -0500 @@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); @@ -49453,10 +50175,10 @@ diff -urNp linux-2.6.32.7/mm/nommu.c linux-2.6.32.7/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c ---- linux-2.6.32.7/mm/page_alloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/page_alloc.c 2010-01-25 17:39:41.114427717 -0500 -@@ -585,6 +585,10 @@ static void __free_pages_ok(struct page +diff -urNp linux-2.6.32.9/mm/page_alloc.c linux-2.6.32.9/mm/page_alloc.c +--- linux-2.6.32.9/mm/page_alloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/page_alloc.c 2010-02-23 17:09:56.652716557 -0500 +@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page int bad = 0; int wasMlocked = __TestClearPageMlocked(page); @@ -49467,7 +50189,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c kmemcheck_free_shadow(page, order); for (i = 0 ; i < (1 << order) ; ++i) -@@ -597,6 +601,12 @@ static void __free_pages_ok(struct page +@@ -598,6 +602,12 @@ static void __free_pages_ok(struct page debug_check_no_obj_freed(page_address(page), PAGE_SIZE << order); } @@ -49480,7 +50202,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c arch_free_page(page, order); kernel_map_pages(page, 1 << order, 0); -@@ -700,8 +710,10 @@ static int prep_new_page(struct page *pa +@@ -701,8 +711,10 @@ static int prep_new_page(struct page *pa arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); @@ -49491,7 +50213,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); -@@ -1095,6 +1107,11 @@ static void free_hot_cold_page(struct pa +@@ -1096,6 +1108,11 @@ static void free_hot_cold_page(struct pa debug_check_no_locks_freed(page_address(page), PAGE_SIZE); debug_check_no_obj_freed(page_address(page), PAGE_SIZE); } @@ -49503,9 +50225,9 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c arch_free_page(page, 0); kernel_map_pages(page, 1, 0); -diff -urNp linux-2.6.32.7/mm/percpu.c linux-2.6.32.7/mm/percpu.c ---- linux-2.6.32.7/mm/percpu.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/percpu.c 2010-01-25 17:39:41.115366990 -0500 +diff -urNp linux-2.6.32.9/mm/percpu.c linux-2.6.32.9/mm/percpu.c +--- linux-2.6.32.9/mm/percpu.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/percpu.c 2010-02-23 17:09:56.652716557 -0500 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu static unsigned int pcpu_last_unit_cpu __read_mostly; @@ -49515,9 +50237,9 @@ diff -urNp linux-2.6.32.7/mm/percpu.c linux-2.6.32.7/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.7/mm/rmap.c linux-2.6.32.7/mm/rmap.c ---- linux-2.6.32.7/mm/rmap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/rmap.c 2010-01-25 17:39:41.115366990 -0500 +diff -urNp linux-2.6.32.9/mm/rmap.c linux-2.6.32.9/mm/rmap.c +--- linux-2.6.32.9/mm/rmap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/rmap.c 2010-02-23 17:09:56.656790635 -0500 @@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -49545,9 +50267,9 @@ diff -urNp linux-2.6.32.7/mm/rmap.c linux-2.6.32.7/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.7/mm/shmem.c linux-2.6.32.7/mm/shmem.c ---- linux-2.6.32.7/mm/shmem.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/shmem.c 2010-01-25 17:39:41.125336894 -0500 +diff -urNp linux-2.6.32.9/mm/shmem.c linux-2.6.32.9/mm/shmem.c +--- linux-2.6.32.9/mm/shmem.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/shmem.c 2010-02-23 17:09:56.656790635 -0500 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -49557,9 +50279,9 @@ diff -urNp linux-2.6.32.7/mm/shmem.c linux-2.6.32.7/mm/shmem.c #ifdef CONFIG_SHMEM /* -diff -urNp linux-2.6.32.7/mm/slab.c linux-2.6.32.7/mm/slab.c ---- linux-2.6.32.7/mm/slab.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/slab.c 2010-01-25 17:39:41.126129280 -0500 +diff -urNp linux-2.6.32.9/mm/slab.c linux-2.6.32.9/mm/slab.c +--- linux-2.6.32.9/mm/slab.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/slab.c 2010-02-23 17:09:56.656790635 -0500 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -49657,9 +50379,9 @@ diff -urNp linux-2.6.32.7/mm/slab.c linux-2.6.32.7/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.7/mm/slob.c linux-2.6.32.7/mm/slob.c ---- linux-2.6.32.7/mm/slob.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/slob.c 2010-01-25 17:39:41.126129280 -0500 +diff -urNp linux-2.6.32.9/mm/slob.c linux-2.6.32.9/mm/slob.c +--- linux-2.6.32.9/mm/slob.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/slob.c 2010-02-23 17:09:56.713257424 -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 @@ -49980,10 +50702,19 @@ diff -urNp linux-2.6.32.7/mm/slob.c linux-2.6.32.7/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c ---- linux-2.6.32.7/mm/slub.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/slub.c 2010-01-25 17:39:41.127430872 -0500 -@@ -1937,7 +1937,7 @@ static int slub_min_objects; +diff -urNp linux-2.6.32.9/mm/slub.c linux-2.6.32.9/mm/slub.c +--- linux-2.6.32.9/mm/slub.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/slub.c 2010-02-23 17:09:56.713257424 -0500 +@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * + + page = virt_to_head_page(x); + ++ BUG_ON(!PageSlab(page)); ++ + slab_free(s, page, x, _RET_IP_); + + trace_kmem_cache_free(_RET_IP_, x); +@@ -1937,7 +1939,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will occur. * (Could be removed. This was introduced to pacify the merge skeptics.) */ @@ -49992,7 +50723,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c /* * Calculate the order of allocation given an slab object size. -@@ -2493,7 +2493,7 @@ static int kmem_cache_open(struct kmem_c +@@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_c * list to avoid pounding the page allocator excessively. */ set_min_partial(s, ilog2(s->size)); @@ -50001,7 +50732,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c #ifdef CONFIG_NUMA s->remote_node_defrag_ratio = 1000; #endif -@@ -2630,8 +2630,7 @@ static inline int kmem_cache_close(struc +@@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struc void kmem_cache_destroy(struct kmem_cache *s) { down_write(&slub_lock); @@ -50011,7 +50742,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c list_del(&s->list); up_write(&slub_lock); if (kmem_cache_close(s)) { -@@ -2915,6 +2914,46 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -2915,6 +2916,46 @@ void *__kmalloc_node(size_t size, gfp_t EXPORT_SYMBOL(__kmalloc_node); #endif @@ -50058,7 +50789,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c size_t ksize(const void *object) { struct page *page; -@@ -3186,7 +3225,7 @@ void __init kmem_cache_init(void) +@@ -3186,7 +3227,7 @@ void __init kmem_cache_init(void) */ create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node", sizeof(struct kmem_cache_node), GFP_NOWAIT); @@ -50067,7 +50798,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c caches++; hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI); -@@ -3293,7 +3332,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3293,7 +3334,7 @@ static int slab_unmergeable(struct kmem_ /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -50076,7 +50807,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c return 1; return 0; -@@ -3353,7 +3392,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3353,7 +3394,7 @@ struct kmem_cache *kmem_cache_create(con if (s) { int cpu; @@ -50085,7 +50816,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3372,7 +3411,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3372,7 +3413,7 @@ struct kmem_cache *kmem_cache_create(con if (sysfs_slab_alias(s, name)) { down_write(&slub_lock); @@ -50094,7 +50825,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c up_write(&slub_lock); goto err; } -@@ -4101,7 +4140,7 @@ SLAB_ATTR_RO(ctor); +@@ -4101,7 +4142,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -50103,7 +50834,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c } SLAB_ATTR_RO(aliases); -@@ -4503,7 +4542,7 @@ static void kmem_cache_release(struct ko +@@ -4503,7 +4544,7 @@ static void kmem_cache_release(struct ko kfree(s); } @@ -50112,7 +50843,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c .show = slab_attr_show, .store = slab_attr_store, }; -@@ -4522,7 +4561,7 @@ static int uevent_filter(struct kset *ks +@@ -4522,7 +4563,7 @@ static int uevent_filter(struct kset *ks return 0; } @@ -50121,7 +50852,7 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c .filter = uevent_filter, }; -@@ -4696,7 +4735,7 @@ __initcall(slab_sysfs_init); +@@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init); /* * The /proc/slabinfo ABI */ @@ -50130,9 +50861,9 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c static void print_slabinfo_header(struct seq_file *m) { seq_puts(m, "slabinfo - version: 2.1\n"); -diff -urNp linux-2.6.32.7/mm/util.c linux-2.6.32.7/mm/util.c ---- linux-2.6.32.7/mm/util.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/util.c 2010-01-25 17:39:41.127430872 -0500 +diff -urNp linux-2.6.32.9/mm/util.c linux-2.6.32.9/mm/util.c +--- linux-2.6.32.9/mm/util.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/util.c 2010-02-23 17:09:56.713257424 -0500 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -50146,9 +50877,9 @@ diff -urNp linux-2.6.32.7/mm/util.c linux-2.6.32.7/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c ---- linux-2.6.32.7/mm/vmalloc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/mm/vmalloc.c 2010-01-25 17:39:41.128331156 -0500 +diff -urNp linux-2.6.32.9/mm/vmalloc.c linux-2.6.32.9/mm/vmalloc.c +--- linux-2.6.32.9/mm/vmalloc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/mm/vmalloc.c 2010-02-23 17:09:56.713257424 -0500 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); @@ -50255,7 +50986,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c p = &(*p)->rb_right; else BUG(); -@@ -1162,6 +1196,16 @@ static struct vm_struct *__get_vm_area_n +@@ -1223,6 +1257,16 @@ static struct vm_struct *__get_vm_area_n struct vm_struct *area; BUG_ON(in_interrupt()); @@ -50272,7 +51003,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1387,6 +1431,11 @@ void *vmap(struct page **pages, unsigned +@@ -1448,6 +1492,11 @@ void *vmap(struct page **pages, unsigned if (count > totalram_pages) return NULL; @@ -50284,7 +51015,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1497,6 +1546,13 @@ static void *__vmalloc_node(unsigned lon +@@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; @@ -50298,7 +51029,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, VMALLOC_END, node, gfp_mask, caller); -@@ -1515,6 +1571,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon return addr; } @@ -50306,7 +51037,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, 1, gfp_mask, prot, -1, -@@ -1531,6 +1588,7 @@ EXPORT_SYMBOL(__vmalloc); +@@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -50314,7 +51045,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *vmalloc(unsigned long size) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1545,6 +1603,7 @@ EXPORT_SYMBOL(vmalloc); +@@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -50322,7 +51053,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1572,6 +1631,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -50330,7 +51061,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *vmalloc_node(unsigned long size, int node) { return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1594,10 +1654,10 @@ EXPORT_SYMBOL(vmalloc_node); +@@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -50343,7 +51074,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c -1, __builtin_return_address(0)); } -@@ -1616,6 +1676,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1677,6 +1737,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. */ @@ -50351,7 +51082,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *vmalloc_32(unsigned long size) { return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1630,6 +1691,7 @@ EXPORT_SYMBOL(vmalloc_32); +@@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -50359,9 +51090,9 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.32.7/net/atm/atm_misc.c linux-2.6.32.7/net/atm/atm_misc.c ---- linux-2.6.32.7/net/atm/atm_misc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/atm/atm_misc.c 2010-01-25 17:39:41.128331156 -0500 +diff -urNp linux-2.6.32.9/net/atm/atm_misc.c linux-2.6.32.9/net/atm/atm_misc.c +--- linux-2.6.32.9/net/atm/atm_misc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/atm/atm_misc.c 2010-02-23 17:09:56.713257424 -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; @@ -50398,9 +51129,9 @@ diff -urNp linux-2.6.32.7/net/atm/atm_misc.c linux-2.6.32.7/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.7/net/atm/proc.c linux-2.6.32.7/net/atm/proc.c ---- linux-2.6.32.7/net/atm/proc.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/atm/proc.c 2010-01-25 17:39:41.129325123 -0500 +diff -urNp linux-2.6.32.9/net/atm/proc.c linux-2.6.32.9/net/atm/proc.c +--- linux-2.6.32.9/net/atm/proc.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/atm/proc.c 2010-02-23 17:09:56.713257424 -0500 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -50414,9 +51145,9 @@ diff -urNp linux-2.6.32.7/net/atm/proc.c linux-2.6.32.7/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.32.7/net/atm/resources.c linux-2.6.32.7/net/atm/resources.c ---- linux-2.6.32.7/net/atm/resources.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/atm/resources.c 2010-01-25 17:39:41.129325123 -0500 +diff -urNp linux-2.6.32.9/net/atm/resources.c linux-2.6.32.9/net/atm/resources.c +--- linux-2.6.32.9/net/atm/resources.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/atm/resources.c 2010-02-23 17:09:56.716220139 -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) @@ -50435,9 +51166,9 @@ diff -urNp linux-2.6.32.7/net/atm/resources.c linux-2.6.32.7/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.32.7/net/bridge/br_private.h linux-2.6.32.7/net/bridge/br_private.h ---- linux-2.6.32.7/net/bridge/br_private.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/bridge/br_private.h 2010-01-25 17:39:41.129325123 -0500 +diff -urNp linux-2.6.32.9/net/bridge/br_private.h linux-2.6.32.9/net/bridge/br_private.h +--- linux-2.6.32.9/net/bridge/br_private.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/bridge/br_private.h 2010-02-23 17:09:56.716220139 -0500 @@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS @@ -50447,9 +51178,9 @@ diff -urNp linux-2.6.32.7/net/bridge/br_private.h linux-2.6.32.7/net/bridge/br_p extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.32.7/net/bridge/br_stp_if.c linux-2.6.32.7/net/bridge/br_stp_if.c ---- linux-2.6.32.7/net/bridge/br_stp_if.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/bridge/br_stp_if.c 2010-01-25 17:39:41.129325123 -0500 +diff -urNp linux-2.6.32.9/net/bridge/br_stp_if.c linux-2.6.32.9/net/bridge/br_stp_if.c +--- linux-2.6.32.9/net/bridge/br_stp_if.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/bridge/br_stp_if.c 2010-02-23 17:09:56.716220139 -0500 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -50459,9 +51190,9 @@ diff -urNp linux-2.6.32.7/net/bridge/br_stp_if.c linux-2.6.32.7/net/bridge/br_st printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.32.7/net/bridge/br_sysfs_if.c linux-2.6.32.7/net/bridge/br_sysfs_if.c ---- linux-2.6.32.7/net/bridge/br_sysfs_if.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/bridge/br_sysfs_if.c 2010-01-25 17:39:41.130433823 -0500 +diff -urNp linux-2.6.32.9/net/bridge/br_sysfs_if.c linux-2.6.32.9/net/bridge/br_sysfs_if.c +--- linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/bridge/br_sysfs_if.c 2010-02-23 17:09:56.716220139 -0500 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -50471,9 +51202,30 @@ diff -urNp linux-2.6.32.7/net/bridge/br_sysfs_if.c linux-2.6.32.7/net/bridge/br_ .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.32.7/net/core/flow.c linux-2.6.32.7/net/core/flow.c ---- linux-2.6.32.7/net/core/flow.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/core/flow.c 2010-01-25 17:39:41.130433823 -0500 +diff -urNp linux-2.6.32.9/net/core/dev.c linux-2.6.32.9/net/core/dev.c +--- linux-2.6.32.9/net/core/dev.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/core/dev.c 2010-02-23 17:09:56.716220139 -0500 +@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) + } + EXPORT_SYMBOL(netif_rx_ni); + +-static void net_tx_action(struct softirq_action *h) ++static void net_tx_action(void) + { + struct softnet_data *sd = &__get_cpu_var(softnet_data); + +@@ -2808,7 +2808,7 @@ void netif_napi_del(struct napi_struct * + EXPORT_SYMBOL(netif_napi_del); + + +-static void net_rx_action(struct softirq_action *h) ++static void net_rx_action(void) + { + struct list_head *list = &__get_cpu_var(softnet_data).poll_list; + unsigned long time_limit = jiffies + 2; +diff -urNp linux-2.6.32.9/net/core/flow.c linux-2.6.32.9/net/core/flow.c +--- linux-2.6.32.9/net/core/flow.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/core/flow.c 2010-02-23 17:09:56.716220139 -0500 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -50501,9 +51253,9 @@ diff -urNp linux-2.6.32.7/net/core/flow.c linux-2.6.32.7/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.32.7/net/dccp/ccids/ccid3.c linux-2.6.32.7/net/dccp/ccids/ccid3.c ---- linux-2.6.32.7/net/dccp/ccids/ccid3.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/dccp/ccids/ccid3.c 2010-01-25 17:39:41.131431700 -0500 +diff -urNp linux-2.6.32.9/net/dccp/ccids/ccid3.c linux-2.6.32.9/net/dccp/ccids/ccid3.c +--- linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/dccp/ccids/ccid3.c 2010-02-23 17:09:56.716220139 -0500 @@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -50513,9 +51265,9 @@ diff -urNp linux-2.6.32.7/net/dccp/ccids/ccid3.c linux-2.6.32.7/net/dccp/ccids/c #endif /* -diff -urNp linux-2.6.32.7/net/dccp/dccp.h linux-2.6.32.7/net/dccp/dccp.h ---- linux-2.6.32.7/net/dccp/dccp.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/dccp/dccp.h 2010-01-25 17:39:41.131431700 -0500 +diff -urNp linux-2.6.32.9/net/dccp/dccp.h linux-2.6.32.9/net/dccp/dccp.h +--- linux-2.6.32.9/net/dccp/dccp.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/dccp/dccp.h 2010-02-23 17:09:56.716220139 -0500 @@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) @@ -50529,9 +51281,9 @@ diff -urNp linux-2.6.32.7/net/dccp/dccp.h linux-2.6.32.7/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.32.7/net/ipv4/inet_hashtables.c linux-2.6.32.7/net/ipv4/inet_hashtables.c ---- linux-2.6.32.7/net/ipv4/inet_hashtables.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv4/inet_hashtables.c 2010-01-25 17:39:41.131431700 -0500 +diff -urNp linux-2.6.32.9/net/ipv4/inet_hashtables.c linux-2.6.32.9/net/ipv4/inet_hashtables.c +--- linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv4/inet_hashtables.c 2010-02-23 17:09:56.720158253 -0500 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -50556,9 +51308,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/inet_hashtables.c linux-2.6.32.7/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-01-25 17:39:41.132304817 -0500 +diff -urNp linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-23 17:09:56.720158253 -0500 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -50568,9 +51320,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.7/ if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.32.7/net/ipv4/tcp_ipv4.c linux-2.6.32.7/net/ipv4/tcp_ipv4.c ---- linux-2.6.32.7/net/ipv4/tcp_ipv4.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv4/tcp_ipv4.c 2010-01-25 17:39:41.132304817 -0500 +diff -urNp linux-2.6.32.9/net/ipv4/tcp_ipv4.c linux-2.6.32.9/net/ipv4/tcp_ipv4.c +--- linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv4/tcp_ipv4.c 2010-02-23 17:09:56.720158253 -0500 @@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc return 0; @@ -50591,9 +51343,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/tcp_ipv4.c linux-2.6.32.7/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.7/net/ipv4/tcp_minisocks.c linux-2.6.32.7/net/ipv4/tcp_minisocks.c ---- linux-2.6.32.7/net/ipv4/tcp_minisocks.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv4/tcp_minisocks.c 2010-01-25 17:39:41.132304817 -0500 +diff -urNp linux-2.6.32.9/net/ipv4/tcp_minisocks.c linux-2.6.32.9/net/ipv4/tcp_minisocks.c +--- linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv4/tcp_minisocks.c 2010-02-23 17:09:56.720158253 -0500 @@ -672,8 +672,11 @@ listen_overflow: embryonic_reset: @@ -50606,9 +51358,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/tcp_minisocks.c linux-2.6.32.7/net/ipv4/tcp_m inet_csk_reqsk_queue_drop(sk, req, prev); return NULL; -diff -urNp linux-2.6.32.7/net/ipv4/udp.c linux-2.6.32.7/net/ipv4/udp.c ---- linux-2.6.32.7/net/ipv4/udp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv4/udp.c 2010-01-25 17:39:41.133351107 -0500 +diff -urNp linux-2.6.32.9/net/ipv4/udp.c linux-2.6.32.9/net/ipv4/udp.c +--- linux-2.6.32.9/net/ipv4/udp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv4/udp.c 2010-02-23 17:09:56.720158253 -0500 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -50667,9 +51419,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/udp.c linux-2.6.32.7/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.32.7/net/ipv6/exthdrs.c linux-2.6.32.7/net/ipv6/exthdrs.c ---- linux-2.6.32.7/net/ipv6/exthdrs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv6/exthdrs.c 2010-01-25 17:39:41.133351107 -0500 +diff -urNp linux-2.6.32.9/net/ipv6/exthdrs.c linux-2.6.32.9/net/ipv6/exthdrs.c +--- linux-2.6.32.9/net/ipv6/exthdrs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv6/exthdrs.c 2010-02-23 17:09:56.720158253 -0500 @@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -50679,9 +51431,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/exthdrs.c linux-2.6.32.7/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.32.7/net/ipv6/raw.c linux-2.6.32.7/net/ipv6/raw.c ---- linux-2.6.32.7/net/ipv6/raw.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv6/raw.c 2010-01-25 17:39:41.133351107 -0500 +diff -urNp linux-2.6.32.9/net/ipv6/raw.c linux-2.6.32.9/net/ipv6/raw.c +--- linux-2.6.32.9/net/ipv6/raw.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv6/raw.c 2010-02-23 17:09:56.720158253 -0500 @@ -600,7 +600,7 @@ out: return err; } @@ -50691,9 +51443,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/raw.c linux-2.6.32.7/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.32.7/net/ipv6/tcp_ipv6.c linux-2.6.32.7/net/ipv6/tcp_ipv6.c ---- linux-2.6.32.7/net/ipv6/tcp_ipv6.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv6/tcp_ipv6.c 2010-01-25 17:39:41.134431806 -0500 +diff -urNp linux-2.6.32.9/net/ipv6/tcp_ipv6.c linux-2.6.32.9/net/ipv6/tcp_ipv6.c +--- linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv6/tcp_ipv6.c 2010-02-23 17:09:56.720158253 -0500 @@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; @@ -50714,9 +51466,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/tcp_ipv6.c linux-2.6.32.7/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.32.7/net/ipv6/udp.c linux-2.6.32.7/net/ipv6/udp.c ---- linux-2.6.32.7/net/ipv6/udp.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/ipv6/udp.c 2010-01-25 17:39:41.135121229 -0500 +diff -urNp linux-2.6.32.9/net/ipv6/udp.c linux-2.6.32.9/net/ipv6/udp.c +--- linux-2.6.32.9/net/ipv6/udp.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/ipv6/udp.c 2010-02-23 17:09:56.720158253 -0500 @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -50727,9 +51479,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/udp.c linux-2.6.32.7/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c 2010-01-25 17:39:41.135121229 -0500 +diff -urNp linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/irda/ircomm/ircomm_tty.c 2010-02-23 17:09:56.720158253 -0500 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -50852,9 +51604,9 @@ diff -urNp linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c linux-2.6.32.7/net/irda/i 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.7/net/mac80211/ieee80211_i.h linux-2.6.32.7/net/mac80211/ieee80211_i.h ---- linux-2.6.32.7/net/mac80211/ieee80211_i.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/ieee80211_i.h 2010-01-25 17:39:41.163782599 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/ieee80211_i.h linux-2.6.32.9/net/mac80211/ieee80211_i.h +--- linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/ieee80211_i.h 2010-02-23 17:09:56.720158253 -0500 @@ -634,7 +634,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -50864,9 +51616,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/ieee80211_i.h linux-2.6.32.7/net/mac80211 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.7/net/mac80211/iface.c linux-2.6.32.7/net/mac80211/iface.c ---- linux-2.6.32.7/net/mac80211/iface.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/iface.c 2010-01-25 17:39:41.165269289 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/iface.c linux-2.6.32.9/net/mac80211/iface.c +--- linux-2.6.32.9/net/mac80211/iface.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/iface.c 2010-02-23 17:09:56.720158253 -0500 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev break; } @@ -50921,9 +51673,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/iface.c linux-2.6.32.7/net/mac80211/iface ieee80211_clear_tx_pending(local); ieee80211_stop_device(local); -diff -urNp linux-2.6.32.7/net/mac80211/main.c linux-2.6.32.7/net/mac80211/main.c ---- linux-2.6.32.7/net/mac80211/main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/main.c 2010-01-25 17:39:41.165269289 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/main.c linux-2.6.32.9/net/mac80211/main.c +--- linux-2.6.32.9/net/mac80211/main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/main.c 2010-02-23 17:09:56.736738853 -0500 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -50933,9 +51685,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/main.c linux-2.6.32.7/net/mac80211/main.c ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.32.7/net/mac80211/pm.c linux-2.6.32.7/net/mac80211/pm.c ---- linux-2.6.32.7/net/mac80211/pm.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/pm.c 2010-01-25 17:39:41.165269289 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/pm.c linux-2.6.32.9/net/mac80211/pm.c +--- linux-2.6.32.9/net/mac80211/pm.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/pm.c 2010-02-23 17:09:56.736738853 -0500 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } @@ -50945,9 +51697,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/pm.c linux-2.6.32.7/net/mac80211/pm.c ieee80211_stop_device(local); local->suspended = true; -diff -urNp linux-2.6.32.7/net/mac80211/rate.c linux-2.6.32.7/net/mac80211/rate.c ---- linux-2.6.32.7/net/mac80211/rate.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/rate.c 2010-01-25 17:39:41.165269289 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/rate.c linux-2.6.32.9/net/mac80211/rate.c +--- linux-2.6.32.9/net/mac80211/rate.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/rate.c 2010-02-23 17:09:56.736738853 -0500 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; @@ -50957,9 +51709,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/rate.c linux-2.6.32.7/net/mac80211/rate.c return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.32.7/net/mac80211/util.c linux-2.6.32.7/net/mac80211/util.c ---- linux-2.6.32.7/net/mac80211/util.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/mac80211/util.c 2010-01-25 17:39:41.166283290 -0500 +diff -urNp linux-2.6.32.9/net/mac80211/util.c linux-2.6.32.9/net/mac80211/util.c +--- linux-2.6.32.9/net/mac80211/util.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/mac80211/util.c 2010-02-23 17:09:56.736738853 -0500 @@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ local->resuming = true; @@ -50977,9 +51729,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/util.c linux-2.6.32.7/net/mac80211/util.c if (res) { WARN(local->suspended, "Harware became unavailable " "upon resume. This is could be a software issue" -diff -urNp linux-2.6.32.7/net/sctp/socket.c linux-2.6.32.7/net/sctp/socket.c ---- linux-2.6.32.7/net/sctp/socket.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/sctp/socket.c 2010-01-25 17:39:41.167436540 -0500 +diff -urNp linux-2.6.32.9/net/sctp/socket.c linux-2.6.32.9/net/sctp/socket.c +--- linux-2.6.32.9/net/sctp/socket.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/sctp/socket.c 2010-02-23 17:09:56.748973675 -0500 @@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -50997,9 +51749,9 @@ diff -urNp linux-2.6.32.7/net/sctp/socket.c linux-2.6.32.7/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.7/net/socket.c linux-2.6.32.7/net/socket.c ---- linux-2.6.32.7/net/socket.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/socket.c 2010-01-25 17:39:41.167436540 -0500 +diff -urNp linux-2.6.32.9/net/socket.c linux-2.6.32.9/net/socket.c +--- linux-2.6.32.9/net/socket.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/socket.c 2010-02-23 17:09:56.748973675 -0500 @@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> @@ -51154,9 +51906,9 @@ diff -urNp linux-2.6.32.7/net/socket.c linux-2.6.32.7/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.32.7/net/sysctl_net.c linux-2.6.32.7/net/sysctl_net.c ---- linux-2.6.32.7/net/sysctl_net.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/sysctl_net.c 2010-01-25 20:00:09.495268524 -0500 +diff -urNp linux-2.6.32.9/net/sysctl_net.c linux-2.6.32.9/net/sysctl_net.c +--- linux-2.6.32.9/net/sysctl_net.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/sysctl_net.c 2010-02-23 17:09:56.748973675 -0500 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct struct ctl_table *table) { @@ -51166,9 +51918,9 @@ diff -urNp linux-2.6.32.7/net/sysctl_net.c linux-2.6.32.7/net/sysctl_net.c int mode = (table->mode >> 6) & 7; return (mode << 6) | (mode << 3) | mode; } -diff -urNp linux-2.6.32.7/net/unix/af_unix.c linux-2.6.32.7/net/unix/af_unix.c ---- linux-2.6.32.7/net/unix/af_unix.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/net/unix/af_unix.c 2010-01-25 17:39:41.168432831 -0500 +diff -urNp linux-2.6.32.9/net/unix/af_unix.c linux-2.6.32.9/net/unix/af_unix.c +--- linux-2.6.32.9/net/unix/af_unix.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/net/unix/af_unix.c 2010-02-23 17:09:56.748973675 -0500 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -51226,9 +51978,9 @@ diff -urNp linux-2.6.32.7/net/unix/af_unix.c linux-2.6.32.7/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.32.7/samples/kobject/kset-example.c linux-2.6.32.7/samples/kobject/kset-example.c ---- linux-2.6.32.7/samples/kobject/kset-example.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/samples/kobject/kset-example.c 2010-01-25 17:39:41.168432831 -0500 +diff -urNp linux-2.6.32.9/samples/kobject/kset-example.c linux-2.6.32.9/samples/kobject/kset-example.c +--- linux-2.6.32.9/samples/kobject/kset-example.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/samples/kobject/kset-example.c 2010-02-23 17:09:56.748973675 -0500 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -51238,9 +51990,9 @@ diff -urNp linux-2.6.32.7/samples/kobject/kset-example.c linux-2.6.32.7/samples/ .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.32.7/scripts/basic/fixdep.c linux-2.6.32.7/scripts/basic/fixdep.c ---- linux-2.6.32.7/scripts/basic/fixdep.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/basic/fixdep.c 2010-01-25 17:39:41.168432831 -0500 +diff -urNp linux-2.6.32.9/scripts/basic/fixdep.c linux-2.6.32.9/scripts/basic/fixdep.c +--- linux-2.6.32.9/scripts/basic/fixdep.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/basic/fixdep.c 2010-02-23 17:09:56.748973675 -0500 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen static void parse_config_file(char *map, size_t len) @@ -51262,9 +52014,9 @@ diff -urNp linux-2.6.32.7/scripts/basic/fixdep.c linux-2.6.32.7/scripts/basic/fi if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.32.7/scripts/kallsyms.c linux-2.6.32.7/scripts/kallsyms.c ---- linux-2.6.32.7/scripts/kallsyms.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/kallsyms.c 2010-01-25 17:39:41.169311253 -0500 +diff -urNp linux-2.6.32.9/scripts/kallsyms.c linux-2.6.32.9/scripts/kallsyms.c +--- linux-2.6.32.9/scripts/kallsyms.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/kallsyms.c 2010-02-23 17:09:56.748973675 -0500 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -51280,9 +52032,9 @@ diff -urNp linux-2.6.32.7/scripts/kallsyms.c linux-2.6.32.7/scripts/kallsyms.c }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.32.7/scripts/mod/file2alias.c linux-2.6.32.7/scripts/mod/file2alias.c ---- linux-2.6.32.7/scripts/mod/file2alias.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/mod/file2alias.c 2010-01-25 17:39:41.169311253 -0500 +diff -urNp linux-2.6.32.9/scripts/mod/file2alias.c linux-2.6.32.9/scripts/mod/file2alias.c +--- linux-2.6.32.9/scripts/mod/file2alias.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/mod/file2alias.c 2010-02-23 17:09:56.748973675 -0500 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -51337,9 +52089,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/file2alias.c linux-2.6.32.7/scripts/mod/fi sprintf(alias, "dmi*"); -diff -urNp linux-2.6.32.7/scripts/mod/modpost.c linux-2.6.32.7/scripts/mod/modpost.c ---- linux-2.6.32.7/scripts/mod/modpost.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/mod/modpost.c 2010-01-25 17:39:41.169311253 -0500 +diff -urNp linux-2.6.32.9/scripts/mod/modpost.c linux-2.6.32.9/scripts/mod/modpost.c +--- linux-2.6.32.9/scripts/mod/modpost.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/mod/modpost.c 2010-02-23 17:09:56.748973675 -0500 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -51407,9 +52159,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/modpost.c linux-2.6.32.7/scripts/mod/modpo goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.32.7/scripts/mod/modpost.h linux-2.6.32.7/scripts/mod/modpost.h ---- linux-2.6.32.7/scripts/mod/modpost.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/mod/modpost.h 2010-01-25 17:39:41.169311253 -0500 +diff -urNp linux-2.6.32.9/scripts/mod/modpost.h linux-2.6.32.9/scripts/mod/modpost.h +--- linux-2.6.32.9/scripts/mod/modpost.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/mod/modpost.h 2010-02-23 17:09:56.748973675 -0500 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -51429,9 +52181,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/modpost.h linux-2.6.32.7/scripts/mod/modpo struct module { struct module *next; -diff -urNp linux-2.6.32.7/scripts/mod/sumversion.c linux-2.6.32.7/scripts/mod/sumversion.c ---- linux-2.6.32.7/scripts/mod/sumversion.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/mod/sumversion.c 2010-01-25 17:39:41.170429115 -0500 +diff -urNp linux-2.6.32.9/scripts/mod/sumversion.c linux-2.6.32.9/scripts/mod/sumversion.c +--- linux-2.6.32.9/scripts/mod/sumversion.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/mod/sumversion.c 2010-02-23 17:09:56.748973675 -0500 @@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -51441,9 +52193,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/sumversion.c linux-2.6.32.7/scripts/mod/su warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.32.7/scripts/pnmtologo.c linux-2.6.32.7/scripts/pnmtologo.c ---- linux-2.6.32.7/scripts/pnmtologo.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/scripts/pnmtologo.c 2010-01-25 17:39:41.170429115 -0500 +diff -urNp linux-2.6.32.9/scripts/pnmtologo.c linux-2.6.32.9/scripts/pnmtologo.c +--- linux-2.6.32.9/scripts/pnmtologo.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/scripts/pnmtologo.c 2010-02-23 17:09:56.748973675 -0500 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -51470,9 +52222,9 @@ diff -urNp linux-2.6.32.7/scripts/pnmtologo.c linux-2.6.32.7/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.32.7/security/commoncap.c linux-2.6.32.7/security/commoncap.c ---- linux-2.6.32.7/security/commoncap.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/commoncap.c 2010-01-25 17:39:41.170429115 -0500 +diff -urNp linux-2.6.32.9/security/commoncap.c linux-2.6.32.9/security/commoncap.c +--- linux-2.6.32.9/security/commoncap.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/commoncap.c 2010-02-23 17:09:56.752223260 -0500 @@ -27,7 +27,7 @@ #include <linux/sched.h> #include <linux/prctl.h> @@ -51495,9 +52247,9 @@ diff -urNp linux-2.6.32.7/security/commoncap.c linux-2.6.32.7/security/commoncap return 0; } -diff -urNp linux-2.6.32.7/security/integrity/ima/ima_api.c linux-2.6.32.7/security/integrity/ima/ima_api.c ---- linux-2.6.32.7/security/integrity/ima/ima_api.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/integrity/ima/ima_api.c 2010-01-25 17:39:41.170429115 -0500 +diff -urNp linux-2.6.32.9/security/integrity/ima/ima_api.c linux-2.6.32.9/security/integrity/ima/ima_api.c +--- linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/integrity/ima/ima_api.c 2010-02-23 17:09:56.752223260 -0500 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino int result; @@ -51507,9 +52259,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_api.c linux-2.6.32.7/securi entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { -diff -urNp linux-2.6.32.7/security/integrity/ima/ima_fs.c linux-2.6.32.7/security/integrity/ima/ima_fs.c ---- linux-2.6.32.7/security/integrity/ima/ima_fs.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/integrity/ima/ima_fs.c 2010-01-25 17:39:41.170429115 -0500 +diff -urNp linux-2.6.32.9/security/integrity/ima/ima_fs.c linux-2.6.32.9/security/integrity/ima/ima_fs.c +--- linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/integrity/ima/ima_fs.c 2010-02-23 17:09:56.752223260 -0500 @@ -27,12 +27,12 @@ static int valid_policy = 1; #define TMPBUFLEN 12 @@ -51525,9 +52277,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_fs.c linux-2.6.32.7/securit return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); } -diff -urNp linux-2.6.32.7/security/integrity/ima/ima.h linux-2.6.32.7/security/integrity/ima/ima.h ---- linux-2.6.32.7/security/integrity/ima/ima.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/integrity/ima/ima.h 2010-01-25 17:39:41.171256372 -0500 +diff -urNp linux-2.6.32.9/security/integrity/ima/ima.h linux-2.6.32.9/security/integrity/ima/ima.h +--- linux-2.6.32.9/security/integrity/ima/ima.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/integrity/ima/ima.h 2010-02-23 17:09:56.752223260 -0500 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino extern spinlock_t ima_queue_lock; @@ -51539,9 +52291,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima.h linux-2.6.32.7/security/i struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; }; extern struct ima_h_table ima_htable; -diff -urNp linux-2.6.32.7/security/integrity/ima/ima_queue.c linux-2.6.32.7/security/integrity/ima/ima_queue.c ---- linux-2.6.32.7/security/integrity/ima/ima_queue.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/integrity/ima/ima_queue.c 2010-01-25 17:39:41.171256372 -0500 +diff -urNp linux-2.6.32.9/security/integrity/ima/ima_queue.c linux-2.6.32.9/security/integrity/ima/ima_queue.c +--- linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/integrity/ima/ima_queue.c 2010-02-23 17:09:56.752223260 -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); @@ -51551,10 +52303,10 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_queue.c linux-2.6.32.7/secu key = ima_hash_key(entry->digest); hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); return 0; -diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig ---- linux-2.6.32.7/security/Kconfig 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/Kconfig 2010-01-25 20:02:43.052267501 -0500 -@@ -4,6 +4,465 @@ +diff -urNp linux-2.6.32.9/security/Kconfig linux-2.6.32.9/security/Kconfig +--- linux-2.6.32.9/security/Kconfig 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/Kconfig 2010-02-23 17:09:56.752223260 -0500 +@@ -4,6 +4,488 @@ menu "Security options" @@ -51575,6 +52327,7 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig + +config PAX_SOFTMODE + bool 'Support soft mode' ++ select PAX_PT_PAX_FLAGS + help + Enabling this option will allow you to run PaX in soft mode, that + is, PaX features will not be enforced by default, only on executables @@ -51652,7 +52405,7 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig + +config PAX_NOEXEC + bool "Enforce non-executable pages" -+ depends on (PAX_EI_PAX || PAX_PT_PAX_FLAGS || PAX_HAVE_ACL_FLAGS || PAX_HOOK_ACL_FLAGS) && (ALPHA || IA64 || MIPS32 || MIPS64 || PARISC || PPC32 || PPC64 || SPARC32 || SPARC64 || X86) ++ depends on (PAX_EI_PAX || PAX_PT_PAX_FLAGS || PAX_HAVE_ACL_FLAGS || PAX_HOOK_ACL_FLAGS) && (ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS32 || MIPS64 || PARISC || PPC32 || PPC64 || S390 || SPARC32 || SPARC64 || X86) + help + By design some architectures do not allow for protecting memory + pages against execution or even if they do, Linux does not make @@ -51681,6 +52434,8 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig +config PAX_PAGEEXEC + bool "Paging based non-executable pages" + depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) ++ select S390_SWITCH_AMODE if S390 ++ select S390_EXEC_PROTECT if S390 + help + This implementation is based on the paging feature of the CPU. + On i386 without hardware non-executable bit support there is a @@ -51843,12 +52598,32 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig + +config PAX_KERNEXEC + bool "Enforce non-executable kernel pages" -+ depends on PAX_NOEXEC && X86 && (!X86_32 || X86_WP_WORKS_OK) && !XEN ++ depends on PAX_NOEXEC && (PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN + help + This is the kernel land equivalent of PAGEEXEC and MPROTECT, + that is, enabling this option will make it harder to inject + and execute 'foreign' code in kernel memory itself. + ++config PAX_KERNEXEC_MODULE_TEXT ++ int "Minimum amount of memory reserved for module code" ++ default "4" ++ depends on PAX_KERNEXEC && X86_32 && MODULES ++ help ++ Due to implementation details the kernel must reserve a fixed ++ amount of memory for module code at compile time that cannot be ++ changed at runtime. Here you can specify the minimum amount ++ in MB that will be reserved. Due to the same implementation ++ details this size will always be rounded up to the next 2/4 MB ++ boundary (depends on PAE) so the actually available memory for ++ module code will usually be more than this minimum. ++ ++ The default 4 MB should be enough for most users but if you have ++ an excessive number of modules (e.g., most distribution configs ++ compile many drivers as modules) or use huge modules such as ++ nvidia's kernel driver, you will need to adjust this amount. ++ A good rule of thumb is to look at your currently loaded kernel ++ modules and add up their sizes. ++ +endmenu + +menu "Address Space Layout Randomization" @@ -52020,7 +52795,7 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig config KEYS bool "Enable access key retention support" help -@@ -146,7 +605,7 @@ config INTEL_TXT +@@ -146,7 +628,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX @@ -52029,9 +52804,9 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/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.7/security/min_addr.c linux-2.6.32.7/security/min_addr.c ---- linux-2.6.32.7/security/min_addr.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/security/min_addr.c 2010-01-25 17:39:41.171256372 -0500 +diff -urNp linux-2.6.32.9/security/min_addr.c linux-2.6.32.9/security/min_addr.c +--- linux-2.6.32.9/security/min_addr.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/security/min_addr.c 2010-02-23 17:09:56.752223260 -0500 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -52058,9 +52833,9 @@ diff -urNp linux-2.6.32.7/security/min_addr.c linux-2.6.32.7/security/min_addr.c ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); update_mmap_min_addr(); -diff -urNp linux-2.6.32.7/sound/aoa/codecs/onyx.c linux-2.6.32.7/sound/aoa/codecs/onyx.c ---- linux-2.6.32.7/sound/aoa/codecs/onyx.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/aoa/codecs/onyx.c 2010-01-25 17:39:41.181130105 -0500 +diff -urNp linux-2.6.32.9/sound/aoa/codecs/onyx.c linux-2.6.32.9/sound/aoa/codecs/onyx.c +--- linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/aoa/codecs/onyx.c 2010-02-23 17:09:56.752223260 -0500 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -52089,9 +52864,9 @@ diff -urNp linux-2.6.32.7/sound/aoa/codecs/onyx.c linux-2.6.32.7/sound/aoa/codec onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.32.7/sound/core/oss/pcm_oss.c linux-2.6.32.7/sound/core/oss/pcm_oss.c ---- linux-2.6.32.7/sound/core/oss/pcm_oss.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/core/oss/pcm_oss.c 2010-01-25 17:39:41.199290725 -0500 +diff -urNp linux-2.6.32.9/sound/core/oss/pcm_oss.c linux-2.6.32.9/sound/core/oss/pcm_oss.c +--- linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/core/oss/pcm_oss.c 2010-02-23 17:09:56.752223260 -0500 @@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } @@ -52103,9 +52878,9 @@ diff -urNp linux-2.6.32.7/sound/core/oss/pcm_oss.c linux-2.6.32.7/sound/core/oss #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.32.7/sound/core/seq/seq_lock.h linux-2.6.32.7/sound/core/seq/seq_lock.h ---- linux-2.6.32.7/sound/core/seq/seq_lock.h 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/core/seq/seq_lock.h 2010-01-25 17:39:41.209263615 -0500 +diff -urNp linux-2.6.32.9/sound/core/seq/seq_lock.h linux-2.6.32.9/sound/core/seq/seq_lock.h +--- linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/core/seq/seq_lock.h 2010-02-23 17:09:56.752223260 -0500 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -52121,9 +52896,9 @@ diff -urNp linux-2.6.32.7/sound/core/seq/seq_lock.h linux-2.6.32.7/sound/core/se #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.32.7/sound/drivers/mts64.c linux-2.6.32.7/sound/drivers/mts64.c ---- linux-2.6.32.7/sound/drivers/mts64.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/drivers/mts64.c 2010-01-25 17:39:41.215440169 -0500 +diff -urNp linux-2.6.32.9/sound/drivers/mts64.c linux-2.6.32.9/sound/drivers/mts64.c +--- linux-2.6.32.9/sound/drivers/mts64.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/drivers/mts64.c 2010-02-23 17:09:56.752223260 -0500 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -52172,9 +52947,9 @@ diff -urNp linux-2.6.32.7/sound/drivers/mts64.c linux-2.6.32.7/sound/drivers/mts return 0; } -diff -urNp linux-2.6.32.7/sound/drivers/portman2x4.c linux-2.6.32.7/sound/drivers/portman2x4.c ---- linux-2.6.32.7/sound/drivers/portman2x4.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/drivers/portman2x4.c 2010-01-25 17:39:41.237254086 -0500 +diff -urNp linux-2.6.32.9/sound/drivers/portman2x4.c linux-2.6.32.9/sound/drivers/portman2x4.c +--- linux-2.6.32.9/sound/drivers/portman2x4.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/drivers/portman2x4.c 2010-02-23 17:09:56.752223260 -0500 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -52184,9 +52959,9 @@ diff -urNp linux-2.6.32.7/sound/drivers/portman2x4.c linux-2.6.32.7/sound/driver int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_codec.c linux-2.6.32.7/sound/pci/ac97/ac97_codec.c ---- linux-2.6.32.7/sound/pci/ac97/ac97_codec.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/pci/ac97/ac97_codec.c 2010-01-25 17:39:41.261223638 -0500 +diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_codec.c linux-2.6.32.9/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/pci/ac97/ac97_codec.c 2010-02-23 17:09:56.752223260 -0500 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } @@ -52196,9 +52971,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_codec.c linux-2.6.32.7/sound/pci/a #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_patch.c linux-2.6.32.7/sound/pci/ac97/ac97_patch.c ---- linux-2.6.32.7/sound/pci/ac97/ac97_patch.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/pci/ac97/ac97_patch.c 2010-01-25 17:39:41.263433086 -0500 +diff -urNp linux-2.6.32.9/sound/pci/ac97/ac97_patch.c linux-2.6.32.9/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/pci/ac97/ac97_patch.c 2010-02-23 17:09:56.762371914 -0500 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd return 0; } @@ -52505,9 +53280,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_patch.c linux-2.6.32.7/sound/pci/a .build_specific = patch_ucb1400_specific, }; -diff -urNp linux-2.6.32.7/sound/pci/ens1370.c linux-2.6.32.7/sound/pci/ens1370.c ---- linux-2.6.32.7/sound/pci/ens1370.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/pci/ens1370.c 2010-01-25 17:39:41.279868970 -0500 +diff -urNp linux-2.6.32.9/sound/pci/ens1370.c linux-2.6.32.9/sound/pci/ens1370.c +--- linux-2.6.32.9/sound/pci/ens1370.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/pci/ens1370.c 2010-02-23 17:09:56.764228986 -0500 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ @@ -52517,9 +53292,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ens1370.c linux-2.6.32.7/sound/pci/ens1370.c }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.32.7/sound/pci/intel8x0.c linux-2.6.32.7/sound/pci/intel8x0.c ---- linux-2.6.32.7/sound/pci/intel8x0.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/pci/intel8x0.c 2010-01-25 17:39:41.315386368 -0500 +diff -urNp linux-2.6.32.9/sound/pci/intel8x0.c linux-2.6.32.9/sound/pci/intel8x0.c +--- linux-2.6.32.9/sound/pci/intel8x0.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/pci/intel8x0.c 2010-02-23 17:09:56.764228986 -0500 @@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ @@ -52538,9 +53313,9 @@ diff -urNp linux-2.6.32.7/sound/pci/intel8x0.c linux-2.6.32.7/sound/pci/intel8x0 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.32.7/sound/pci/intel8x0m.c linux-2.6.32.7/sound/pci/intel8x0m.c ---- linux-2.6.32.7/sound/pci/intel8x0m.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/sound/pci/intel8x0m.c 2010-01-25 17:39:41.336823427 -0500 +diff -urNp linux-2.6.32.9/sound/pci/intel8x0m.c linux-2.6.32.9/sound/pci/intel8x0m.c +--- linux-2.6.32.9/sound/pci/intel8x0m.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/sound/pci/intel8x0m.c 2010-02-23 17:09:56.764228986 -0500 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ @@ -52559,9 +53334,9 @@ diff -urNp linux-2.6.32.7/sound/pci/intel8x0m.c linux-2.6.32.7/sound/pci/intel8x }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.32.7/usr/gen_init_cpio.c linux-2.6.32.7/usr/gen_init_cpio.c ---- linux-2.6.32.7/usr/gen_init_cpio.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/usr/gen_init_cpio.c 2010-01-25 17:39:41.337270296 -0500 +diff -urNp linux-2.6.32.9/usr/gen_init_cpio.c linux-2.6.32.9/usr/gen_init_cpio.c +--- linux-2.6.32.9/usr/gen_init_cpio.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/usr/gen_init_cpio.c 2010-02-23 17:09:56.764228986 -0500 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -52584,9 +53359,9 @@ diff -urNp linux-2.6.32.7/usr/gen_init_cpio.c linux-2.6.32.7/usr/gen_init_cpio.c } else break; } -diff -urNp linux-2.6.32.7/virt/kvm/kvm_main.c linux-2.6.32.7/virt/kvm/kvm_main.c ---- linux-2.6.32.7/virt/kvm/kvm_main.c 2010-01-25 13:50:10.000000000 -0500 -+++ linux-2.6.32.7/virt/kvm/kvm_main.c 2010-01-25 17:39:41.337270296 -0500 +diff -urNp linux-2.6.32.9/virt/kvm/kvm_main.c linux-2.6.32.9/virt/kvm/kvm_main.c +--- linux-2.6.32.9/virt/kvm/kvm_main.c 2010-02-09 07:57:19.000000000 -0500 ++++ linux-2.6.32.9/virt/kvm/kvm_main.c 2010-02-23 17:09:56.764228986 -0500 @@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode return 0; } diff --git a/kernel/2.6.32/README.Changelog b/kernel/2.6.32/README.Changelog deleted file mode 100644 index c98f42a..0000000 --- a/kernel/2.6.32/README.Changelog +++ /dev/null @@ -1,3 +0,0 @@ -2.6.32-5-extras Magnus Granberg <zorry@ume.nu> - - * Updated the Grsecurity patchset to 2.1.14-2.6.32.7-201001291848 |